provider/aws: Tag VPCs created in our tests to help track down leaks (#14596)

builtin/providers/aws/data_source_aws_instance_test.go

@@ -396,6 +396,9 @@ data "aws_instance" "foo" {
 const testAccInstanceDataSourceConfig_privateIP = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceDataSourceConfig_privateIP"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -450,6 +453,9 @@ data "aws_instance" "foo" {
 const testAccInstanceDataSourceConfig_VPC = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceDataSourceConfig_VPC"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/data_source_aws_route53_zone_test.go

@@ -77,6 +77,9 @@ func testAccDataSourceAwsRoute53ZoneConfig(rInt int) string {
 
 	resource "aws_vpc" "test" {
 		cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccDataSourceAwsRoute53ZoneConfig"
+		}
 	}
 
 	resource "aws_route53_zone" "test_private" {

builtin/providers/aws/resource_aws_alb_target_group_attachment_test.go

@@ -179,6 +179,9 @@ resource "aws_subnet" "subnet" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSALBTargetGroupAttachmentConfigWithoutPort"
+	}
 }`, targetGroupName)
 }
 
@@ -229,5 +232,8 @@ resource "aws_subnet" "subnet" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSALBTargetGroupAttachmentConfig_basic"
+	}
 }`, targetGroupName)
 }

builtin/providers/aws/resource_aws_alb_target_group_test.go

@@ -766,6 +766,9 @@ resource "aws_alb_target_group" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSALBTargetGroupConfig_namePrefix"
+	}
 }
 `
 
@@ -778,5 +781,8 @@ resource "aws_alb_target_group" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSALBTargetGroupConfig_generatedName"
+	}
 }
 `

builtin/providers/aws/resource_aws_ami_copy_test.go

