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.

Sign up for GitHub

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

Jump to bottom

resource/aws_acm_certificate: Trigger resource recreation on VALIDATION_TIMED_OUT status #17869

Merged
merged 3 commits into from
Mar 4, 2021
Merged

resource/aws_acm_certificate: Trigger resource recreation on VALIDATION_TIMED_OUT status #17869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d92656
resource/aws_acm_certificate: Trigger resource recreation on VALIDATI…
bflad Mar 1, 2021
c3acd86
Update CHANGELOG for #17869
bflad Mar 1, 2021
0d8f867
resource/aws_acm_certificate: Fix error message typos
bflad Mar 1, 2021
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
3 changes: 3 additions & 0 deletions .changelog/17869.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_acm_certificate: Trigger resource recreation with `VALIDATION_TIMED_OUT` status
```
22 changes: 17 additions & 5 deletions aws/resource_aws_acm_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,24 @@ func resourceAwsAcmCertificateRead(d *schema.ResourceData, meta interface{}) err
return resource.Retry(AcmCertificateDnsValidationAssignmentTimeout, func() *resource.RetryError {
resp, err := acmconn.DescribeCertificate(params)

if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, acm.ErrCodeResourceNotFoundException) {
log.Printf("[WARN] ACM Certificate (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

if err != nil {
if isAWSErr(err, acm.ErrCodeResourceNotFoundException, "") {
d.SetId("")
return nil
}
return resource.NonRetryableError(fmt.Errorf("Error describing certificate: %s", err))
return resource.NonRetryableError(fmt.Errorf("error reading ACM Certificate (%s): %w", d.Id(), err))
}

if resp == nil || resp.Certificate == nil {
return resource.NonRetryableError(fmt.Errorf("error reading ACM Certificate (%s): empty response", d.Id()))
}

if !d.IsNewResource() && aws.StringValue(resp.Certificate.Status) == acm.CertificateStatusValidationTimedOut {
log.Printf("[WARN] ACM Certificate (%s) validation timed out, removing from state", d.Id())
d.SetId("")
return nil
}

d.Set("domain_name", resp.Certificate.DomainName)
Expand Down