Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/aws_ses_receipt_rule_set: Prevent missing Terraform state for newly created resources #9045

Merged
merged 1 commit into from
Jun 19, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
resource/aws_ses_receipt_rule_set: Prevent missing Terraform state fo…
…r newly created resources

Reference: #6470

Prefer the direct `DescribeReceiptRuleSet` API call over the `ListReceiptRuleSets` API call for the `Read` function. Certain APIs have eventual consistency delays with list API calls and here we can refactor away all the additional logic as well.

Output from acceptance testing:

```
--- PASS: TestAccAWSSESReceiptRuleSet_basic (9.20s)
```
  • Loading branch information
bflad committed Jun 19, 2019
commit 8943701bcfff54837c8aba0a931035aabe1ea73f
41 changes: 10 additions & 31 deletions aws/resource_aws_ses_receipt_rule_set.go
Original file line number Diff line number Diff line change
@@ -48,16 +48,22 @@ func resourceAwsSesReceiptRuleSetCreate(d *schema.ResourceData, meta interface{}
}

func resourceAwsSesReceiptRuleSetRead(d *schema.ResourceData, meta interface{}) error {
ruleSetExists, err := findRuleSet(d.Id(), nil, meta)
conn := meta.(*AWSClient).sesConn

input := &ses.DescribeReceiptRuleSetInput{
RuleSetName: aws.String(d.Id()),
}

_, err := conn.DescribeReceiptRuleSet(input)

if !ruleSetExists {
log.Printf("[WARN] SES Receipt Rule Set (%s) not found", d.Id())
if isAWSErr(err, ses.ErrCodeRuleSetDoesNotExistException, "") {
log.Printf("[WARN] SES Receipt Rule Set (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

if err != nil {
return err
return fmt.Errorf("error describing SES Receipt Rule Set (%s): %s", d.Id(), err)
}

d.Set("rule_set_name", d.Id())
@@ -75,30 +81,3 @@ func resourceAwsSesReceiptRuleSetDelete(d *schema.ResourceData, meta interface{}

return err
}

func findRuleSet(name string, token *string, meta interface{}) (bool, error) {
conn := meta.(*AWSClient).sesConn

ruleSetExists := false

listOpts := &ses.ListReceiptRuleSetsInput{
NextToken: token,
}

response, err := conn.ListReceiptRuleSets(listOpts)
for _, element := range response.RuleSets {
if *element.Name == name {
ruleSetExists = true
}
}

if err != nil && !ruleSetExists && response.NextToken != nil {
ruleSetExists, err = findRuleSet(name, response.NextToken, meta)
}

if err != nil {
return false, err
}

return ruleSetExists, nil
}