From 92c5e017f46e56574b972e984653fb32edc97b07 Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 12 Oct 2022 12:57:54 -0400 Subject: [PATCH] update --- vpc-transit-gateway-association/README.md | 12 +++---- ...=> credentials.vpc-transit-gateway.tf.off} | 0 .../data.transit-gateway.tf | 8 ++--- vpc-transit-gateway-association/outputs.tf | 12 +++---- vpc-transit-gateway-association/versions.tf | 32 ++++++++++++++++++- 5 files changed, 47 insertions(+), 17 deletions(-) rename vpc-transit-gateway-association/{credentials.vpc-transit-gateway.tf => credentials.vpc-transit-gateway.tf.off} (100%) mode change 120000 => 100644 vpc-transit-gateway-association/versions.tf diff --git a/vpc-transit-gateway-association/README.md b/vpc-transit-gateway-association/README.md index c57b95c..bcf2684 100644 --- a/vpc-transit-gateway-association/README.md +++ b/vpc-transit-gateway-association/README.md @@ -27,8 +27,8 @@ module "vpc_tgw" { |------|---------| | [aws](#provider\_aws) | >= 3.66.0 | | [aws.network\_account](#provider\_aws.network\_account) | >= 3.66.0 | -| [aws.tgw\_east](#provider\_aws.tgw\_east) | >= 3.66.0 | -| [aws.tgw\_west](#provider\_aws.tgw\_west) | >= 3.66.0 | +| [aws.peer](#provider\_aws.peer) | >= 3.66.0 | +| [aws.self](#provider\_aws.self) | >= 3.66.0 | ## Modules @@ -42,8 +42,8 @@ No modules. | [aws_arn.network_account](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_caller_identity.network_account](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | -| [aws_ec2_transit_gateway.tgw_east](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ec2_transit_gateway) | data source | -| [aws_ec2_transit_gateway.tgw_west](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ec2_transit_gateway) | data source | +| [aws_ec2_transit_gateway.tgw_peer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ec2_transit_gateway) | data source | +| [aws_ec2_transit_gateway.tgw_self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ec2_transit_gateway) | data source | | [aws_iam_account_alias.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_account_alias) | data source | | [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source | @@ -67,5 +67,5 @@ No modules. | Name | Description | |------|-------------| -| [tgw\_east](#output\_tgw\_east) | Transit Gateway us-gov-east-1 | -| [tgw\_west](#output\_tgw\_west) | Transit Gateway us-gov-west-1 | +| [tgw\_peer](#output\_tgw\_peer) | Transit Gateway peer (other region) | +| [tgw\_self](#output\_tgw\_self) | Transit Gateway self (this region) | diff --git a/vpc-transit-gateway-association/credentials.vpc-transit-gateway.tf b/vpc-transit-gateway-association/credentials.vpc-transit-gateway.tf.off similarity index 100% rename from vpc-transit-gateway-association/credentials.vpc-transit-gateway.tf rename to vpc-transit-gateway-association/credentials.vpc-transit-gateway.tf.off diff --git a/vpc-transit-gateway-association/data.transit-gateway.tf b/vpc-transit-gateway-association/data.transit-gateway.tf index f89e4af..f00470c 100644 --- a/vpc-transit-gateway-association/data.transit-gateway.tf +++ b/vpc-transit-gateway-association/data.transit-gateway.tf @@ -1,13 +1,13 @@ -data "aws_ec2_transit_gateway" "tgw_east" { - provider = aws.tgw_east +data "aws_ec2_transit_gateway" "tgw_self" { + provider = aws.self filter { name = "owner-id" values = [data.aws_arn.network_account.account] } } -data "aws_ec2_transit_gateway" "tgw_west" { - provider = aws.tgw_west +data "aws_ec2_transit_gateway" "tgw_peer" { + provider = aws.peer filter { name = "owner-id" values = [data.aws_arn.network_account.account] diff --git a/vpc-transit-gateway-association/outputs.tf b/vpc-transit-gateway-association/outputs.tf index ee97583..f4812f3 100644 --- a/vpc-transit-gateway-association/outputs.tf +++ b/vpc-transit-gateway-association/outputs.tf @@ -1,9 +1,9 @@ -output "tgw_east" { - description = "Transit Gateway us-gov-east-1" - value = data.aws_ec2_transit_gateway.tgw_east.id +output "tgw_self" { + description = "Transit Gateway self (this region)" + value = data.aws_ec2_transit_gateway.tgw_self.id } -output "tgw_west" { - description = "Transit Gateway us-gov-west-1" - value = data.aws_ec2_transit_gateway.tgw_west.id +output "tgw_peer" { + description = "Transit Gateway peer (other region)" + value = data.aws_ec2_transit_gateway.tgw_peer.id } diff --git a/vpc-transit-gateway-association/versions.tf b/vpc-transit-gateway-association/versions.tf deleted file mode 120000 index 41bb22f..0000000 --- a/vpc-transit-gateway-association/versions.tf +++ /dev/null @@ -1 +0,0 @@ -../common/versions.tf \ No newline at end of file diff --git a/vpc-transit-gateway-association/versions.tf b/vpc-transit-gateway-association/versions.tf new file mode 100644 index 0000000..fb772a1 --- /dev/null +++ b/vpc-transit-gateway-association/versions.tf @@ -0,0 +1,31 @@ +terraform { + # experiments = [module_variable_optional_attrs] + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.66.0" + configuration_aliases = [aws.network_account, aws.self, aws.peer] + } + null = { + source = "hashicorp/null" + version = ">= 3.0" + } + random = { + source = "hashicorp/random" + version = ">= 3.0" + } + template = { + source = "hashicorp/template" + version = ">= 2.0" + } + ldap = { + source = "trevex/ldap" + version = ">= 0.5.4" + } + local = { + source = "hashicorp/local" + version = ">= 1.0.0" + } + } + required_version = ">= 0.13" +}