Merge pull request #14483 from terraform-providers/td-config-format-ds7

Fix data source test configs (up to s3 bucket)

aws/data_source_aws_autoscaling_groups_test.go

@@ -243,7 +243,6 @@ resource "aws_autoscaling_group" "barbaz" {
 }
 
 data "aws_autoscaling_groups" "group_list" {
-
   filter {
     name   = "key"
     values = ["Foo"]

aws/data_source_aws_availability_zone_test.go

@@ -133,7 +133,6 @@ data "aws_availability_zones" "test" {
 }
 
 data "aws_availability_zone" "test" {
-
   filter {
     name   = "zone-name"
     values = [data.aws_availability_zones.test.names[0]]

aws/data_source_aws_availability_zones_test.go

@@ -310,7 +310,6 @@ data "aws_availability_zones" "test" {
 func testAccCheckAwsAvailabilityZonesConfigFilter() string {
 	return `
 data "aws_availability_zones" "test" {
-
   filter {
     name   = "state"
     values = ["available"]

aws/data_source_aws_ebs_snapshot_test.go

@@ -134,7 +134,6 @@ resource "aws_ebs_snapshot" "test" {
 }
 
 data "aws_ebs_snapshot" "test" {
-
   filter {
     name   = "snapshot-id"
     values = [aws_ebs_snapshot.test.id]

aws/data_source_aws_ebs_volumes_test.go

@@ -37,7 +37,6 @@ func testAccDataSourceAwsEbsVolumeIDsConfigWithDataSource(rInt int) string {
 %s
 
 data "aws_ebs_volumes" "subject_under_test" {
-
   tags = {
     TestIdentifierSet = "testAccDataSourceAwsEbsVolumes-%d"
   }

aws/data_source_aws_elasticsearch_domain_test.go

@@ -113,9 +113,11 @@ POLICY
     instance_type            = "t2.small.elasticsearch"
     instance_count           = 2
     dedicated_master_enabled = false
+
     zone_awareness_config {
       availability_zone_count = 2
     }
+
     zone_awareness_enabled = true
   }
 
@@ -238,9 +240,11 @@ POLICY
     instance_type            = "t2.small.elasticsearch"
     instance_count           = 2
     dedicated_master_enabled = false
+
     zone_awareness_config {
       availability_zone_count = 2
     }
+
     zone_awareness_enabled = true
   }
 

aws/data_source_aws_iam_policy_document_test.go

@@ -367,89 +367,89 @@ var testAccAWSIAMPolicyDocumentExpectedJSON = `{
 
 var testAccAWSIAMPolicyDocumentSourceConfig = `
 data "aws_iam_policy_document" "test" {
-    policy_id = "policy_id"
+  policy_id = "policy_id"
 
-    statement {
-        sid = "1"
-        actions = [
-            "s3:ListAllMyBuckets",
-            "s3:GetBucketLocation",
-        ]
-        resources = [
-            "arn:aws:s3:::*",
-        ]
-    }
+  statement {
+    sid = "1"
+    actions = [
+      "s3:ListAllMyBuckets",
+      "s3:GetBucketLocation",
+    ]
+    resources = [
+      "arn:aws:s3:::*",
+    ]
+  }
 
-    statement {
-        actions = [
-            "s3:ListBucket",
-        ]
+  statement {
+    actions = [
+      "s3:ListBucket",
+    ]
 
-        resources = [
-            "arn:aws:s3:::foo",
-        ]
+    resources = [
+      "arn:aws:s3:::foo",
+    ]
 
-        condition {
-            test = "StringLike"
-            variable = "s3:prefix"
-            values = [
-                "home/",
-                "home/&{aws:username}/",
-            ]
-        }
+    condition {
+      test     = "StringLike"
+      variable = "s3:prefix"
+      values = [
+        "home/",
+        "home/&{aws:username}/",
+      ]
+    }
 
-        not_principals {
-            type = "AWS"
-            identifiers = ["arn:blahblah:example"]
-        }
+    not_principals {
+      type        = "AWS"
+      identifiers = ["arn:blahblah:example"]
     }
+  }
 
-    statement {
-        actions = [
-            "s3:*",
-        ]
+  statement {
+    actions = [
+      "s3:*",
+    ]
 
-        resources = [
-            "arn:aws:s3:::foo/home/&{aws:username}",
-            "arn:aws:s3:::foo/home/&{aws:username}/*",
-        ]
+    resources = [
+      "arn:aws:s3:::foo/home/&{aws:username}",
+      "arn:aws:s3:::foo/home/&{aws:username}/*",
+    ]
 
-        principals {
-            type = "AWS"
-            identifiers = [
-              "arn:blahblah:example",
-              "arn:blahblahblah:example",
-			      ]
-        }
+    principals {
+      type = "AWS"
+      identifiers = [
+        "arn:blahblah:example",
+        "arn:blahblahblah:example",
+      ]
     }
+  }
 
-    statement {
-        effect = "Deny"
-        not_actions = ["s3:*"]
-        not_resources = ["arn:aws:s3:::*"]
-    }
+  statement {
+    effect        = "Deny"
+    not_actions   = ["s3:*"]
+    not_resources = ["arn:aws:s3:::*"]
+  }
 
-    # Normalization of wildcard principals
+  # Normalization of wildcard principals
 
-    statement {
-        effect = "Allow"
-        actions = ["kinesis:*"]
+  statement {
+    effect  = "Allow"
+    actions = ["kinesis:*"]
 
-        principals {
-            type = "AWS"
-            identifiers = ["*"]
-        }
+    principals {
+      type        = "AWS"
+      identifiers = ["*"]
     }
+  }
 
-    statement {
-        effect = "Allow"
-        actions = ["firehose:*"]
+  statement {
+    effect  = "Allow"
+    actions = ["firehose:*"]
 
-        principals {
-            type = "*"
-            identifiers = ["*"]
-        }
+    principals {
+      type        = "*"
+      identifiers = ["*"]
     }
+  }
 }
 
 data "aws_iam_policy_document" "test_source" {
@@ -595,7 +595,6 @@ var testAccAWSIAMPolicyDocumentSourceConflictingExpectedJSON = `{
 
 var testAccAWSIAMPolicyDocumentOverrideConfig = `
 data "aws_iam_policy_document" "override" {
-
   statement {
     sid = "SidToOverwrite"
 
@@ -646,22 +645,22 @@ var testAccAWSIAMPolicyDocumentOverrideExpectedJSON = `{
 var testAccAWSIAMPolicyDocumentNoStatementMergeConfig = `
 data "aws_iam_policy_document" "source" {
   statement {
-    sid = ""
+    sid       = ""
     actions   = ["ec2:DescribeAccountAttributes"]
     resources = ["*"]
   }
 }
 
 data "aws_iam_policy_document" "override" {
   statement {
-    sid = "OverridePlaceholder"
+    sid       = "OverridePlaceholder"
     actions   = ["s3:GetObject"]
     resources = ["*"]
   }
 }
 
 data "aws_iam_policy_document" "yak_politik" {
-  source_json = data.aws_iam_policy_document.source.json
+  source_json   = data.aws_iam_policy_document.source.json
   override_json = data.aws_iam_policy_document.override.json
 }
 `
@@ -687,22 +686,22 @@ var testAccAWSIAMPolicyDocumentNoStatementMergeExpectedJSON = `{
 var testAccAWSIAMPolicyDocumentNoStatementOverrideConfig = `
 data "aws_iam_policy_document" "source" {
   statement {
-    sid = "OverridePlaceholder"
+    sid       = "OverridePlaceholder"
     actions   = ["ec2:DescribeAccountAttributes"]
     resources = ["*"]
   }
 }
 
 data "aws_iam_policy_document" "override" {
   statement {
-    sid = "OverridePlaceholder"
+    sid       = "OverridePlaceholder"
     actions   = ["s3:GetObject"]
     resources = ["*"]
   }
 }
 
 data "aws_iam_policy_document" "yak_politik" {
-  source_json = data.aws_iam_policy_document.source.json
+  source_json   = data.aws_iam_policy_document.source.json
   override_json = data.aws_iam_policy_document.override.json
 }
 `
@@ -722,16 +721,16 @@ var testAccAWSIAMPolicyDocumentNoStatementOverrideExpectedJSON = `{
 var testAccAWSIAMPolicyDocumentDuplicateSidConfig = `
 data "aws_iam_policy_document" "test" {
   statement {
-    sid    = "1"
-    effect = "Allow"
-    actions = ["ec2:DescribeAccountAttributes"]
+    sid       = "1"
+    effect    = "Allow"
+    actions   = ["ec2:DescribeAccountAttributes"]
     resources = ["*"]
   }
 
   statement {
-    sid    = "1"
-    effect = "Allow"
-    actions = ["s3:GetObject"]
+    sid       = "1"
+    effect    = "Allow"
+    actions   = ["s3:GetObject"]
     resources = ["*"]
   }
 }
@@ -777,7 +776,7 @@ const testAccAWSIAMPolicyDocumentDataSourceConfigVersion20081017 = `
 data "aws_iam_policy_document" "test" {
   version = "2008-10-17"
 
-   statement {
+  statement {
     actions   = ["ec2:*"]
     resources = ["*"]
   }
@@ -800,12 +799,12 @@ const testAccAWSIAMPolicyDocumentDataSourceConfigVersion20081017ConversionCondit
 data "aws_iam_policy_document" "test" {
   version = "2008-10-17"
 
-   statement {
+  statement {
     actions   = ["*"]
     resources = ["*"]
 
     condition {
-      test   = "StringLike"
+      test = "StringLike"
       values = [
         "home/",
         "home/&{aws:username}/",

aws/data_source_aws_kms_key_test.go

@@ -57,7 +57,7 @@ resource "aws_kms_key" "test" {
 }
 
 data "aws_kms_key" "test" {
-  key_id = "${aws_kms_key.test.key_id}"
+  key_id = aws_kms_key.test.key_id
 }
 `, rName)
 }

aws/data_source_aws_route53_delegation_set_test.go

@@ -40,10 +40,10 @@ resource "aws_route53_delegation_set" "dset" {
 
 resource "aws_route53_zone" "primary" {
   name              = "example.xyz"
-  delegation_set_id = "${aws_route53_delegation_set.dset.id}"
+  delegation_set_id = aws_route53_delegation_set.dset.id
 }
 
 data "aws_route53_delegation_set" "dset" {
-  id = "${aws_route53_delegation_set.dset.id}"
+  id = aws_route53_delegation_set.dset.id
 }
 `