From 5684390a70b23116cba062d694d6da63973cc63c Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 5 Jun 2024 11:49:13 -0400 Subject: [PATCH] update sample code for awscc provider --- .../credentials.network_account.tf | 10 +++++++++ .../region-shared-setup/provider.awscc.tf | 21 +++++++++++++++++++ examples/region-shared-setup/tags.tf | 6 ++++-- examples/region-shared-setup/tf-run.data | 16 ++------------ examples/region-shared-setup/versions.tf | 6 +++++- 5 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 examples/region-shared-setup/provider.awscc.tf diff --git a/examples/region-shared-setup/credentials.network_account.tf b/examples/region-shared-setup/credentials.network_account.tf index 689abf8..c0d4bad 100644 --- a/examples/region-shared-setup/credentials.network_account.tf +++ b/examples/region-shared-setup/credentials.network_account.tf @@ -20,3 +20,13 @@ provider "aws" { session_name = var.os_username } } + +provider "awscc" { + alias = "network_account" + region = var.region + profile = var.profile + assume_role = { + role_arn = var.network_role_arn + session_name = var.os_username + } +} diff --git a/examples/region-shared-setup/provider.awscc.tf b/examples/region-shared-setup/provider.awscc.tf new file mode 100644 index 0000000..845dac5 --- /dev/null +++ b/examples/region-shared-setup/provider.awscc.tf @@ -0,0 +1,21 @@ +# default: east +provider "awscc" { + region = var.region_map["east"] + profile = var.profile +} + +# other regions +# east +provider "awscc" { + alias = "east" + region = var.region_map["east"] + profile = var.profile +} + +# west +provider "awscc" { + alias = "west" + region = var.region_map["west"] + profile = var.profile +} + diff --git a/examples/region-shared-setup/tags.tf b/examples/region-shared-setup/tags.tf index cf29d09..a4ae8a2 100644 --- a/examples/region-shared-setup/tags.tf +++ b/examples/region-shared-setup/tags.tf @@ -1,8 +1,10 @@ module "tag_shared" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//tag-shared-vpc-resources?ref=tf-upgrade" providers = { - aws = aws - aws.network_account = aws.network_account + aws = aws + aws.network_account = aws.network_account + awscc = awscc + awscc.network_account = awscc.network_account } profile = var.profile role_arn = var.network_role_arn diff --git a/examples/region-shared-setup/tf-run.data b/examples/region-shared-setup/tf-run.data index 7272ea8..4b5d678 100644 --- a/examples/region-shared-setup/tf-run.data +++ b/examples/region-shared-setup/tf-run.data @@ -1,4 +1,4 @@ -VERSION 1.1.0 +VERSION 2.1.2 TAG setup REMOTE-STATE COMMAND tf-directory-setup.py -l none -f @@ -17,21 +17,9 @@ LINKTOP includes.d/variables.application_tags.auto.tfvars COMMAND rm -f provider.ldap.* provider.ldap_new.* TAG init -COMMAND tf-init -upgrade +COMMAND tf-init TAG start - -TAG tags -module.tag_shared.aws_ec2_tag.vpcs module.tag_shared.aws_ec2_tag.dhcp_options -module.tag_shared.aws_ec2_tag.route_tables module.tag_shared.aws_ec2_tag.subnets -module.tag_shared.aws_ec2_tag.transit_gateway - -TAG network-acls -module.tag_shared.null_resource.setup_directory -module.tag_shared.null_resource.network_acl -module.tag_shared.null_resource.network_acls - -TAG remainder ALL TAG state-link diff --git a/examples/region-shared-setup/versions.tf b/examples/region-shared-setup/versions.tf index dae0f3d..5442493 100644 --- a/examples/region-shared-setup/versions.tf +++ b/examples/region-shared-setup/versions.tf @@ -3,7 +3,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 5.0" + } + awscc = { + source = "hashicorp/awscc" + version = ">= 1.0" } ## ldap = { ## source = "trevex/ldap"