Merge pull request #7072 from kterada0509/feature/fix-iam-policy-reso…

…urce-error-handling

Fix error handling of aws_iam_policy resouce

aws/resource_aws_iam_policy.go

@@ -243,13 +243,11 @@ func resourceAwsIamPolicyDelete(d *schema.ResourceData, meta interface{}) error
 		PolicyArn: aws.String(d.Id()),
 	}
 
-	_, err := iamconn.DeletePolicy(request)
-	if isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") {
-		return nil
-	}
-
-	if err != nil {
-		return fmt.Errorf("Error deleting IAM policy %s: %#v", d.Id(), err)
+	if _, err := iamconn.DeletePolicy(request); err != nil {
+		if isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") {
+			return nil
+		}
+		return fmt.Errorf("Error deleting IAM policy %s: %s", d.Id(), err)
 	}
 
 	return nil

aws/resource_aws_iam_policy_test.go

@@ -68,6 +68,28 @@ func TestAccAWSIAMPolicy_description(t *testing.T) {
 	})
 }
 
+func TestAccAWSIAMPolicy_disappears(t *testing.T) {
+	var out iam.GetPolicyOutput
+	rName := acctest.RandomWithPrefix("tf-acc-test")
+	resourceName := "aws_iam_policy.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSIAMPolicyDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSIAMPolicyConfigName(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSIAMPolicyExists(resourceName, &out),
+					testAccCheckAWSIAMPolicyDisappears(&out),
+				),
+				ExpectNonEmptyPlan: true,
+			},
+		},
+	})
+}
+
 func TestAccAWSIAMPolicy_namePrefix(t *testing.T) {
 	var out iam.GetPolicyOutput
 	namePrefix := "tf-acc-test-"
@@ -212,6 +234,21 @@ func testAccCheckAWSIAMPolicyDestroy(s *terraform.State) error {
 	return nil
 }
 
+func testAccCheckAWSIAMPolicyDisappears(out *iam.GetPolicyOutput) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		iamconn := testAccProvider.Meta().(*AWSClient).iamconn
+
+		params := &iam.DeletePolicyInput{
+			PolicyArn: out.Policy.Arn,
+		}
+
+		if _, err := iamconn.DeletePolicy(params); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
 func testAccAWSIAMPolicyConfigDescription(rName, description string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_policy" "test" {