Better destruction check.

builtin/providers/aws/resource_aws_ami_launch_permission_test.go

@@ -21,15 +21,22 @@ func TestAccAWSAMILaunchPermission_Basic(t *testing.T) {
 		},
 		Providers: testAccProviders,
 		Steps: []r.TestStep{
+			// Scaffold everything
 			r.TestStep{
-				Config: testAccAWSAMILaunchPermissionConfig(account_id),
+				Config: testAccAWSAMILaunchPermissionConfig(account_id, true),
 				Check: r.ComposeTestCheckFunc(
 					testCheckResourceGetAttr("aws_ami_copy.test", "id", &image_id),
 					testAccAWSAMILaunchPermissionExists(account_id, &image_id),
 				),
 			},
+			// Drop just launch permission to test destruction
+			r.TestStep{
+				Config: testAccAWSAMILaunchPermissionConfig(account_id, false),
+				Check: r.ComposeTestCheckFunc(
+					testAccAWSAMILaunchPermissionDestroyed(account_id, &image_id),
+				),
+			},
 		},
-		CheckDestroy: testAccAWSAMILaunchPermissionDestroyed(account_id, &image_id),
 	})
 }
 
@@ -75,8 +82,8 @@ func testAccAWSAMILaunchPermissionDestroyed(account_id string, image_id *string)
 	}
 }
 
-func testAccAWSAMILaunchPermissionConfig(account_id string) string {
-	return fmt.Sprintf(`
+func testAccAWSAMILaunchPermissionConfig(account_id string, includeLaunchPermission bool) string {
+	base := `
 provider "aws" {
   region = "us-west-2"
 }
@@ -87,7 +94,13 @@ resource "aws_ami_copy" "test" {
   source_ami_id = "ami-7172b611"
   source_ami_region = "us-west-2"
 }
+`
+
+	if !includeLaunchPermission {
+		return base
+	}
 
+	return base + fmt.Sprintf(`
 resource "aws_ami_launch_permission" "self-test" {
     image_id   = "${aws_ami_copy.test.id}"
     account_id = "%s"