Merge pull request #14484 from terraform-providers/td-config-format-ds8

Fix acc test configs (up to VPC endpoint)
hashicorp · Aug 6, 2020 · f2a94af · f2a94af
2 parents 43d37bf + d8a6350
commit f2a94af
Show file tree

Hide file tree

Showing 17 changed files with 193 additions and 191 deletions.
diff --git a/aws/data_source_aws_secretsmanager_secret_rotation_test.go b/aws/data_source_aws_secretsmanager_secret_rotation_test.go
@@ -47,32 +47,32 @@ resource "aws_lambda_function" "test" {
   filename      = "test-fixtures/lambdatest.zip"
   function_name = "%[1]s-1"
   handler       = "exports.example"
-  role          = "${aws_iam_role.iam_for_lambda.arn}"
+  role          = aws_iam_role.iam_for_lambda.arn
   runtime       = "nodejs12.x"
 }
 
 resource "aws_lambda_permission" "test" {
-  action         = "lambda:InvokeFunction"
-  function_name  = "${aws_lambda_function.test.function_name}"
-  principal      = "secretsmanager.amazonaws.com"
-  statement_id   = "AllowExecutionFromSecretsManager"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.test.function_name
+  principal     = "secretsmanager.amazonaws.com"
+  statement_id  = "AllowExecutionFromSecretsManager"
 }
 
 resource "aws_secretsmanager_secret" "test" {
   name = "%[1]s"
 }
 
 resource "aws_secretsmanager_secret_rotation" "test" {
-	secret_id 					= "${aws_secretsmanager_secret.test.id}"
-	rotation_lambda_arn = "${aws_lambda_function.test.arn}"
+  secret_id           = aws_secretsmanager_secret.test.id
+  rotation_lambda_arn = aws_lambda_function.test.arn
 
-	rotation_rules {
+  rotation_rules {
     automatically_after_days = %[2]d
-	}
+  }
 }
 
 data "aws_secretsmanager_secret_rotation" "test" {
-  secret_id = "${aws_secretsmanager_secret_rotation.test.secret_id}"
+  secret_id = aws_secretsmanager_secret_rotation.test.secret_id
 }
 `, rName, automaticallyAfterDays)
 }
diff --git a/aws/data_source_aws_secretsmanager_secret_test.go b/aws/data_source_aws_secretsmanager_secret_test.go
@@ -138,7 +138,7 @@ resource "aws_secretsmanager_secret" "test" {
 }
 
 data "aws_secretsmanager_secret" "test" {
-  arn = "${aws_secretsmanager_secret.test.arn}"
+  arn = aws_secretsmanager_secret.test.arn
 }
 `, rName)
 }
@@ -165,7 +165,7 @@ resource "aws_secretsmanager_secret" "test" {
 }
 
 data "aws_secretsmanager_secret" "test" {
-  name = "${aws_secretsmanager_secret.test.name}"
+  name = aws_secretsmanager_secret.test.name
 }
 `, rName)
 }
@@ -179,22 +179,22 @@ resource "aws_secretsmanager_secret" "test" {
 {
   "Version": "2012-10-17",
   "Statement": [
-	{
-	  "Sid": "EnableAllPermissions",
-	  "Effect": "Allow",
-	  "Principal": {
-		"AWS": "*"
-	  },
-	  "Action": "secretsmanager:GetSecretValue",
-	  "Resource": "*"
-	}
+    {
+      "Sid": "EnableAllPermissions",
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "*"
+      },
+      "Action": "secretsmanager:GetSecretValue",
+      "Resource": "*"
+    }
   ]
 }
 POLICY
 }
 
 data "aws_secretsmanager_secret" "test" {
-  name = "${aws_secretsmanager_secret.test.name}"
+  name = aws_secretsmanager_secret.test.name
 }
 `, rName)
 }

diff --git a/aws/data_source_aws_secretsmanager_secret_version_test.go b/aws/data_source_aws_secretsmanager_secret_version_test.go
@@ -116,13 +116,13 @@ resource "aws_secretsmanager_secret" "test" {
 }
 
 resource "aws_secretsmanager_secret_version" "test" {
-  secret_id     = "${aws_secretsmanager_secret.test.id}"
+  secret_id     = aws_secretsmanager_secret.test.id
   secret_string = "test-string"
 }
 
 data "aws_secretsmanager_secret_version" "test" {
-  secret_id  = "${aws_secretsmanager_secret.test.id}"
-  version_id = "${aws_secretsmanager_secret_version.test.version_id}"
+  secret_id  = aws_secretsmanager_secret.test.id
+  version_id = aws_secretsmanager_secret_version.test.version_id
 }
 `, rName)
 }
@@ -134,13 +134,13 @@ resource "aws_secretsmanager_secret" "test" {
 }
 
 resource "aws_secretsmanager_secret_version" "test" {
-  secret_id      = "${aws_secretsmanager_secret.test.id}"
+  secret_id      = aws_secretsmanager_secret.test.id
   secret_string  = "test-string"
   version_stages = ["test-stage", "AWSCURRENT"]
 }
 
 data "aws_secretsmanager_secret_version" "test" {
-  secret_id     = "${aws_secretsmanager_secret_version.test.secret_id}"
+  secret_id     = aws_secretsmanager_secret_version.test.secret_id
   version_stage = "test-stage"
 }
 `, rName)
