Merge pull request #21369 from hashicorp/td-route53-key-signing-key-d…

…elete r/route53_key_signing_key: also deactivate keys with `ACTION_NEEDED` status
hashicorp · Oct 19, 2021 · 6e45b53 · 6e45b53
2 parents b84cb22 + 9144f51
commit 6e45b53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/21369.txt 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
+```
diff --git 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)),