Merge pull request #15070 from terraform-providers/acctest-tflint-res…

…ources-part3

Updates resource acceptance tests to Terraform 0.12 syntax, batch 3: EBS to GuardDuty

.github/workflows/acctest-terraform-lint.yml

@@ -9,7 +9,7 @@ on:
       - .github/workflows/acctest-terraform-lint.yml
       - aws/core_acceptance_test.go
       - aws/data_source_aws_*_test.go
-      - aws/resource_aws_[a-d]*_test.go
+      - aws/resource_aws_[a-g]*_test.go
 
 env:
   GO_VERSION: "1.14"
@@ -44,10 +44,15 @@ jobs:
             -o -name 'resource_aws_b*_test.go' \
             -o -name 'resource_aws_c*_test.go' \
             -o -name 'resource_aws_d*_test.go' \
+            -o -name 'resource_aws_e*_test.go' \
+            -o -name 'resource_aws_f*_test.go' \
+            -o -name 'resource_aws_g*_test.go' \
             \) \
             | sort -u \
             | grep -v resource_aws_apigatewayv2_domain_name_test.go \
             | grep -v resource_aws_dynamodb_table_test.go \
+            | grep -v resource_aws_ecs_capacity_provider_test.go \
+            | grep -v resource_aws_efs_file_system_test.go \
             | xargs -I {} terrafmt diff --check --quiet --fmtcompat {}
 
   validate-terraform:
@@ -82,9 +87,15 @@ jobs:
             -o -name 'resource_aws_b*_test.go' \
             -o -name 'resource_aws_c*_test.go' \
             -o -name 'resource_aws_d*_test.go' \
+            -o -name 'resource_aws_e*_test.go' \
+            -o -name 'resource_aws_f*_test.go' \
+            -o -name 'resource_aws_g*_test.go' \
             \) \
             | sort -u \
             | grep -v resource_aws_apigatewayv2_domain_name_test.go \
             | grep -v resource_aws_dynamodb_table_test.go \
+            | grep -v resource_aws_ecs_capacity_provider_test.go \
+            | grep -v resource_aws_efs_file_system_test.go \
+            | grep -v resource_aws_elasticache_cluster_test.go \
             | ./scripts/validate-terraform.sh
           

aws/data_source_aws_outposts_outposts_test.go

@@ -63,7 +63,7 @@ func testAccPreCheckAWSOutpostsOutposts(t *testing.T) {
 
 	// Ensure there is at least one Outpost
 	if output == nil || len(output.Outposts) == 0 {
-		t.Skip("skipping since no Outposts Outpost found")
+		t.Skip("skipping since no Outposts found")
 	}
 }
 

aws/resource_aws_ebs_volume_test.go

@@ -552,7 +552,7 @@ resource "aws_instance" "test" {
   }
 
   tags = {
-    Name    = "test-terraform"
+    Name = "test-terraform"
   }
 }
 

aws/resource_aws_ec2_availability_zone_group_test.go

@@ -86,7 +86,7 @@ data "aws_availability_zones" "test" {
   # Filter to one Availability Zone Group per Region as Local Zones become available
   # e.g. ensure there are not two us-west-2-XXX when adding to this list
   filter {
-    name   = "group-name"
+    name = "group-name"
     values = [
       "us-west-2-lax-1",
     ]

aws/resource_aws_ec2_client_vpn_authorization_rule_test.go

@@ -324,12 +324,12 @@ resource "aws_ec2_client_vpn_endpoint" "test" {
   client_cidr_block      = "10.0.0.0/16"
 
   authentication_options {
-	type                       = "certificate-authentication"
-	root_certificate_chain_arn = aws_acm_certificate.test.arn
+    type                       = "certificate-authentication"
+    root_certificate_chain_arn = aws_acm_certificate.test.arn
   }
 
   connection_log_options {
-	enabled = false
+    enabled = false
   }
 }`, rName))
 }

aws/resource_aws_ec2_client_vpn_network_association_test.go

@@ -307,7 +307,7 @@ resource "aws_ec2_client_vpn_network_association" "test" {
   subnet_id              = aws_subnet.test.id
   security_groups        = [aws_security_group.test1.id, aws_security_group.test2.id]
 }
-    
+
 resource "aws_ec2_client_vpn_endpoint" "test" {
   description            = "terraform-testacc-clientvpn-%[1]s"
   server_certificate_arn = aws_acm_certificate.test.arn

aws/resource_aws_ec2_client_vpn_route_test.go

@@ -172,12 +172,12 @@ resource "aws_ec2_client_vpn_endpoint" "test" {
   client_cidr_block      = "10.0.0.0/16"
 
   authentication_options {
-	type                       = "certificate-authentication"
-	root_certificate_chain_arn = aws_acm_certificate.test.arn
+    type                       = "certificate-authentication"
+    root_certificate_chain_arn = aws_acm_certificate.test.arn
   }
 
   connection_log_options {
-	enabled = false
+    enabled = false
   }
 }
 `, rName))