@@ -153,12 +153,12 @@ resource "aws_secretsmanager_secret" "test" {
 }
 
 resource "aws_secretsmanager_secret_version" "test" {
-  secret_id     = "${aws_secretsmanager_secret.test.id}"
+  secret_id     = aws_secretsmanager_secret.test.id
   secret_string = "test-string"
 }
 
 data "aws_secretsmanager_secret_version" "test" {
-  secret_id = "${aws_secretsmanager_secret_version.test.secret_id}"
+  secret_id = aws_secretsmanager_secret_version.test.secret_id
 }
 `, rName)
 }
diff --git a/aws/data_source_aws_security_group_test.go b/aws/data_source_aws_security_group_test.go
@@ -113,7 +113,7 @@ resource "aws_vpc" "test" {
 }
 
 resource "aws_security_group" "test" {
-  vpc_id = "${aws_vpc.test.id}"
+  vpc_id = aws_vpc.test.id
   name   = "test-%d"
 
   tags = {
@@ -125,28 +125,28 @@ resource "aws_security_group" "test" {
 }
 
 data "aws_security_group" "by_id" {
-  id = "${aws_security_group.test.id}"
+  id = aws_security_group.test.id
 }
 
 data "aws_security_group" "by_name" {
-  name = "${aws_security_group.test.name}"
+  name = aws_security_group.test.name
 }
 
 data "aws_security_group" "default_by_name" {
-  vpc_id = "${aws_vpc.test.id}"
+  vpc_id = aws_vpc.test.id
   name   = "default"
 }
 
 data "aws_security_group" "by_tag" {
   tags = {
-    Seed = "${aws_security_group.test.tags["Seed"]}"
+    Seed = aws_security_group.test.tags["Seed"]
   }
 }
 
 data "aws_security_group" "by_filter" {
   filter {
     name   = "group-name"
-    values = ["${aws_security_group.test.name}"]
+    values = [aws_security_group.test.name]
   }
 }
 `, rInt, rInt)

diff --git a/aws/data_source_aws_security_groups_test.go b/aws/data_source_aws_security_groups_test.go
@@ -54,7 +54,7 @@ resource "aws_vpc" "test_tag" {
 
 resource "aws_security_group" "test" {
   count  = 3
-  vpc_id = "${aws_vpc.test_tag.id}"
+  vpc_id = aws_vpc.test_tag.id
   name   = "tf-%[1]d-${count.index}"
 
   tags = {
@@ -64,7 +64,7 @@ resource "aws_security_group" "test" {
 
 data "aws_security_groups" "by_tag" {
   tags = {
-    Seed = "${aws_security_group.test.0.tags["Seed"]}"
+    Seed = aws_security_group.test.0.tags["Seed"]
   }
 }
 `, rInt)
@@ -82,7 +82,7 @@ resource "aws_vpc" "test_filter" {
 
 resource "aws_security_group" "test" {
   count  = 3
-  vpc_id = "${aws_vpc.test_filter.id}"
+  vpc_id = aws_vpc.test_filter.id
   name   = "tf-%[1]d-${count.index}"
 
   tags = {
@@ -93,7 +93,7 @@ resource "aws_security_group" "test" {
 data "aws_security_groups" "by_filter" {
   filter {
     name   = "vpc-id"
-    values = ["${aws_vpc.test_filter.id}"]
+    values = [aws_vpc.test_filter.id]
   }
 
   filter {

diff --git a/aws/data_source_aws_sfn_activity_test.go b/aws/data_source_aws_sfn_activity_test.go
@@ -42,8 +42,9 @@ func testAccCheckAWSStepFunctionsActivityDataSourceConfig_ActivityArn(rName stri
 resource aws_sfn_activity "test" {
   name = "%s"
 }
+
 data aws_sfn_activity "test" {
-  arn = "${aws_sfn_activity.test.id}"
+  arn = aws_sfn_activity.test.id
 }
 `, rName)
 }
@@ -53,8 +54,9 @@ func testAccCheckAWSStepFunctionsActivityDataSourceConfig_ActivityName(rName str
 resource aws_sfn_activity "test" {
   name = "%s"
 }
+
 data aws_sfn_activity "test" {
-  name = "${aws_sfn_activity.test.name}"
+  name = aws_sfn_activity.test.name
 }
 `, rName)
 }
diff --git a/aws/data_source_aws_sfn_state_machine_test.go b/aws/data_source_aws_sfn_state_machine_test.go
@@ -57,7 +57,7 @@ EOF
 
 resource "aws_sfn_state_machine" "test" {
   name     = "test_sfn_%s"
-  role_arn = "${aws_iam_role.iam_for_sfn.arn}"
+  role_arn = aws_iam_role.iam_for_sfn.arn
 
   definition = <<EOF
 {
@@ -72,7 +72,7 @@ EOF
 }
 
 data "aws_sfn_state_machine" "test" {
-  name = "${aws_sfn_state_machine.test.name}"
+  name = aws_sfn_state_machine.test.name
 }
 `, rName, rName)
 }
diff --git a/aws/data_source_aws_sns_test.go b/aws/data_source_aws_sns_test.go
@@ -61,6 +61,6 @@ resource "aws_sns_topic" "tf_wrong2" {
 }
 
 data "aws_sns_topic" "by_name" {
-  name = "${aws_sns_topic.tf_test.name}"
+  name = aws_sns_topic.tf_test.name
 }
 `
diff --git a/aws/data_source_aws_sqs_queue_test.go b/aws/data_source_aws_sqs_queue_test.go
@@ -95,7 +95,7 @@ resource "aws_sqs_queue" "test" {
 }
 
 data "aws_sqs_queue" "by_name" {
-  name = "${aws_sqs_queue.test.name}"
+  name = aws_sqs_queue.test.name
 }
 `, rName)
 }
