From 84bff5c2e6d80580f654702de4ebddbaee206835 Mon Sep 17 00:00:00 2001 From: badra001 Date: Tue, 21 Mar 2023 08:41:03 -0400 Subject: [PATCH] fix --- CHANGELOG.md | 4 ++ common/version.tf | 2 +- .../region.tf | 0 .../tags.tf | 4 +- .../tf-run.data | 3 +- examples/region-shared-setup/versions.tf | 33 ++++++++++++ .../shared-vpc-setup-tf-upgrade/.tf-control | 4 ++ .../.tf-control.tfrc | 23 +++++++++ examples/shared-vpc-setup-tf-upgrade/M | 48 +++++++++++++++++ .../apps/.tf-control | 4 ++ .../apps/.tf-control.tfrc | 23 +++++++++ .../apps/region.tf | 4 ++ .../apps/tf-run.data | 7 +++ .../apps/versions.tf | 33 ++++++++++++ .../outputs.shared-vpc.tf | 35 +++++++++++++ .../shared-vpc-setup-tf-upgrade/region.tf | 4 ++ .../shared-vpc-data.tf | 42 +++++++++++++++ .../shared-vpc-setup-tf-upgrade/shared-vpc.tf | 25 +++++++++ .../shared-vpc-setup-tf-upgrade/tf-run.data | 7 +++ .../variables.shared-vpc.auto.tfvars | 9 ++++ .../variables.shared-vpc.tf | 51 +++++++++++++++++++ .../variables.vpc.auto.tfvars | 16 ++++++ .../shared-vpc-setup-tf-upgrade/versions.tf | 33 ++++++++++++ tag-shared-vpc-resources/README.md | 2 +- tag-shared-vpc-resources/main.tf | 2 +- 25 files changed, 411 insertions(+), 7 deletions(-) rename examples/{shared-vpc-setup => region-shared-setup}/region.tf (100%) rename examples/{shared-vpc-setup => region-shared-setup}/tags.tf (77%) rename examples/{shared-vpc-setup => region-shared-setup}/tf-run.data (89%) create mode 100644 examples/region-shared-setup/versions.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/.tf-control create mode 100644 examples/shared-vpc-setup-tf-upgrade/.tf-control.tfrc create mode 100644 examples/shared-vpc-setup-tf-upgrade/M create mode 100644 examples/shared-vpc-setup-tf-upgrade/apps/.tf-control create mode 100644 examples/shared-vpc-setup-tf-upgrade/apps/.tf-control.tfrc create mode 100644 examples/shared-vpc-setup-tf-upgrade/apps/region.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/apps/tf-run.data create mode 100644 examples/shared-vpc-setup-tf-upgrade/apps/versions.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/outputs.shared-vpc.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/region.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/shared-vpc-data.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/shared-vpc.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/tf-run.data create mode 100644 examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.auto.tfvars create mode 100644 examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.tf create mode 100644 examples/shared-vpc-setup-tf-upgrade/variables.vpc.auto.tfvars create mode 100644 examples/shared-vpc-setup-tf-upgrade/versions.tf diff --git a/CHANGELOG.md b/CHANGELOG.md index fb22501..8f685a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -264,3 +264,7 @@ * 2.6.2 -- 2023-03-20 - tag-shared-vpc-resources - enable tgw tagging by default, which works now + +* 2.6.3 -- 2023-03-21 + - tag-shared-vpc-resources + - pass network provider in module diff --git a/common/version.tf b/common/version.tf index 7a0752c..623dad5 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,5 +1,5 @@ locals { - _module_version = "2.6.2" + _module_version = "2.6.3" _module_names = { "_main_" = "aws-vpc-setup" diff --git a/examples/shared-vpc-setup/region.tf b/examples/region-shared-setup/region.tf similarity index 100% rename from examples/shared-vpc-setup/region.tf rename to examples/region-shared-setup/region.tf diff --git a/examples/shared-vpc-setup/tags.tf b/examples/region-shared-setup/tags.tf similarity index 77% rename from examples/shared-vpc-setup/tags.tf rename to examples/region-shared-setup/tags.tf index 22ad78a..6d393a2 100644 --- a/examples/shared-vpc-setup/tags.tf +++ b/examples/region-shared-setup/tags.tf @@ -1,6 +1,6 @@ module "tag_shared" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//tag-shared-vpc-resources?ref=tf-upgrade" - network_account_profile = "057445207498-ent-gov-network-sa" + network_account_profile = "057405694017-ent-gov-network-prod" ## optional, with defaults ### tag_enabled_vpcs = true @@ -8,5 +8,5 @@ module "tag_shared" { ### tag_enabled_route_tables = true ### tag_enabled_subnets = true ### tag_enabled_network_acls = true - ### tag_enabled_transit_gateway = false + ### tag_enabled_transit_gateway = true } diff --git a/examples/shared-vpc-setup/tf-run.data b/examples/region-shared-setup/tf-run.data similarity index 89% rename from examples/shared-vpc-setup/tf-run.data rename to examples/region-shared-setup/tf-run.data index fb40c84..f8cad8e 100644 --- a/examples/shared-vpc-setup/tf-run.data +++ b/examples/region-shared-setup/tf-run.data @@ -1,8 +1,7 @@ -VERSION 1.0.1 +VERSION 1.0.0 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh COMMAND tf-init -upgrade ALL -ALL COMMAND tf-directory-setup.py -l s3 diff --git a/examples/region-shared-setup/versions.tf b/examples/region-shared-setup/versions.tf new file mode 100644 index 0000000..dae0f3d --- /dev/null +++ b/examples/region-shared-setup/versions.tf @@ -0,0 +1,33 @@ +terraform { + required_version = ">= 1.0" + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + ## ldap = { + ## source = "trevex/ldap" + ## version = ">= 0.5.4" + ## } + ## external = { + ## source = "hashicorp/external" + ## version = ">= 1.0" + ## } + ## null = { + ## source = "hashicorp/null" + ## version = ">= 1.0" + ## } + ## random = { + ## source = "hashicorp/random" + ## version = ">= 1.0" + ## } + ## template = { + ## source = "hashicorp/template" + ## version = ">= 1.0" + ## } + ## infoblox = { + ## source = "infobloxopen/infoblox" + ## version = ">= 2.1.0" + ## } + } +} diff --git a/examples/shared-vpc-setup-tf-upgrade/.tf-control b/examples/shared-vpc-setup-tf-upgrade/.tf-control new file mode 100644 index 0000000..b304010 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/.tf-control @@ -0,0 +1,4 @@ +#TFCOMMAND="terraform_0.13.7" +#TFCOMMAND="terraform_0.14.11" +TFCOMMAND="terraform_latest" +## TF_CLI_CONFIG_FILE=$HOME/.tf-control.tfrc diff --git a/examples/shared-vpc-setup-tf-upgrade/.tf-control.tfrc b/examples/shared-vpc-setup-tf-upgrade/.tf-control.tfrc new file mode 100644 index 0000000..d4b0b15 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/.tf-control.tfrc @@ -0,0 +1,23 @@ +# https://www.terraform.io/docs/cli/config/config-file.html + +plugin_cache_dir = "/data/terraform/terraform.d/plugin-cache" +#disable_checkpoint = true + +provider_installation { +# filesystem_mirror { +# path = "/apps/terraform/terraform.d/providers" +# include = [ "*/*/*" ] +# } + filesystem_mirror { + path = "/data/terraform/terraform.d/providers" + include = [ "*/*/*" ] + } +# filesystem_mirror { +# path = "/apps/terraform/terraform.d/providers" +# include = [ "external.terraform.census.gov/*/*" ] +# } + direct { + include = [ "*/*/*" ] + } +} + diff --git a/examples/shared-vpc-setup-tf-upgrade/M b/examples/shared-vpc-setup-tf-upgrade/M new file mode 100644 index 0000000..9b8ce2d --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/M @@ -0,0 +1,48 @@ +- [x] nhpc-app1.rm.census.gov +- [x] nhpc-transfer1.rm.census.gov +- [x] nhpc-login1.rm.census.gov +- [x] nhpc-login2.rm.census.gov +- [x] hpc-compute1.rm.census.gov +- [ ] hpc-compute2.rm.census.gov +- [ ] hpc-compute3.rm.census.gov +- [ ] hpc-compute4.rm.census.gov +- [ ] hpc-compute5.rm.census.gov +- [ ] hpc-compute6.rm.census.gov +- [ ] hpc-compute7.rm.census.gov +- [ ] hpc-compute8.rm.census.gov +- [ ] hpc-compute9.rm.census.gov +- [ ] hpc-compute10.rm.census.gov +- [ ] hpc-compute11.rm.census.gov +- [ ] hpc-compute12.rm.census.gov +- [ ] hpc-compute13.rm.census.gov +- [ ] hpc-compute14.rm.census.gov +- [ ] hpc-compute15.rm.census.gov +- [ ] hpc-compute16.rm.census.gov +- [ ] hpc-compute17.rm.census.gov +- [ ] hpc-compute18.rm.census.gov +- [ ] hpc-compute19.rm.census.gov +- [ ] hpc-compute20.rm.census.gov +- [ ] hpc-compute21.rm.census.gov +- [ ] hpc-compute22.rm.census.gov +- [ ] hpc-compute23.rm.census.gov +- [ ] hpc-compute24.rm.census.gov +- [ ] hpc-compute25.rm.census.gov +- [ ] hpc-compute26.rm.census.gov +- [ ] hpc-compute27.rm.census.gov +- [ ] hpc-compute28.rm.census.gov +- [ ] hpc-compute29.rm.census.gov +- [ ] hpc-compute30.rm.census.gov +- [ ] hpc-compute31.rm.census.gov +- [ ] hpc-compute32.rm.census.gov +- [ ] hpc-compute33.rm.census.gov +- [ ] hpc-compute34.rm.census.gov +- [ ] hpc-compute35.rm.census.gov +- [ ] hpc-compute36.rm.census.gov +- [ ] hpc-compute37.rm.census.gov +- [ ] hpc-compute38.rm.census.gov +- [ ] hpc-compute39.rm.census.gov +- [ ] hpc-compute40.rm.census.gov +- [ ] hpc-compute41.rm.census.gov +- [ ] hpc-compute42.rm.census.gov +- [ ] hpc-compute43.rm.census.gov +- [ ] hpc-compute44.rm.census.gov diff --git a/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control b/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control new file mode 100644 index 0000000..b304010 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control @@ -0,0 +1,4 @@ +#TFCOMMAND="terraform_0.13.7" +#TFCOMMAND="terraform_0.14.11" +TFCOMMAND="terraform_latest" +## TF_CLI_CONFIG_FILE=$HOME/.tf-control.tfrc diff --git a/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control.tfrc b/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control.tfrc new file mode 100644 index 0000000..d4b0b15 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/apps/.tf-control.tfrc @@ -0,0 +1,23 @@ +# https://www.terraform.io/docs/cli/config/config-file.html + +plugin_cache_dir = "/data/terraform/terraform.d/plugin-cache" +#disable_checkpoint = true + +provider_installation { +# filesystem_mirror { +# path = "/apps/terraform/terraform.d/providers" +# include = [ "*/*/*" ] +# } + filesystem_mirror { + path = "/data/terraform/terraform.d/providers" + include = [ "*/*/*" ] + } +# filesystem_mirror { +# path = "/apps/terraform/terraform.d/providers" +# include = [ "external.terraform.census.gov/*/*" ] +# } + direct { + include = [ "*/*/*" ] + } +} + diff --git a/examples/shared-vpc-setup-tf-upgrade/apps/region.tf b/examples/shared-vpc-setup-tf-upgrade/apps/region.tf new file mode 100644 index 0000000..b7b1696 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/apps/region.tf @@ -0,0 +1,4 @@ +locals { + region = var.region +} + diff --git a/examples/shared-vpc-setup-tf-upgrade/apps/tf-run.data b/examples/shared-vpc-setup-tf-upgrade/apps/tf-run.data new file mode 100644 index 0000000..f8cad8e --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/apps/tf-run.data @@ -0,0 +1,7 @@ +VERSION 1.0.0 +REMOTE-STATE +COMMAND tf-directory-setup.py -l none -f +COMMAND setup-new-directory.sh +COMMAND tf-init -upgrade +ALL +COMMAND tf-directory-setup.py -l s3 diff --git a/examples/shared-vpc-setup-tf-upgrade/apps/versions.tf b/examples/shared-vpc-setup-tf-upgrade/apps/versions.tf new file mode 100644 index 0000000..12b558f --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/apps/versions.tf @@ -0,0 +1,33 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + # ldap = { + # source = "trevex/ldap" + # version = ">= 0.5.4" + # } + # external = { + # source = "hashicorp/external" + # version = ">= 1.0" + # } + # null = { + # source = "hashicorp/null" + # version = ">= 1.0" + # } + # random = { + # source = "hashicorp/random" + # version = ">= 1.0" + # } + # template = { + # source = "hashicorp/template" + # version = ">= 1.0" + # } + # infoblox = { + # source = "infobloxopen/infoblox" + # version = ">= 2.1.0" + # } + } + required_version = ">= 1.0" +} diff --git a/examples/shared-vpc-setup-tf-upgrade/outputs.shared-vpc.tf b/examples/shared-vpc-setup-tf-upgrade/outputs.shared-vpc.tf new file mode 100644 index 0000000..66030f5 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/outputs.shared-vpc.tf @@ -0,0 +1,35 @@ +locals { + shared_vpc_info = { + vpc_id = data.aws_vpc.vpc.id + vpc_arn = data.aws_vpc.vpc.arn + vpc_cidr_block = data.aws_vpc.vpc.cidr_block + vpc_full_name = var.vpc_full_name + owner_id = data.aws_vpc.vpc.owner_id + vpc_environment = data.aws_vpc.vpc.tags["Environment"] + vpc_short_name = split("-", var.vpc_full_name)[0] + vpc_domain_name = data.aws_vpc_dhcp_options.dhcp_options.domain_name + # _raw = data.aws_vpc.vpc + } + shared_private_subnet_info = [for k, v in data.aws_subnet.subnet : { + id = v.id + arn = v.arn + availability_zone = v.availability_zone + owner_id = v.owner_id + cidr_block = v.cidr_block + subnet = v.cidr_block + label = replace(v.tags["Name"], format("%v-", var.vpc_full_name), "") + tags = v.tags + # _raw = v + }] +} + + +output "shared_vpc_info" { + description = "Details from shared VPC" + value = local.shared_vpc_info +} + +output "shared_private_subnet_info" { + description = "Details from shared VPC subnets" + value = local.shared_private_subnet_info +} diff --git a/examples/shared-vpc-setup-tf-upgrade/region.tf b/examples/shared-vpc-setup-tf-upgrade/region.tf new file mode 100644 index 0000000..b7b1696 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/region.tf @@ -0,0 +1,4 @@ +locals { + region = var.region +} + diff --git a/examples/shared-vpc-setup-tf-upgrade/shared-vpc-data.tf b/examples/shared-vpc-setup-tf-upgrade/shared-vpc-data.tf new file mode 100644 index 0000000..6b1b686 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/shared-vpc-data.tf @@ -0,0 +1,42 @@ +data "aws_vpcs" "vpcs" { + filter { + name = "tag:Name" + values = [var.vpc_full_name] + } +} + +data "aws_vpc" "vpc" { + id = coalesce(data.aws_vpcs.vpcs.ids[0], null) +} + +data "aws_subnets" "subnets" { + filter { + name = "vpc-id" + values = [data.aws_vpc.vpc.id] + } +} + +data "aws_subnet" "subnet" { + for_each = toset(data.aws_subnets.subnets.ids) + id = each.key +} + +data "aws_vpc_dhcp_options" "dhcp_options" { + dhcp_options_id = data.aws_vpc.vpc.dhcp_options_id +} + +## output "vpcs" { +## value = data.aws_vpcs.vpcs +## } +## +## output "vpc" { +## value = data.aws_vpc.vpc +## } +## +## output "subnets" { +## value = data.aws_subnets.subnets +## } +## +## output "subnet" { +## value = data.aws_subnet.subnet +## } diff --git a/examples/shared-vpc-setup-tf-upgrade/shared-vpc.tf b/examples/shared-vpc-setup-tf-upgrade/shared-vpc.tf new file mode 100644 index 0000000..9ce30c9 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/shared-vpc.tf @@ -0,0 +1,25 @@ +locals { + # vpc_info = data.terraform_remote_state.vpc_east_shared_vpc1.outputs.shared_vpc_info + # subnet_info = data.terraform_remote_state.vpc_east_shared_vpc1.outputs.shared_private_subnet_info + vpc_info = local.shared_vpc_info + subnet_info = local.shared_private_subnet_info + vpc_id = local.vpc_info.vpc_id + + tags = { + CostAllocation = "csvd:infrastructure" + Environment = var.vpc_environment + } +} + +# the only thing not shared are security groups, so they need to be created in each account/region and +# vpc where they intend to be used + +module "base-security-groups" { + source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//security-groups?ref=tf-upgrade" + vpc_id = local.vpc_id + + enable_manage_default_sg = false + vpc_full_name = var.vpc_full_name + vpc_environment = var.vpc_environment + tags = local.tags +} diff --git a/examples/shared-vpc-setup-tf-upgrade/tf-run.data b/examples/shared-vpc-setup-tf-upgrade/tf-run.data new file mode 100644 index 0000000..f8cad8e --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/tf-run.data @@ -0,0 +1,7 @@ +VERSION 1.0.0 +REMOTE-STATE +COMMAND tf-directory-setup.py -l none -f +COMMAND setup-new-directory.sh +COMMAND tf-init -upgrade +ALL +COMMAND tf-directory-setup.py -l s3 diff --git a/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.auto.tfvars b/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.auto.tfvars new file mode 100644 index 0000000..00cd607 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.auto.tfvars @@ -0,0 +1,9 @@ +# network_account_profile = "057445207498-ent-gov-network-sa" + +vpc_name = "tgw-common" +vpc_full_name = "vpc1-tgw-common" +vpc_environment = "common" +vpc_domain_name = "common.network-sa-1.csp1.census.gov" +tgw_environment = "services" + + diff --git a/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.tf b/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.tf new file mode 100644 index 0000000..6fa13fc --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/variables.shared-vpc.tf @@ -0,0 +1,51 @@ +# variable "network_account_profile" { +# description = "AWS profile of the source account sharing the VPC resources" +# type = string +# } + +# vpc_name = "tgw-common" +# vpc_cidr_block = "10.189.0.0/23" +# vpc_index = "1" +# vpc_short_name = "vpc1" +# vpc_full_name = "vpc1-tgw-common" +# vpc_environment = "common" +# vpc_domain_name = "common.network-sa-1.csp1.census.gov" +# vpc_dns_servers = ["148.129.127.22", "148.129.191.22"] +# vpc_ntp_servers = ["148.129.127.23", "148.129.191.23"] +# vpc_enable_igw = false +# vpc_enable_nat = false +# vpc_enable_vpn = false +# vpc_enable_awsdns = true +# +# vpn_settings = [] +# tgw_environment = "services" + + +variable "vpc_name" { + description = "VPC Name including environment (if necessary), excluding vpc{N}" + type = string +} + +# vpc_full_name + +## variable "vpc_cidr_block" { +## description = "VPC CIDR Block" +## type = string +## } +## +## variable "vpc_short_name" { +## description = "VPC short name component, vpc{index}" +## type = string +## } + +variable "vpc_environment" { + description = "VPC environment purpose (common, shared, dev, stage, ite, prod)" + type = string + default = "" +} + +variable "tgw_environment" { + description = "Transit Gateway environment route table (services, dev, test, stage, prod, network)" + type = string + default = null +} diff --git a/examples/shared-vpc-setup-tf-upgrade/variables.vpc.auto.tfvars b/examples/shared-vpc-setup-tf-upgrade/variables.vpc.auto.tfvars new file mode 100644 index 0000000..5b8be63 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/variables.vpc.auto.tfvars @@ -0,0 +1,16 @@ +## vpc_name = "tgw-common" +## vpc_cidr_block = "10.189.0.0/23" +## vpc_index = "1" +## vpc_short_name = "vpc1" +## vpc_full_name = "vpc1-tgw-common" +## vpc_environment = "common" +## vpc_domain_name = "common.network-sa-1.csp1.census.gov" +## vpc_dns_servers = ["148.129.127.22", "148.129.191.22"] +## vpc_ntp_servers = ["148.129.127.23", "148.129.191.23"] +## vpc_enable_igw = false +## vpc_enable_nat = false +## vpc_enable_vpn = false +## vpc_enable_awsdns = true +## +## vpn_settings = [] +## tgw_environment = "services" diff --git a/examples/shared-vpc-setup-tf-upgrade/versions.tf b/examples/shared-vpc-setup-tf-upgrade/versions.tf new file mode 100644 index 0000000..31a7d19 --- /dev/null +++ b/examples/shared-vpc-setup-tf-upgrade/versions.tf @@ -0,0 +1,33 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + ldap = { + source = "trevex/ldap" + version = ">= 0.5.4" + } + external = { + source = "hashicorp/external" + version = ">= 1.0" + } + null = { + source = "hashicorp/null" + version = ">= 1.0" + } + random = { + source = "hashicorp/random" + version = ">= 1.0" + } + template = { + source = "hashicorp/template" + version = ">= 1.0" + } + infoblox = { + source = "infobloxopen/infoblox" + version = ">= 2.1.0" + } + } + required_version = ">= 1.0" +} diff --git a/tag-shared-vpc-resources/README.md b/tag-shared-vpc-resources/README.md index 44774be..39019de 100644 --- a/tag-shared-vpc-resources/README.md +++ b/tag-shared-vpc-resources/README.md @@ -56,7 +56,7 @@ provider "aws" { module "tag_shared" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//tag-shared-vpc-resources?ref=tf-upgrade" - providers { + providers = { aws = aws aws.network_account = aws.network_account } diff --git a/tag-shared-vpc-resources/main.tf b/tag-shared-vpc-resources/main.tf index ce9d253..e5307ae 100644 --- a/tag-shared-vpc-resources/main.tf +++ b/tag-shared-vpc-resources/main.tf @@ -57,7 +57,7 @@ * * module "tag_shared" { * source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//tag-shared-vpc-resources?ref=tf-upgrade" -* providers { +* providers = { * aws = aws * aws.network_account = aws.network_account * }