Skip to content

Commit c38868e

Browse files
authored
Merge pull request #24453 from jufemaiz/fix/24452/acm-certificate-validation
fix: aws_acm_certificate_validation uses create timestamp as id for validation not certificate arn
2 parents 0db889a + 1a99059 commit c38868e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.changelog/24453.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_acm_certificate_validation: Restore certificate issuance timestamp as the resource `id` value, fixing error on existing resource Read
3+
```

internal/service/acm/certificate_validation.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -90,24 +90,25 @@ func resourceCertificateValidationCreate(d *schema.ResourceData, meta interface{
9090
return fmt.Errorf("waiting for ACM Certificate (%s) to be issued: %w", arn, err)
9191
}
9292

93-
d.SetId(arn)
93+
d.SetId(aws.TimeValue(certificate.IssuedAt).String())
9494

9595
return resourceCertificateValidationRead(d, meta)
9696
}
9797

9898
func resourceCertificateValidationRead(d *schema.ResourceData, meta interface{}) error {
9999
conn := meta.(*conns.AWSClient).ACMConn
100100

101-
certificate, err := FindCertificateValidationByARN(conn, d.Id())
101+
arn := d.Get("certificate_arn").(string)
102+
certificate, err := FindCertificateValidationByARN(conn, arn)
102103

103104
if !d.IsNewResource() && tfresource.NotFound(err) {
104-
log.Printf("[WARN] ACM Certificate %s not found, removing from state", d.Id())
105+
log.Printf("[WARN] ACM Certificate %s not found, removing from state", arn)
105106
d.SetId("")
106107
return nil
107108
}
108109

109110
if err != nil {
110-
return fmt.Errorf("reading ACM Certificate (%s): %w", d.Id(), err)
111+
return fmt.Errorf("reading ACM Certificate (%s): %w", arn, err)
111112
}
112113

113114
d.Set("certificate_arn", certificate.CertificateArn)

internal/service/acm/certificate_validation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func testAccCheckAcmCertificateValidationExists(n string) resource.TestCheckFunc
233233

234234
conn := acctest.Provider.Meta().(*conns.AWSClient).ACMConn
235235

236-
_, err := tfacm.FindCertificateValidationByARN(conn, rs.Primary.ID)
236+
_, err := tfacm.FindCertificateValidationByARN(conn, rs.Primary.Attributes["certificate_arn"])
237237

238238
if err != nil {
239239
return err

0 commit comments

Comments
 (0)