Skip to content

Commit

Permalink
Merge pull request #3568 from terraform-providers/t-aws_internet_gate…
Browse files Browse the repository at this point in the history
…way-more-tags-plz

tests: Tag AWSRoute aws_internet_gateway resources for sweeping
  • Loading branch information
bflad authored Mar 1, 2018
2 parents 60cf556 + 851aa39 commit c56c678
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 3 deletions.
4 changes: 2 additions & 2 deletions aws/import_aws_route_table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ resource "aws_internet_gateway" "gw" {
vpc_id = "${aws_vpc.default.id}"
tags {
Name = "tf-rt-import-test"
Name = "terraform-testacc-route-table-import-complex-default"
}
}
Expand Down Expand Up @@ -154,7 +154,7 @@ resource "aws_internet_gateway" "ogw" {
vpc_id = "${aws_vpc.bar.id}"
tags {
Name = "tf-rt-import-test"
Name = "terraform-testacc-route-table-import-complex-bar"
}
}
Expand Down
8 changes: 8 additions & 0 deletions aws/resource_aws_route_table_association_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ resource "aws_subnet" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-table-association"
}
}
resource "aws_route_table" "foo" {
Expand Down Expand Up @@ -151,6 +155,10 @@ resource "aws_subnet" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-table-association"
}
}
resource "aws_route_table" "bar" {
Expand Down
16 changes: 16 additions & 0 deletions aws/resource_aws_route_table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-table"
}
}
resource "aws_route_table" "foo" {
Expand All @@ -377,6 +381,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-table"
}
}
resource "aws_route_table" "foo" {
Expand Down Expand Up @@ -492,6 +500,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-table-vpc-peering-foo"
}
}
resource "aws_vpc" "bar" {
Expand All @@ -503,6 +515,10 @@ resource "aws_vpc" "bar" {
resource "aws_internet_gateway" "bar" {
vpc_id = "${aws_vpc.bar.id}"
tags {
Name = "terraform-testacc-route-table-vpc-peering-bar"
}
}
resource "aws_vpc_peering_connection" "foo" {
Expand Down
30 changes: 29 additions & 1 deletion aws/resource_aws_route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-basic"
}
}
resource "aws_route_table" "foo" {
Expand Down Expand Up @@ -385,7 +389,11 @@ resource "aws_egress_only_internet_gateway" "foo" {
}
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-ipv6-igw"
}
}
resource "aws_route_table" "external" {
Expand Down Expand Up @@ -414,6 +422,10 @@ data "aws_availability_zones" "available" {}
resource "aws_internet_gateway" "internet" {
vpc_id = "${aws_vpc.examplevpc.id}"
tags {
Name = "terraform-testacc-route-ipv6-network-interface"
}
}
resource "aws_route" "igw" {
Expand Down Expand Up @@ -513,6 +525,10 @@ data "aws_availability_zones" "available" {}
resource "aws_internet_gateway" "internet" {
vpc_id = "${aws_vpc.examplevpc.id}"
tags {
Name = "terraform-testacc-route-ipv6-instance"
}
}
resource "aws_route" "igw" {
Expand Down Expand Up @@ -655,6 +671,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-change-cidr"
}
}
resource "aws_route_table" "foo" {
Expand All @@ -679,6 +699,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-route-mix"
}
}
resource "aws_route_table" "foo" {
Expand Down Expand Up @@ -737,6 +761,10 @@ resource "aws_vpc" "foo" {
resource "aws_internet_gateway" "foo" {
vpc_id = "${aws_vpc.foo.id}"
tags {
Name = "terraform-testacc-route-with-vpc-endpoint"
}
}
resource "aws_route_table" "foo" {
Expand Down

0 comments on commit c56c678

Please sign in to comment.