From 1de2c8081b59c93de7e68499b8fbb989bc4409b3 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 19 Feb 2025 18:21:57 -0500 Subject: [PATCH 1/4] Update Terraform config and revert staging deploy change This changeset updates the Terraform user configuration in several environments to factor in team member changes, and reverts the previous change to the staging deploy to see if there was an issue with the last update which is preventing the workflow from running now. Signed-off-by: Carlo Costino --- .github/workflows/deploy.yml | 4 ++-- terraform/demo/main.tf | 3 +-- terraform/sandbox/main.tf | 4 +--- terraform/staging/main.tf | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 897e359e2..cc70434b9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: - name: Check for changes to Terraform id: changed-terraform-files - uses: tj-actions/changed-files@v45 + uses: tj-actions/changed-files@v44 with: files: | terraform/staging/** @@ -84,7 +84,7 @@ jobs: - name: Check for changes to templates.json id: changed-templates - uses: tj-actions/changed-files@v45 + uses: tj-actions/changed-files@v44 with: files: | app/config_files/templates.json diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index 1a9e091db..47bcf411d 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -49,8 +49,7 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user, - "steven.reilly@gsa.gov" + var.cf_user ] } diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 380131370..48b4063e8 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -49,9 +49,7 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user, - "steven.reilly@gsa.gov", - "carlo.costino@gsa.gov" + var.cf_user ] } diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index d59b063ea..d2e7e674a 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -49,9 +49,7 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user, - "steven.reilly@gsa.gov", - "carlo.costino@gsa.gov" + var.cf_user ] } From a4645e9ba10ac8fceead03c1189739afb77a8ed3 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 19 Feb 2025 21:15:01 -0500 Subject: [PATCH 2/4] Adding users back in Signed-off-by: Carlo Costino --- terraform/demo/main.tf | 3 ++- terraform/sandbox/main.tf | 3 ++- terraform/staging/main.tf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index 47bcf411d..5011f0901 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -49,7 +49,8 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user + var.cf_user, + "carlo.costino@gsa.gov" ] } diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 48b4063e8..a5b2d6592 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -49,7 +49,8 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user + var.cf_user, + "carlo.costino@gsa.gov" ] } diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index d2e7e674a..bc6def6d5 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -49,7 +49,8 @@ module "egress-space" { cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ - var.cf_user + var.cf_user, + "carlo.costino@gsa.gov" ] } From 76ff8c11e9130dfb279c10029c27409086d0aab3 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 19 Feb 2025 21:26:45 -0500 Subject: [PATCH 3/4] Try installing Terraform directly per GitHub Action issue Signed-off-by: Carlo Costino --- .github/workflows/terraform-staging.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/terraform-staging.yml b/.github/workflows/terraform-staging.yml index f70efdff6..9fe174ee8 100644 --- a/.github/workflows/terraform-staging.yml +++ b/.github/workflows/terraform-staging.yml @@ -18,6 +18,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Terraform format id: format run: terraform fmt -check From 00e6e560fa4e1e593323e0f2407a77d12c553479 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 19 Feb 2025 21:36:51 -0500 Subject: [PATCH 4/4] Fix up Terraform installation and get back to latest changed file check Signed-off-by: Carlo Costino --- .github/workflows/deploy-demo.yml | 8 ++++++++ .github/workflows/deploy-prod.yml | 8 ++++++++ .github/workflows/deploy.yml | 12 +++++++++-- .github/workflows/drift.yml | 24 ++++++++++++++++++++++ .github/workflows/terraform-demo.yml | 8 ++++++++ .github/workflows/terraform-production.yml | 8 ++++++++ 6 files changed, 66 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 48a47ceb3..3c07156bd 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -16,6 +16,14 @@ jobs: with: fetch-depth: 2 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for changes to Terraform id: changed-terraform-files uses: tj-actions/changed-files@v45 diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 6e0a2d583..703fc35b2 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -20,6 +20,14 @@ jobs: with: fetch-depth: 2 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for changes to Terraform id: changed-terraform-files uses: tj-actions/changed-files@v45 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cc70434b9..eb32dd1eb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,9 +22,17 @@ jobs: with: fetch-depth: 2 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for changes to Terraform id: changed-terraform-files - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: files: | terraform/staging/** @@ -84,7 +92,7 @@ jobs: - name: Check for changes to templates.json id: changed-templates - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: files: | app/config_files/templates.json diff --git a/.github/workflows/drift.yml b/.github/workflows/drift.yml index 5f495ceba..62fa1b3c7 100644 --- a/.github/workflows/drift.yml +++ b/.github/workflows/drift.yml @@ -15,6 +15,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for drift uses: dflook/terraform-check@v1 env: @@ -35,6 +43,14 @@ jobs: with: ref: 'production' + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for drift uses: dflook/terraform-check@v1 env: @@ -55,6 +71,14 @@ jobs: with: ref: 'production' + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Check for drift uses: dflook/terraform-check@v1 env: diff --git a/.github/workflows/terraform-demo.yml b/.github/workflows/terraform-demo.yml index a3dced5fc..1910de574 100644 --- a/.github/workflows/terraform-demo.yml +++ b/.github/workflows/terraform-demo.yml @@ -18,6 +18,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Terraform format id: format run: terraform fmt -check diff --git a/.github/workflows/terraform-production.yml b/.github/workflows/terraform-production.yml index 2f9a5960f..91b3a48b9 100644 --- a/.github/workflows/terraform-production.yml +++ b/.github/workflows/terraform-production.yml @@ -18,6 +18,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 + # Looks like we need to install Terraform ourselves now! + # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "^1.7.5" + terraform_wrapper: false + - name: Terraform format id: format run: terraform fmt -check