@@ -113,7 +113,7 @@ resource "aws_sqs_queue" "test" {
 }
 
 data "aws_sqs_queue" "by_name" {
-  name = "${aws_sqs_queue.test.name}"
+  name = aws_sqs_queue.test.name
 }
 `, rName)
 }
diff --git a/aws/data_source_aws_ssm_document_test.go b/aws/data_source_aws_ssm_document_test.go
@@ -49,28 +49,28 @@ resource "aws_ssm_document" "test" {
   document_type = "Command"
 
   content = <<DOC
-  {
-    "schemaVersion": "1.2",
-    "description": "Check ip configuration of a Linux instance.",
-    "parameters": {
-
-    },
-    "runtimeConfig": {
-      "aws:runShellScript": {
-        "properties": [
-          {
-            "id": "0.aws:runShellScript",
-            "runCommand": ["ifconfig"]
-          }
-        ]
-      }
+{
+  "schemaVersion": "1.2",
+  "description": "Check ip configuration of a Linux instance.",
+  "parameters": {},
+  "runtimeConfig": {
+    "aws:runShellScript": {
+      "properties": [
+        {
+          "id": "0.aws:runShellScript",
+          "runCommand": [
+            "ifconfig"
+          ]
+        }
+      ]
     }
   }
+}
 DOC
 }
 
 data "aws_ssm_document" "test" {
-  name            = "${aws_ssm_document.test.name}"
+  name            = aws_ssm_document.test.name
   document_format = "%s"
 }
 `, name, documentFormat)

diff --git a/aws/data_source_aws_ssm_parameter_test.go b/aws/data_source_aws_ssm_parameter_test.go
@@ -76,7 +76,7 @@ resource "aws_ssm_parameter" "test" {
 }
 
 data "aws_ssm_parameter" "test" {
-  name            = "${aws_ssm_parameter.test.name}"
+  name            = aws_ssm_parameter.test.name
   with_decryption = %s
 }
 `, name, withDecryption)

diff --git a/aws/data_source_aws_ssm_patch_baseline_test.go b/aws/data_source_aws_ssm_patch_baseline_test.go
@@ -51,9 +51,9 @@ func TestAccAWSSsmPatchBaselineDataSource_newBaseline(t *testing.T) {
 func testAccCheckAwsSsmPatchBaselineDataSourceConfig_existingBaseline() string {
 	return `
 data "aws_ssm_patch_baseline" "test_existing" {
-	owner            = "AWS"
-	name_prefix	     = "AWS-"
-	operating_system = "CENTOS"
+  owner            = "AWS"
+  name_prefix      = "AWS-"
+  operating_system = "CENTOS"
 }
 `
 }
@@ -62,23 +62,23 @@ data "aws_ssm_patch_baseline" "test_existing" {
 func testAccCheckAwsSsmPatchBaselineDataSourceConfig_newBaseline(name string) string {
 	return fmt.Sprintf(`
 resource "aws_ssm_patch_baseline" "test_new" {
-	name             = "%s"
-	operating_system = "AMAZON_LINUX_2"
-	description      = "Test"
+  name             = "%s"
+  operating_system = "AMAZON_LINUX_2"
+  description      = "Test"
 
-	approval_rule {
-		approve_after_days = 5
-		patch_filter {
-			key    = "CLASSIFICATION"
-			values = ["*"]
-		}
-	}
+  approval_rule {
+    approve_after_days = 5
+    patch_filter {
+      key    = "CLASSIFICATION"
+      values = ["*"]
+    }
+  }
 }
 
 data "aws_ssm_patch_baseline" "test_new" {
-	owner            = "Self"
-	name_prefix      = "${aws_ssm_patch_baseline.test_new.name}"
-	operating_system = "AMAZON_LINUX_2"
+  owner            = "Self"
+  name_prefix      = aws_ssm_patch_baseline.test_new.name
+  operating_system = "AMAZON_LINUX_2"
 }
 `, name)
 }