Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tagging collision for VPC network peering resources #1215

Merged
merged 13 commits into from
Mar 17, 2023
Merged

Fix tagging collision for VPC network peering resources #1215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
569f4da
remove default tagging from parent and tooling bosh providers
markdboyd Jan 20, 2023
dfafcbd
Merge branch 'main' into fix-tagging
markdboyd Jan 20, 2023
732d634
Merge branch 'main' into fix-tagging
markdboyd Mar 10, 2023
19d20ed
merge in main
markdboyd Mar 10, 2023
8021ebe
Merge branch 'main' into fix-tagging
markdboyd Mar 17, 2023
36fc773
ignore changes
markdboyd Mar 17, 2023
92d76b7
try ignoring changes
markdboyd Mar 17, 2023
3cdae76
try removing duplicate tags
markdboyd Mar 17, 2023
14ed6db
trying another optino
markdboyd Mar 17, 2023
b236ec2
more testing
markdboyd Mar 17, 2023
9067a71
another try
markdboyd Mar 17, 2023
b3d6002
more testing
markdboyd Mar 17, 2023
157be53
re-add default_tags
markdboyd Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions terraform/modules/vpc_peering/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ resource "aws_vpc_peering_connection" "peering" {
auto_accept = false
vpc_id = var.source_vpc_id

lifecycle {
ignore_changes = [tags_all]
}

tags = {
Name = "${var.source_vpc_id} to ${var.target_vpc_id}"
}
Expand All @@ -39,10 +35,6 @@ resource "aws_vpc_peering_connection_accepter" "peer" {
vpc_peering_connection_id = aws_vpc_peering_connection.peering.id
auto_accept = true

lifecycle {
ignore_changes = [tags_all]
}

tags = {
Name = "${var.source_vpc_id} to ${var.target_vpc_id}"
}
Expand Down
10 changes: 0 additions & 10 deletions terraform/stacks/main/stack.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ provider "aws" {
lambda = "https://lambda-fips.${var.aws_default_region}.amazonaws.com"
wafv2 = "https://wafv2-fips.${var.aws_default_region}.amazonaws.com"
}
default_tags {
tags = {
deployment = "bosh-tooling"
}
}
}
provider "aws" {
# this is for the tooling bosh
Expand All @@ -39,11 +34,6 @@ provider "aws" {
lambda = "https://lambda-fips.${var.aws_default_region}.amazonaws.com"
wafv2 = "https://wafv2-fips.${var.aws_default_region}.amazonaws.com"
}
default_tags {
tags = {
deployment = "bosh-parent"
}
}
}
provider "aws" {
region = var.aws_default_region
Expand Down