Skip to content

Commit

Permalink
Merge pull request #3357 from terraform-providers/t-normalize-vpc-tags
Browse files Browse the repository at this point in the history 
tests: Normalize aws_vpc Name tag (A-D)
  • Loading branch information
@radeksimko
radeksimko authored Feb 14, 2018
2 parents fa0c754 + c845d4b commit 652cdd5
Show file tree
Hide file tree
Showing 18 changed files with 79 additions and 62 deletions.
20 changes: 10 additions & 10 deletions aws/resource_aws_alb_target_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -549,7 +549,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -588,15 +588,15 @@ resource "aws_vpc" "test2" {
cidr_block = "10.10.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic-2"
}
}
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -635,7 +635,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -675,7 +675,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -710,7 +710,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_basic"
Name = "terraform-testacc-alb-target-group-basic"
}
}`, targetGroupName)
}
Expand Down Expand Up @@ -752,7 +752,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSALBTargetGroup_stickiness"
Name = "terraform-testacc-alb-target-group-stickiness"
}
}`, targetGroupName, stickinessBlock)
}
Expand All @@ -768,7 +768,7 @@ resource "aws_alb_target_group" "test" {
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
Name = "testAccAWSALBTargetGroupConfig_namePrefix"
Name = "terraform-testacc-alb-target-group-name-prefix"
}
}
`
Expand All @@ -783,7 +783,7 @@ resource "aws_alb_target_group" "test" {
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
Name = "testAccAWSALBTargetGroupConfig_generatedName"
Name = "terraform-testacc-alb-target-group-generated-name"
}
}
`
2 changes: 1 addition & 1 deletion aws/resource_aws_ami_copy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ provider "aws" {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name = "testAccAWSAMICopyConfig"
Name = "terraform-testacc-ami-copy"
}
}
Expand Down
3 changes: 3 additions & 0 deletions aws/resource_aws_appautoscaling_scheduled_action_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ resource "aws_security_group" "hoge" {
resource "aws_vpc" "hoge" {
cidr_block = "168.31.0.0/16"
enable_dns_hostnames = true
tags {
Name = "terraform-testacc-appautoscaling-scheduled-action-emr"
}
}
resource "aws_subnet" "hoge" {
Expand Down
8 changes: 4 additions & 4 deletions aws/resource_aws_appautoscaling_target_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ resource "aws_security_group" "allow_all" {
}
tags {
name = "emr_test"
Name = "emr_test"
}
}
Expand All @@ -380,7 +380,7 @@ resource "aws_vpc" "main" {
enable_dns_hostnames = true
tags {
name = "emr_test_%d"
Name = "terraform-testacc-appautoscaling-target-emr-cluster"
}
}
Expand All @@ -389,7 +389,7 @@ resource "aws_subnet" "main" {
cidr_block = "168.31.0.0/20"
tags {
name = "emr_test_%d"
Name = "emr_test_%d"
}
}
Expand Down Expand Up @@ -606,7 +606,7 @@ resource "aws_appautoscaling_target" "bar" {
max_capacity = 8
}
`, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt)
`, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt)
}

