update sample code for awscc provider

terraform-modules · Jun 5, 2024 · 5684390 · 5684390
1 parent ed50508
commit 5684390
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"