@@ -195,7 +195,7 @@ resource "aws_ec2_client_vpn_route" "test" {
   description            = "test client VPN route"
 
   depends_on = [
-	aws_ec2_client_vpn_network_association.test,
+    aws_ec2_client_vpn_network_association.test,
   ]
 }
 
@@ -210,12 +210,12 @@ resource "aws_ec2_client_vpn_endpoint" "test" {
   client_cidr_block      = "10.0.0.0/16"
 
   authentication_options {
-	type                       = "certificate-authentication"
-	root_certificate_chain_arn = aws_acm_certificate.test.arn
+    type                       = "certificate-authentication"
+    root_certificate_chain_arn = aws_acm_certificate.test.arn
   }
 
   connection_log_options {
-	enabled = false
+    enabled = false
   }
 }
 `, rName))

aws/resource_aws_ec2_fleet_test.go

@@ -1385,8 +1385,8 @@ resource "aws_launch_template" "test2" {
 resource "aws_ec2_fleet" "test" {
   launch_template_config {
     launch_template_specification {
-      launch_template_id = "${%s.id}"
-      version            = "${%s.latest_version}"
+      launch_template_id = %s.id
+      version            = %s.latest_version
     }
   }
 
@@ -1425,8 +1425,8 @@ resource "aws_launch_template" "test2" {
 resource "aws_ec2_fleet" "test" {
   launch_template_config {
     launch_template_specification {
-      launch_template_name = "${%s.name}"
-      version              = "${%s.latest_version}"
+      launch_template_name = %s.name
+      version              = %s.latest_version
     }
   }
 
@@ -1491,7 +1491,7 @@ resource "aws_ec2_fleet" "test" {
     }
 
     override {
-      availability_zone = "${data.aws_availability_zones.available.names[%d]}"
+      availability_zone = data.aws_availability_zones.available.names[%d]
     }
   }
 
@@ -1615,7 +1615,7 @@ resource "aws_subnet" "test" {
   count = 2
 
   cidr_block = "10.1.${count.index}.0/24"
-  vpc_id     = "${aws_vpc.test.id}"
+  vpc_id     = aws_vpc.test.id
 
   tags = {
     Name = var.TestAccNameTag
@@ -1630,7 +1630,7 @@ resource "aws_ec2_fleet" "test" {
     }
 
     override {
-      subnet_id = "${aws_subnet.test.*.id[%d]}"
+      subnet_id = aws_subnet.test.*.id[%d]
     }
   }
 

aws/resource_aws_ec2_traffic_mirror_target_test.go

@@ -233,7 +233,7 @@ resource "aws_lb" "lb" {
   load_balancer_type = "network"
   subnets            = [aws_subnet.sub1.id, aws_subnet.sub2.id]
 
-  enable_deletion_protection  = false
+  enable_deletion_protection = false
 
   tags = {
     Name        = %[1]q
@@ -254,12 +254,12 @@ data "aws_ami" "amzn-linux" {
   most_recent = true
 
   filter {
-    name = "name"
+    name   = "name"
     values = ["amzn2-ami-hvm-2.0*"]
   }
 
   filter {
-    name = "architecture"
+    name   = "architecture"
     values = ["x86_64"]
   }
 
@@ -291,7 +291,7 @@ resource "aws_lb" "lb" {
   load_balancer_type = "network"
   subnets            = [aws_subnet.sub1.id, aws_subnet.sub2.id]
 
-  enable_deletion_protection  = false
+  enable_deletion_protection = false
 
   tags = {
     Name        = %[1]q
@@ -318,7 +318,7 @@ resource "aws_lb" "lb" {
   load_balancer_type = "network"
   subnets            = [aws_subnet.sub1.id, aws_subnet.sub2.id]
 
-  enable_deletion_protection  = false
+  enable_deletion_protection = false
 
   tags = {
     Name        = %[1]q

aws/resource_aws_ec2_transit_gateway_peering_attachment_test.go

@@ -377,7 +377,8 @@ resource "aws_ec2_transit_gateway_peering_attachment" "test" {
   transit_gateway_id      = aws_ec2_transit_gateway.test.id
 
   tags = {
-    Name  = %[2]q
+    Name = %[2]q
+
     %[3]s = %[4]q
   }
 }
@@ -392,7 +393,8 @@ resource "aws_ec2_transit_gateway_peering_attachment" "test" {
   transit_gateway_id      = aws_ec2_transit_gateway.test.id
 
   tags = {
-    Name  = %[2]q
+    Name = %[2]q
+
     %[3]s = %[4]q
     %[5]s = %[6]q
   }

aws/resource_aws_ec2_transit_gateway_vpc_attachment_test.go

@@ -773,7 +773,7 @@ resource "aws_subnet" "test" {
 resource "aws_ec2_transit_gateway" "test" {}
 
 resource "aws_ec2_transit_gateway_vpc_attachment" "test" {
-  subnet_ids         = [aws_subnet.test.0.id]
+  subnet_ids         = [aws_subnet.test[0].id]
   transit_gateway_id = aws_ec2_transit_gateway.test.id
   vpc_id             = aws_vpc.test.id
 }
@@ -816,7 +816,7 @@ resource "aws_subnet" "test" {
 resource "aws_ec2_transit_gateway" "test" {}
 
 resource "aws_ec2_transit_gateway_vpc_attachment" "test" {
-  subnet_ids         = [aws_subnet.test.0.id, aws_subnet.test.1.id]
+  subnet_ids         = [aws_subnet.test[0].id, aws_subnet.test[1].id]
   transit_gateway_id = aws_ec2_transit_gateway.test.id
   vpc_id             = aws_vpc.test.id
 }

aws/resource_aws_ecs_capacity_provider_test.go

@@ -365,13 +365,13 @@ resource "aws_autoscaling_group" "test" {
     id = aws_launch_template.test.id
   }
 
-  	tags = [
-		{
-			key                 = "foo"
-			value               = "bar"
-			propagate_at_launch = true
-		},
-	]
+  tags = [
+    {
+      key                 = "foo"
+      value               = "bar"
+      propagate_at_launch = true
+    },
+  ]
 }
 `, rName)
 }
