provider/aws: Preserve default retain_on_delete in cloudfront import

Fixes: #10969
hashicorp · Mar 30, 2017 · 4124c8f · 4124c8f
1 parent b6a3840
commit 4124c8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/builtin/providers/aws/import_aws_cloudfront_distribution.go b/builtin/providers/aws/import_aws_cloudfront_distribution.go
@@ -7,6 +7,10 @@ import (
 )
 
 func resourceAwsCloudFrontDistributionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	// This is a non API attribute
+	// We are merely setting this to the same value as the Default setting in the schema
+	d.Set("retain_on_delete", false)
+
 	conn := meta.(*AWSClient).cloudfrontconn
 	id := d.Id()
 	resp, err := conn.GetDistributionConfig(&cloudfront.GetDistributionConfigInput{

diff --git a/builtin/providers/aws/import_aws_cloudfront_distribution_test.go b/builtin/providers/aws/import_aws_cloudfront_distribution_test.go
@@ -19,16 +19,13 @@ func TestAccAWSCloudFrontDistribution_importBasic(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
+			{
 				Config: testConfig,
 			},
-			resource.TestStep{
+			{
 				ResourceName:      resourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
-				// Ignore retain_on_delete since it doesn't come from the AWS
-				// API.
-				ImportStateVerifyIgnore: []string{"retain_on_delete"},
 			},
 		},
 	})