Fix CI to run in dedicated VPC

Flaconi · Sep 12, 2024 · 687674e · 687674e
1 parent e1712ee
commit 687674e
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 21 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: "make test"
         run: |
-          make test ARGS="-var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_hub=${TF_VAR_aws_account_id_hub} -var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_satellite=${TF_VAR_aws_account_id_satellite}"
+          make test ARGS="-var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_hub=${TF_VAR_aws_account_id_hub} -var role_to_assume_satellite=${TF_VAR_role_to_assume} -var aws_account_id_satellite=${TF_VAR_aws_account_id_satellite}"
         env:
           AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: "make test"
         run: |
-          make test ARGS="-var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_hub=${TF_VAR_aws_account_id_hub} -var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_satellite=${TF_VAR_aws_account_id_satellite}"
+          make test ARGS="-var role_to_assume_hub=${TF_VAR_role_to_assume} -var aws_account_id_hub=${TF_VAR_aws_account_id_hub} -var role_to_assume_satellite=${TF_VAR_role_to_assume} -var aws_account_id_satellite=${TF_VAR_aws_account_id_satellite}"
         env:
           AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/examples/satellite-all/README.md b/examples/satellite-all/README.md
@@ -13,6 +13,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_tgw"></a> [tgw](#module\_tgw) | github.com/flaconi/terraform-aws-transit-gateway-hub.git | v1.6.0 |
 | <a name="module_tgw-satellite-all"></a> [tgw-satellite-all](#module\_tgw-satellite-all) | ../../ | n/a |
 
 ## Resources

diff --git a/examples/satellite-all/main.tf b/examples/satellite-all/main.tf
@@ -1,5 +1,12 @@
-# The Transit Gateway (hub) has already been created in AWS, as a fixture for
-# this test case due to not being able to use 'depends_on' on Terraform modules
+module "tgw" {
+  source = "github.com/flaconi/terraform-aws-transit-gateway-hub.git?ref=v1.6.0"
+
+  name = var.transit_gateway_hub_name
+
+  aws_account_id_hub       = var.aws_account_id_hub
+  aws_account_id_satellite = [var.aws_account_id_satellite]
+}
+
 module "tgw-satellite-all" {
   source = "../../"
 
@@ -27,4 +34,6 @@ module "tgw-satellite-all" {
   route_private_subnets_via_tgw = var.route_private_subnets_via_tgw
 
   private_subnet_filters = var.private_subnet_filters
+
+  depends_on = [module.tgw]
 }
diff --git a/examples/satellite-all/variables.auto.tfvars b/examples/satellite-all/variables.auto.tfvars
@@ -1,9 +1,6 @@
 satellite_create = true
 
-role_to_assume_hub       = "ASSUME-ENG-CI"
-role_to_assume_satellite = "ASSUME-ENG-CI"
-
-vpc_name_to_attach = "default"
+vpc_name_to_attach = "ci-tgw"
 
 satellite_destination_cidr_blocks = ["208.67.222.222/32", "208.67.220.220/32"]
 hub_destination_cidr_blocks       = ["8.8.4.4/32", "8.8.8.8/32"]
@@ -19,7 +16,7 @@ attachment_subnet_filters = [
   }
 ]
 
-transit_gateway_hub_name = "test-tgw-fixture"
+transit_gateway_hub_name = "test-tgw-satellite-all"
 
 route_entire_satellite_vpc = true
 

diff --git a/examples/satellite-default-route-all/README.md b/examples/satellite-default-route-all/README.md
@@ -13,6 +13,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_tgw"></a> [tgw](#module\_tgw) | github.com/flaconi/terraform-aws-transit-gateway-hub.git | v1.6.0 |
 | <a name="module_tgw-satellite-default-route-all"></a> [tgw-satellite-default-route-all](#module\_tgw-satellite-default-route-all) | ../../ | n/a |
 
 ## Resources

diff --git a/examples/satellite-default-route-all/main.tf b/examples/satellite-default-route-all/main.tf
@@ -1,5 +1,12 @@
-# The Transit Gateway (hub) has already been created in AWS, as a fixture for
-# this test case due to not being able to use 'depends_on' on Terraform modules
+module "tgw" {
+  source = "github.com/flaconi/terraform-aws-transit-gateway-hub.git?ref=v1.6.0"
+
+  name = var.transit_gateway_hub_name
+
+  aws_account_id_hub       = var.aws_account_id_hub
+  aws_account_id_satellite = [var.aws_account_id_satellite]
+}
+
 module "tgw-satellite-default-route-all" {
   source = "../../"
 
@@ -27,4 +34,6 @@ module "tgw-satellite-default-route-all" {
   route_private_subnets_via_tgw = var.route_private_subnets_via_tgw
 
   private_subnet_filters = var.private_subnet_filters
+
+  depends_on = [module.tgw]
 }
diff --git a/examples/satellite-default-route-all/variables.auto.tfvars b/examples/satellite-default-route-all/variables.auto.tfvars
@@ -1,6 +1,6 @@
 satellite_create = true
 
-vpc_name_to_attach = "default"
+vpc_name_to_attach = "ci-tgw"
 
 satellite_destination_cidr_blocks = ["208.67.222.222/32", "208.67.220.220/32"]
 hub_destination_cidr_blocks       = ["8.8.4.4/32", "8.8.8.8/32"]
@@ -16,7 +16,7 @@ attachment_subnet_filters = [
   }
 ]
 
-transit_gateway_hub_name = "test-tgw-fixture"
+transit_gateway_hub_name = "test-tgw-satellite-default-route-all"
 
 route_entire_satellite_vpc = true
 

diff --git a/examples/satellite-default-route/README.md b/examples/satellite-default-route/README.md
@@ -13,6 +13,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_tgw"></a> [tgw](#module\_tgw) | github.com/flaconi/terraform-aws-transit-gateway-hub.git | v1.6.0 |
 | <a name="module_tgw-satellite-default-route"></a> [tgw-satellite-default-route](#module\_tgw-satellite-default-route) | ../../ | n/a |
 
 ## Resources

diff --git a/examples/satellite-default-route/main.tf b/examples/satellite-default-route/main.tf
@@ -1,5 +1,12 @@
-# The Transit Gateway (hub) has already been created in AWS, as a fixture for
-# this test case due to not being able to use 'depends_on' on Terraform modules
+module "tgw" {
+  source = "github.com/flaconi/terraform-aws-transit-gateway-hub.git?ref=v1.6.0"
+
+  name = var.transit_gateway_hub_name
+
+  aws_account_id_hub       = var.aws_account_id_hub
+  aws_account_id_satellite = [var.aws_account_id_satellite]
+}
+
 module "tgw-satellite-default-route" {
   source = "../../"
 
@@ -27,4 +34,6 @@ module "tgw-satellite-default-route" {
   route_private_subnets_via_tgw = var.route_private_subnets_via_tgw
 
   private_subnet_filters = var.private_subnet_filters
+
+  depends_on = [module.tgw]
 }
diff --git a/examples/satellite-default-route/variables.auto.tfvars b/examples/satellite-default-route/variables.auto.tfvars
@@ -1,6 +1,6 @@
 satellite_create = true
 
-vpc_name_to_attach = "default"
+vpc_name_to_attach = "ci-tgw"
 
 satellite_destination_cidr_blocks = ["208.67.222.222/32", "208.67.220.220/32"]
 hub_destination_cidr_blocks       = ["8.8.4.4/32", "8.8.8.8/32"]
@@ -16,7 +16,7 @@ attachment_subnet_filters = [
   }
 ]
 
-transit_gateway_hub_name = "test-tgw-fixture"
+transit_gateway_hub_name = "test-tgw-satellite-default-route"
 
 route_private_subnets_via_tgw = true
 

diff --git a/examples/satellite/README.md b/examples/satellite/README.md
@@ -13,6 +13,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_tgw"></a> [tgw](#module\_tgw) | github.com/flaconi/terraform-aws-transit-gateway-hub.git | v1.6.0 |
 | <a name="module_tgw-satellite"></a> [tgw-satellite](#module\_tgw-satellite) | ../../ | n/a |
 
 ## Resources

diff --git a/examples/satellite/main.tf b/examples/satellite/main.tf
@@ -1,5 +1,12 @@
-# The Transit Gateway (hub) has already been created in AWS, as a fixture for
-# this test case due to not being able to use 'depends_on' on Terraform modules
+module "tgw" {
+  source = "github.com/flaconi/terraform-aws-transit-gateway-hub.git?ref=v1.6.0"
+
+  name = var.transit_gateway_hub_name
+
+  aws_account_id_hub       = var.aws_account_id_hub
+  aws_account_id_satellite = [var.aws_account_id_satellite]
+}
+
 module "tgw-satellite" {
   source = "../../"
 
@@ -29,4 +36,6 @@ module "tgw-satellite" {
   route_private_subnets_via_tgw = var.route_private_subnets_via_tgw
 
   private_subnet_filters = var.private_subnet_filters
+
+  depends_on = [module.tgw]
 }
diff --git a/examples/satellite/variables.auto.tfvars b/examples/satellite/variables.auto.tfvars
@@ -1,6 +1,6 @@
 satellite_create = true
 
-vpc_name_to_attach = "default"
+vpc_name_to_attach = "ci-tgw"
 
 satellite_destination_cidr_blocks = ["208.67.222.222/32", "208.67.220.220/32"]
 hub_destination_cidr_blocks       = ["8.8.4.4/32", "8.8.8.8/32"]
@@ -16,7 +16,7 @@ attachment_subnet_filters = [
   }
 ]
 
-transit_gateway_hub_name = "test-tgw-fixture"
+transit_gateway_hub_name = "test-tgw-satellite"
 
 private_subnets_strict_acl_rules = true