@@ -427,10 +427,10 @@ resource "aws_ecs_capacity_provider" "test" {
 func testAccAWSEcsCapacityProviderConfigTags1(rName, tag1Key, tag1Value string) string {
 	return testAccAWSEcsCapacityProviderConfigBase(rName) + fmt.Sprintf(`
 resource "aws_ecs_capacity_provider" "test" {
-  name = %q
+  name = %[1]q
 
   tags = {
-    %q = %q,
+    %[2]q = %[3]q,
   }
 
   auto_scaling_group_provider {

aws/resource_aws_ecs_cluster_test.go

@@ -426,27 +426,27 @@ resource "aws_ecs_cluster" "test" {
 func testAccAWSEcsClusterCapacityProviderConfig(rName string) string {
 	return testAccAWSEcsCapacityProviderConfigBase(rName) + fmt.Sprintf(`
 resource "aws_ecs_capacity_provider" "test" {
-	name = %q
+  name = %q
 
-	auto_scaling_group_provider {
-		auto_scaling_group_arn = aws_autoscaling_group.test.arn
-	}
+  auto_scaling_group_provider {
+    auto_scaling_group_arn = aws_autoscaling_group.test.arn
+  }
 }
 `, rName)
 }
 
 func testAccAWSEcsClusterSingleCapacityProvider(rName, providerName string) string {
 	return testAccAWSEcsClusterCapacityProviderConfig(providerName) + fmt.Sprintf(`
 resource "aws_ecs_cluster" "test" {
-	name = %[1]q
+  name = %[1]q
 
-	capacity_providers = [aws_ecs_capacity_provider.test.name]
+  capacity_providers = [aws_ecs_capacity_provider.test.name]
 
-	default_capacity_provider_strategy {
-		base = 1
-		capacity_provider = aws_ecs_capacity_provider.test.name
-		weight = 1
-	}
+  default_capacity_provider_strategy {
+    base              = 1
+    capacity_provider = aws_ecs_capacity_provider.test.name
+    weight            = 1
+  }
 }
 `, rName)
 }

aws/resource_aws_ecs_service_test.go

@@ -1424,8 +1424,8 @@ resource "aws_ecs_service" "mongo" {
 
   capacity_provider_strategy {
     capacity_provider = aws_ecs_capacity_provider.test.name
-    weight = %d
-    base   = %d
+    weight            = %d
+    base              = %d
   }
 }
 `, providerName, clusterName, tdName, svcName, weight, base)
@@ -1438,7 +1438,7 @@ resource "aws_ecs_service" "mongo" {
   cluster         = aws_ecs_cluster.test.id
   task_definition = aws_ecs_task_definition.mongo.arn
   desired_count   = 1
-  
+
   network_configuration {
     security_groups  = [aws_security_group.allow_all.id]
     subnets          = [aws_subnet.main.id]
@@ -1490,8 +1490,8 @@ resource "aws_security_group" "allow_all" {
 }
 
 resource "aws_subnet" "main" {
-  cidr_block        = cidrsubnet(aws_vpc.main.cidr_block, 8, 1)
-  vpc_id            = aws_vpc.main.id
+  cidr_block = cidrsubnet(aws_vpc.main.cidr_block, 8, 1)
+  vpc_id     = aws_vpc.main.id
 
   tags = {
     Name = "tf-acc-ecs-service-with-multiple-capacity-providers"