kms: Treat keys in PendingDeletion state as deleted

hashicorp · Jan 21, 2016 · 42820ec · 42820ec
1 parent 944241c
commit 42820ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/builtin/providers/aws/resource_aws_kms_key.go b/builtin/providers/aws/resource_aws_kms_key.go
@@ -117,6 +117,12 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error {
 	}
 	metadata := resp.KeyMetadata
 
+	if *metadata.KeyState == "PendingDeletion" {
+		log.Printf("[WARN] Removing KMS key %s because it's already gone", d.Id())
+		d.SetId("")
+		return nil
+	}
+
 	d.SetId(*metadata.KeyId)
 
 	d.Set("arn", metadata.Arn)

diff --git a/builtin/providers/aws/resource_aws_kms_key_test.go b/builtin/providers/aws/resource_aws_kms_key_test.go
@@ -86,11 +86,15 @@ func testAccCheckAWSKmsKeyDestroy(s *terraform.State) error {
 			KeyId: aws.String(rs.Primary.ID),
 		})
 
-		if err == nil {
-			return fmt.Errorf("KMS key still exists:\n%#v", out.KeyMetadata)
+		if err != nil {
+			return err
+		}
+
+		if *out.KeyMetadata.KeyState == "PendingDeletion" {
+			return nil
 		}
 
-		return err
+		return fmt.Errorf("KMS key still exists:\n%#v", out.KeyMetadata)
 	}
 
 	return nil