From 8a681e135fd52bf932098ece18c4801ff4f076b8 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Fri, 15 May 2020 00:48:34 -0400 Subject: [PATCH 1/2] enable linter --- aws/resource_aws_cloudfront_distribution.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go index 827b84b97aa..b55519209ee 100644 --- a/aws/resource_aws_cloudfront_distribution.go +++ b/aws/resource_aws_cloudfront_distribution.go @@ -68,13 +68,13 @@ func resourceAwsCloudFrontDistribution() *schema.Resource { Optional: true, }, "forwarded_values": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "cookies": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ From 45bf57207f417e0f53ed8d26232686012c7b64f4 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 18 May 2020 23:51:42 -0400 Subject: [PATCH 2/2] run go fmt --- aws/resource_aws_cloudfront_distribution_test.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/aws/resource_aws_cloudfront_distribution_test.go b/aws/resource_aws_cloudfront_distribution_test.go index cf4ba8e625c..87f341a1c0c 100644 --- a/aws/resource_aws_cloudfront_distribution_test.go +++ b/aws/resource_aws_cloudfront_distribution_test.go @@ -323,10 +323,9 @@ func TestAccAWSCloudFrontDistribution_noOptionalItemsConfig(t *testing.T) { var distribution cloudfront.Distribution resourceName := "aws_cloudfront_distribution.no_optional_items" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontDistributionDestroy, - DisableBinaryDriver: true, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontDistributionDestroy, Steps: []resource.TestStep{ { Config: testAccAWSCloudFrontDistributionNoOptionalItemsConfig, @@ -1080,10 +1079,9 @@ func TestAccAWSCloudFrontDistribution_OriginGroups(t *testing.T) { ri := acctest.RandInt() testConfig := fmt.Sprintf(testAccAWSCloudFrontDistributionOriginGroupsConfig, ri, originBucket, backupBucket, testAccAWSCloudFrontDistributionRetainConfig()) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckCloudFrontDistributionDestroy, - DisableBinaryDriver: true, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCloudFront(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudFrontDistributionDestroy, Steps: []resource.TestStep{ { Config: testConfig,