From 02543c5d1661cd5bcdc3a9ab8b73cf054dfd1fad Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 19 Oct 2021 10:05:06 -0400 Subject: [PATCH 1/2] deactivate keys with 'ACTION_NEEDED' status as well --- internal/service/route53/key_signing_key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/route53/key_signing_key.go b/internal/service/route53/key_signing_key.go index 9f915a6e6dd..6a4c2b17f71 100644 --- a/internal/service/route53/key_signing_key.go +++ b/internal/service/route53/key_signing_key.go @@ -251,7 +251,7 @@ func resourceKeySigningKeyDelete(d *schema.ResourceData, meta interface{}) error status := d.Get("status").(string) - if status == KeySigningKeyStatusActive { + if status == KeySigningKeyStatusActive || status == KeySigningKeyStatusActionNeeded { input := &route53.DeactivateKeySigningKeyInput{ HostedZoneId: aws.String(d.Get("hosted_zone_id").(string)), Name: aws.String(d.Get("name").(string)), From 9144f510ac66b5a9d16ff88559c86d068097c9c0 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Tue, 19 Oct 2021 10:31:55 -0400 Subject: [PATCH 2/2] Update CHANGELOG for #21369 --- .changelog/21369.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/21369.txt diff --git a/.changelog/21369.txt b/.changelog/21369.txt new file mode 100644 index 00000000000..fcd5280abce --- /dev/null +++ b/.changelog/21369.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_route53_key_signing_key: Deactivate key-signing key with `ACTION_NEEDED` status before deletion +``` \ No newline at end of file