var testAccAWSAppautoscalingTargetSpotFleetRequestConfig = fmt.Sprintf(`
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_autoscaling_attachment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
TestName = "TestAccAWSLBTargetGroup_basic"
Name = "terraform-testacc-autoscaling-attachment-alb"
}
}
`, rInt, rInt, rInt, rInt)
Expand Down
19 changes: 12 additions & 7 deletions aws/resource_aws_autoscaling_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,9 @@ resource "aws_autoscaling_group" "bar" {
const testAccAWSAutoScalingGroupConfigWithLoadBalancer = `
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags { Name = "tf-asg-test" }
tags {
Name = "terraform-testacc-autoscaling-group-with-lb"
}
}
resource "aws_internet_gateway" "gw" {
Expand Down Expand Up @@ -1290,7 +1292,7 @@ const testAccAWSAutoScalingGroupConfigWithAZ = `
resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16"
tags {
Name = "terraform-test"
Name = "terraform-testacc-autoscaling-group-with-az"
}
}
Expand Down Expand Up @@ -1337,7 +1339,7 @@ const testAccAWSAutoScalingGroupConfigWithVPCIdent = `
resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16"
tags {
Name = "terraform-test"
Name = "terraform-testacc-autoscaling-group-with-vpc-id"
}
}
Expand Down Expand Up @@ -1516,7 +1518,7 @@ resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16"
tags {
Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup"
Name = "terraform-testacc-autoscaling-group-alb-target-group"
}
}
Expand Down Expand Up @@ -1607,7 +1609,7 @@ resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16"
tags {
Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup"
Name = "terraform-testacc-autoscaling-group-alb-target-group"
}
}
Expand Down Expand Up @@ -1704,7 +1706,7 @@ resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16"
tags {
Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup"
Name = "terraform-testacc-autoscaling-group-alb-target-group"
}
}
Expand Down Expand Up @@ -1857,7 +1859,7 @@ resource "aws_vpc" "default" {
enable_dns_support = "true"
tags {
Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup_ELBCapacity"
Name = "terraform-testacc-autoscaling-group-alb-target-group-elb-capacity"
}
}
Expand Down Expand Up @@ -2121,6 +2123,9 @@ resource "aws_launch_configuration" "test" {
const testAccAWSAutoScalingGroupConfig_emptyAvailabilityZones = `
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags {
Name = "terraform-testacc-autoscaling-group-empty-azs"
}
}
resource "aws_subnet" "test" {
Expand Down
3 changes: 3 additions & 0 deletions aws/resource_aws_batch_compute_environment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@ resource "aws_security_group" "test_acc" {
resource "aws_vpc" "test_acc" {
cidr_block = "10.1.0.0/16"
tags {
Name = "terraform-testacc-batch-compute-environment"
}
}
resource "aws_subnet" "test_acc" {
Expand Down
3 changes: 3 additions & 0 deletions aws/resource_aws_batch_job_queue_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ resource "aws_security_group" "test_acc" {
resource "aws_vpc" "test_acc" {
cidr_block = "10.1.0.0/16"
tags {
Name = "terraform-testacc-batch-job-queue"
}
}
resource "aws_subnet" "test_acc" {
Expand Down
3 changes: 3 additions & 0 deletions aws/resource_aws_cloud9_environment_ec2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ resource "aws_cloud9_environment_ec2" "test" {
resource "aws_vpc" "test" {
cidr_block = "10.10.0.0/16"
tags {
Name = "terraform-testacc-cloud9-environment-ec2-all-fields"
}
}
resource "aws_subnet" "test" {
Expand Down
18 changes: 9 additions & 9 deletions aws/resource_aws_db_instance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ func testAccAWSDBInstanceConfigWithSubnetGroup(rName string) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name="testAccAWSDBInstanceConfigWithSubnetGroup"
Name = "terraform-testacc-db-instance-with-subnet-group"
}
}
Expand Down Expand Up @@ -1186,14 +1186,14 @@ func testAccAWSDBInstanceConfigWithSubnetGroupUpdated(rName string) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name="testAccAWSDBInstanceConfigWithSubnetGroupUpdated"
Name = "terraform-testacc-db-instance-with-subnet-group-updated-foo"
}
}
resource "aws_vpc" "bar" {
cidr_block = "10.10.0.0/16"
tags {
Name="testAccAWSDBInstanceConfigWithSubnetGroupUpdated_other"
Name = "terraform-testacc-db-instance-with-subnet-group-updated-bar"
}
}
Expand Down Expand Up @@ -1274,9 +1274,9 @@ func testAccAWSDBMSSQL_timezone(rInt int) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
enable_dns_hostnames = true
tags {
Name = "tf-rds-mssql-timezone-test"
}
tags {
Name = "terraform-testacc-db-instance-mssql-timezone"
}
}
resource "aws_db_subnet_group" "rds_one" {
Expand Down Expand Up @@ -1340,9 +1340,9 @@ func testAccAWSDBMSSQL_timezone_AKST(rInt int) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
enable_dns_hostnames = true
tags {
Name = "tf-rds-mssql-timezone-test"
}
tags {
Name = "terraform-testacc-db-instance-mssql-timezone-akst"
}
}
resource "aws_db_subnet_group" "rds_one" {
Expand Down
10 changes: 5 additions & 5 deletions aws/resource_aws_db_subnet_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func testAccDBSubnetGroupConfig(rName string) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name = "testAccDBSubnetGroupConfig"
Name = "terraform-testacc-db-subnet-group"
}
}
Expand Down Expand Up @@ -246,7 +246,7 @@ func testAccDBSubnetGroupConfig_updatedDescription(rName string) string {
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name = "testAccDBSubnetGroupConfig_updatedDescription"
Name = "terraform-testacc-db-subnet-group-updated-description"
}
}
Expand Down Expand Up @@ -282,7 +282,7 @@ const testAccDBSubnetGroupConfig_namePrefix = `
resource "aws_vpc" "test" {
cidr_block = "10.1.0.0/16"
tags {
Name = "testAccDBSubnetGroupConfig_namePrefix"
Name = "terraform-testacc-db-subnet-group-name-prefix"
}
}
Expand All @@ -307,7 +307,7 @@ const testAccDBSubnetGroupConfig_generatedName = `
resource "aws_vpc" "test" {
cidr_block = "10.1.0.0/16"
tags {
Name = "testAccDBSubnetGroupConfig_generatedName"
Name = "terraform-testacc-db-subnet-group-generated-name"
}
}
Expand All @@ -331,7 +331,7 @@ const testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces = `
resource "aws_vpc" "main" {
cidr_block = "192.168.0.0/16"
tags {
Name = "testAccDBSubnetGroupConfig_withUnderscoresAndPeriodsAndSpaces"
Name = "terraform-testacc-db-subnet-group-w-underscores-etc"
}
}
Expand Down
Loading

0 comments on commit 652cdd5

Please sign in to comment.