@@ -162,6 +162,9 @@ provider "aws" {
 
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccAWSAMICopyConfig"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_db_instance_test.go

@@ -1022,6 +1022,9 @@ func testAccAWSDBInstanceConfigWithSubnetGroup(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name="testAccAWSDBInstanceConfigWithSubnetGroup"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1073,10 +1076,16 @@ func testAccAWSDBInstanceConfigWithSubnetGroupUpdated(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name="testAccAWSDBInstanceConfigWithSubnetGroupUpdated"
+	}
 }
 
 resource "aws_vpc" "bar" {
 	cidr_block = "10.10.0.0/16"
+	tags {
+		Name="testAccAWSDBInstanceConfigWithSubnetGroupUpdated_other"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_db_subnet_group_test.go

@@ -209,6 +209,9 @@ func testAccDBSubnetGroupConfig(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccDBSubnetGroupConfig"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -242,6 +245,9 @@ func testAccDBSubnetGroupConfig_updatedDescription(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccDBSubnetGroupConfig_updatedDescription"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -275,6 +281,9 @@ resource "aws_db_subnet_group" "foo" {
 const testAccDBSubnetGroupConfig_namePrefix = `
 resource "aws_vpc" "test" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccDBSubnetGroupConfig_namePrefix"
+	}
 }
 
 resource "aws_subnet" "a" {
@@ -297,6 +306,9 @@ resource "aws_db_subnet_group" "test" {
 const testAccDBSubnetGroupConfig_generatedName = `
 resource "aws_vpc" "test" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccDBSubnetGroupConfig_generatedName"
+	}
 }
 
 resource "aws_subnet" "a" {
@@ -318,6 +330,9 @@ resource "aws_db_subnet_group" "test" {
 const testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces = `
 resource "aws_vpc" "main" {
     cidr_block = "192.168.0.0/16"
+		tags {
+			Name = "testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces"
+		}
 }
 
 resource "aws_subnet" "frontend" {

builtin/providers/aws/resource_aws_default_security_group_test.go

@@ -141,6 +141,9 @@ func testAccCheckAWSDefaultSecurityGroupAttributes(group *ec2.SecurityGroup) res
 const testAccAWSDefaultSecurityGroupConfig = `
 resource "aws_vpc" "foo" {
   cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccAWSDefaultSecurityGroupConfig"
+	}
 }
 
 resource "aws_default_security_group" "web" {

builtin/providers/aws/resource_aws_directory_service_directory_test.go

@@ -233,6 +233,9 @@ resource "aws_directory_service_directory" "bar" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -275,6 +278,9 @@ resource "aws_directory_service_directory" "connector" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig_connector"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -303,6 +309,9 @@ resource "aws_directory_service_directory" "bar" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig_microsoft"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -333,6 +342,9 @@ resource "aws_directory_service_directory" "bar_a" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig_withAlias"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -363,6 +375,9 @@ resource "aws_directory_service_directory" "bar_a" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig_withSso"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -393,6 +408,9 @@ resource "aws_directory_service_directory" "bar_a" {
 
 resource "aws_vpc" "main" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccDirectoryServiceDirectoryConfig_withSso_modified"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_efs_mount_target_test.go

@@ -234,6 +234,9 @@ resource "aws_efs_mount_target" "alpha" {
 
 resource "aws_vpc" "foo" {
 	cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSEFSMountTargetConfig"
+	}
 }
 
 resource "aws_subnet" "alpha" {
@@ -262,6 +265,9 @@ resource "aws_efs_mount_target" "beta" {
 
 resource "aws_vpc" "foo" {
 	cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSEFSMountTargetConfigModified"
+	}
 }
 
 resource "aws_subnet" "alpha" {

builtin/providers/aws/resource_aws_egress_only_internet_gateway_test.go

@@ -84,6 +84,9 @@ const testAccAWSEgressOnlyInternetGatewayConfig_basic = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
 	assign_generated_ipv6_cidr_block = true
+	tags {
+		Name = "testAccAWSEgressOnlyInternetGatewayConfig_basic"
+	}
 }
 
 resource "aws_egress_only_internet_gateway" "foo" {

builtin/providers/aws/resource_aws_eip_association_test.go

@@ -145,6 +145,9 @@ func testAccCheckAWSEIPAssociationDestroy(s *terraform.State) error {
 const testAccAWSEIPAssociationConfig = `
 resource "aws_vpc" "main" {
 	cidr_block = "192.168.0.0/24"
+	tags {
+		Name = "testAccAWSEIPAssociationConfig"
+	}
 }
 resource "aws_subnet" "sub" {
 	vpc_id = "${aws_vpc.main.id}"
@@ -194,6 +197,9 @@ resource "aws_network_interface" "baz" {
 const testAccAWSEIPAssociationConfigDisappears = `
 resource "aws_vpc" "main" {
 	cidr_block = "192.168.0.0/24"
+	tags {
+		Name = "testAccAWSEIPAssociationConfigDisappears"
+	}
 }
 resource "aws_subnet" "sub" {
 	vpc_id = "${aws_vpc.main.id}"

builtin/providers/aws/resource_aws_eip_test.go

@@ -485,6 +485,9 @@ resource "aws_eip" "bar" {
 const testAccAWSEIPNetworkInterfaceConfig = `
 resource "aws_vpc" "bar" {
 	cidr_block = "10.0.0.0/24"
+	tags {
+		Name = "testAccAWSEIPNetworkInterfaceConfig"
+	}
 }
 resource "aws_internet_gateway" "bar" {
 	vpc_id = "${aws_vpc.bar.id}"
@@ -508,6 +511,9 @@ resource "aws_eip" "bar" {
 const testAccAWSEIPMultiNetworkInterfaceConfig = `
 resource "aws_vpc" "bar" {
   cidr_block = "10.0.0.0/24"
+	tags {
+		Name = "testAccAWSEIPMultiNetworkInterfaceConfig"
+	}
 }
 
 resource "aws_internet_gateway" "bar" {

builtin/providers/aws/resource_aws_elastic_beanstalk_environment_test.go

@@ -805,6 +805,9 @@ func testAccBeanstalkEnv_VPC(name string, rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "tf_b_test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccBeanstalkEnv_VPC"
+	}
 }
 
 resource "aws_internet_gateway" "tf_b_test" {

builtin/providers/aws/resource_aws_instance_test.go

@@ -1324,6 +1324,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigSourceDestEnable = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigSourceDestEnable"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1342,6 +1345,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigSourceDestDisable = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigSourceDestDisable"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1362,6 +1368,9 @@ func testAccInstanceConfigDisableAPITermination(val bool) string {
 	return fmt.Sprintf(`
 	resource "aws_vpc" "foo" {
 		cidr_block = "10.1.0.0/16"
+		tags {
+			Name = "testAccInstanceConfigDisableAPITermination"
+		}
 	}
 
 	resource "aws_subnet" "foo" {
@@ -1382,6 +1391,9 @@ func testAccInstanceConfigDisableAPITermination(val bool) string {
 const testAccInstanceConfigVPC = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigVPC"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1729,6 +1741,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigPrivateIP = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigPrivateIP"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1747,6 +1762,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigAssociatePublicIPAndPrivateIP = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigAssociatePublicIPAndPrivateIP"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1879,6 +1897,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigRootBlockDeviceMismatch = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigRootBlockDeviceMismatch"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1900,6 +1921,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigForceNewAndTagsDrift = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigForceNewAndTagsDrift"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -1917,6 +1941,9 @@ resource "aws_instance" "foo" {
 const testAccInstanceConfigForceNewAndTagsDrift_Update = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInstanceConfigForceNewAndTagsDrift_Update"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_internet_gateway_test.go

@@ -182,12 +182,18 @@ func testAccCheckInternetGatewayExists(n string, ig *ec2.InternetGateway) resour
 const testAccNoInternetGatewayConfig = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccNoInternetGatewayConfig"
+	}
 }
 `
 
 const testAccInternetGatewayConfig = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInternetGatewayConfig"
+	}
 }
 
 resource "aws_internet_gateway" "foo" {
@@ -198,10 +204,16 @@ resource "aws_internet_gateway" "foo" {
 const testAccInternetGatewayConfigChangeVPC = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccInternetGatewayConfigChangeVPC"
+	}
 }
 
 resource "aws_vpc" "bar" {
 	cidr_block = "10.2.0.0/16"
+	tags {
+		Name = "testAccInternetGatewayConfigChangeVPC_other"
+	}
 }
 
 resource "aws_internet_gateway" "foo" {
@@ -212,6 +224,9 @@ resource "aws_internet_gateway" "foo" {
 const testAccCheckInternetGatewayConfigTags = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccCheckInternetGatewayConfigTags"
+	}
 }
 
 resource "aws_internet_gateway" "foo" {
@@ -225,6 +240,9 @@ resource "aws_internet_gateway" "foo" {
 const testAccCheckInternetGatewayConfigTagsUpdate = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccCheckInternetGatewayConfigTagsUpdate"
+	}
 }
 
 resource "aws_internet_gateway" "foo" {

builtin/providers/aws/resource_aws_lambda_function_test.go

@@ -852,6 +852,9 @@ EOF
 
 resource "aws_vpc" "vpc_for_lambda" {
     cidr_block = "10.0.0.0/16"
+		tags {
+			Name = "baseAccAWSLambdaConfig"
+		}
 }
 
 resource "aws_subnet" "subnet_for_lambda" {

builtin/providers/aws/resource_aws_launch_configuration_test.go

@@ -448,6 +448,9 @@ const testAccAWSLaunchConfigurationConfig_withVpcClassicLink = `
 resource "aws_vpc" "foo" {
    cidr_block = "10.0.0.0/16"
    enable_classiclink = true
+	tags {
+		Name = "testAccAWSLaunchConfigurationConfig_withVpcClassicLink"
+	}
 }
 
 resource "aws_security_group" "foo" {

builtin/providers/aws/resource_aws_main_route_table_association_test.go

@@ -104,6 +104,9 @@ func testAccCheckMainRouteTableAssociation(
 const testAccMainRouteTableAssociationConfig = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccMainRouteTableAssociationConfig"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -132,6 +135,9 @@ resource "aws_main_route_table_association" "foo" {
 const testAccMainRouteTableAssociationConfigUpdate = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccMainRouteTableAssociationConfigUpdate"
+	}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_nat_gateway_test.go

@@ -100,6 +100,9 @@ func testAccCheckNatGatewayExists(n string, ng *ec2.NatGateway) resource.TestChe
 const testAccNatGatewayConfig = `
 resource "aws_vpc" "vpc" {
     cidr_block = "10.0.0.0/16"
+		tags {
+			Name = "testAccNatGatewayConfig"
+		}
 }
 
 resource "aws_subnet" "private" {

builtin/providers/aws/resource_aws_network_acl_rule_test.go

@@ -269,6 +269,9 @@ provider "aws" {
 }
 resource "aws_vpc" "foo" {
 	cidr_block = "10.3.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclRuleBasicConfig"
+	}
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
@@ -309,6 +312,9 @@ provider "aws" {
 }
 resource "aws_vpc" "foo" {
 	cidr_block = "10.3.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclRuleMissingParam"
+	}
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
@@ -327,6 +333,9 @@ resource "aws_network_acl_rule" "baz" {
 const testAccAWSNetworkAclRuleAllProtocolConfigNoRealUpdate = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.3.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclRuleAllProtocolConfigNoRealUpdate"
+	}
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
@@ -346,6 +355,9 @@ resource "aws_network_acl_rule" "baz" {
 const testAccAWSNetworkAclRuleAllProtocolConfig = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.3.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclRuleAllProtocolConfig"
+	}
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
@@ -365,6 +377,9 @@ resource "aws_network_acl_rule" "baz" {
 const testAccAWSNetworkAclRuleIpv6Config = `
 resource "aws_vpc" "foo" {
 	cidr_block = "10.3.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclRuleIpv6Config"
+	}
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"

builtin/providers/aws/resource_aws_network_acl_test.go

@@ -769,6 +769,9 @@ resource "aws_network_acl" "bar" {
 const testAccAWSNetworkAclEsp = `
 resource "aws_vpc" "testespvpc" {
   cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccAWSNetworkAclEsp"
+	}
 }
 
 resource "aws_network_acl" "testesp" {

builtin/providers/aws/resource_aws_network_interface_attacment_test.go

@@ -43,6 +43,9 @@ func testAccAWSNetworkInterfaceAttachmentConfig_basic(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
     cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccAWSNetworkInterfaceAttachmentConfig_basic"
+		}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_network_interface_test.go

@@ -291,6 +291,9 @@ func testAccCheckAWSENIMakeExternalAttachment(n string, conf *ec2.NetworkInterfa
 const testAccAWSENIConfig = `
 resource "aws_vpc" "foo" {
     cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccAWSENIConfig"
+		}
 }
 
 resource "aws_subnet" "foo" {
@@ -326,6 +329,9 @@ resource "aws_network_interface" "bar" {
 const testAccAWSENIConfigUpdatedDescription = `
 resource "aws_vpc" "foo" {
     cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccAWSENIConfigUpdatedDescription"
+		}
 }
 
 resource "aws_subnet" "foo" {
@@ -361,6 +367,9 @@ resource "aws_network_interface" "bar" {
 const testAccAWSENIConfigWithSourceDestCheck = `
 resource "aws_vpc" "foo" {
     cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccAWSENIConfigWithSourceDestCheck"
+		}
 }
 
 resource "aws_subnet" "foo" {
@@ -379,6 +388,9 @@ resource "aws_network_interface" "bar" {
 const testAccAWSENIConfigWithNoPrivateIPs = `
 resource "aws_vpc" "foo" {
     cidr_block = "172.16.0.0/16"
+		tags {
+			Name = "testAccAWSENIConfigWithNoPrivateIPs"
+		}
 }
 
 resource "aws_subnet" "foo" {

builtin/providers/aws/resource_aws_opsworks_stack_test.go

@@ -795,6 +795,9 @@ func testAccAwsOpsworksStackConfigVpcCreate(name string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "tf-acc" {
   cidr_block = "10.3.5.0/24"
+	tags {
+		Name = "testAccAwsOpsworksStackConfigVpcCreate"
+	}
 }
 resource "aws_subnet" "tf-acc" {
   vpc_id = "${aws_vpc.tf-acc.id}"
@@ -886,6 +889,9 @@ func testAccAWSOpsworksStackConfigVpcUpdate(name string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "tf-acc" {
   cidr_block = "10.3.5.0/24"
+	tags {
+		Name = "testAccAWSOpsworksStackConfigVpcUpdate"
+	}
 }
 resource "aws_subnet" "tf-acc" {
   vpc_id = "${aws_vpc.tf-acc.id}"

builtin/providers/aws/resource_aws_rds_cluster_instance_test.go

@@ -316,6 +316,9 @@ resource "aws_rds_cluster" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSClusterInstanceConfig_namePrefix"
+	}
 }
 
 resource "aws_subnet" "a" {
@@ -354,6 +357,9 @@ resource "aws_rds_cluster" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSClusterInstanceConfig_generatedName"
+	}
 }
 
 resource "aws_subnet" "a" {

builtin/providers/aws/resource_aws_rds_cluster_test.go

@@ -394,6 +394,9 @@ resource "aws_rds_cluster" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSClusterConfig_namePrefix"
+	}
 }
 
 resource "aws_subnet" "a" {
@@ -426,6 +429,9 @@ resource "aws_rds_cluster" "test" {
 
 resource "aws_vpc" "test" {
   cidr_block = "10.0.0.0/16"
+	tags {
+		Name = "testAccAWSClusterConfig_generatedName"
+	}
 }
 
 resource "aws_subnet" "a" {

builtin/providers/aws/resource_aws_redshift_cluster_test.go

@@ -793,6 +793,9 @@ func testAccAWSRedshiftClusterConfig_notPubliclyAccessible(rInt int) string {
 	return fmt.Sprintf(`
 	resource "aws_vpc" "foo" {
 		cidr_block = "10.1.0.0/16"
+		tags {
+			Name = "testAccAWSRedshiftClusterConfig_notPubliclyAccessible"
+		}
 	}
 	resource "aws_internet_gateway" "foo" {
 		vpc_id = "${aws_vpc.foo.id}"
@@ -848,6 +851,9 @@ func testAccAWSRedshiftClusterConfig_updatePubliclyAccessible(rInt int) string {
 	return fmt.Sprintf(`
 	resource "aws_vpc" "foo" {
 		cidr_block = "10.1.0.0/16"
+		tags {
+			Name = "testAccAWSRedshiftClusterConfig_updatePubliclyAccessible"
+		}
 	}
 	resource "aws_internet_gateway" "foo" {
 		vpc_id = "${aws_vpc.foo.id}"

builtin/providers/aws/resource_aws_redshift_subnet_group_test.go

@@ -230,6 +230,9 @@ func testAccRedshiftSubnetGroupConfig(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccRedshiftSubnetGroupConfig"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -262,6 +265,9 @@ func testAccRedshiftSubnetGroup_updateDescription(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccRedshiftSubnetGroup_updateDescription"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -294,6 +300,9 @@ func testAccRedshiftSubnetGroupConfigWithTags(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccRedshiftSubnetGroupConfigWithTags"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -328,6 +337,9 @@ func testAccRedshiftSubnetGroupConfigWithTagsUpdated(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccRedshiftSubnetGroupConfigWithTags"
+	}
 }
 
 resource "aws_subnet" "foo" {
@@ -364,6 +376,9 @@ func testAccRedshiftSubnetGroupConfig_updateSubnetIds(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "foo" {
 	cidr_block = "10.1.0.0/16"
+	tags {
+		Name = "testAccRedshiftSubnetGroupConfig_updateSubnetIds"
+	}
 }
 
 resource "aws_subnet" "foo" {