From 604bf4a30269d72d86270efad2aa3ce1419b5da5 Mon Sep 17 00:00:00 2001 From: JoshuaVulcan <38018017+JoshuaVulcan@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:13:10 -0800 Subject: [PATCH 1/5] tweak:feature flag toggle --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index d314cbde3..574ac237e 100644 --- a/.env +++ b/.env @@ -12,4 +12,4 @@ REACT_APP_DEFAULT_PATROL_FILTER_FROM_DAYS=1 # Feature flags REACT_APP_LEGACY_RT_ENABLED=false -REACT_APP_EFB_FORM_SCHEMA_SUPPORT_ENABLED=true +REACT_APP_EFB_FORM_SCHEMA_SUPPORT_ENABLED=false From f1fb1d0d1df285a47ad87d3008f19e6f6bf56620 Mon Sep 17 00:00:00 2001 From: andersondario-ng Date: Wed, 12 Feb 2025 14:43:27 -0300 Subject: [PATCH 2/5] Adding Setup Terraform step --- .github/workflows/develop-workflow.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 6d0021133..4dd22980c 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -35,6 +35,11 @@ jobs: with: node-version: 20 + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "0.13.7" + - name: "Configure python" uses: actions/setup-python@v5 with: From eb7a4b98496453ad59e7ab98d4d72b81f5d21e53 Mon Sep 17 00:00:00 2001 From: andersondario-ng Date: Wed, 12 Feb 2025 15:48:22 -0300 Subject: [PATCH 3/5] Google Creds setup --- .github/workflows/develop-workflow.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 4dd22980c..700e78fce 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -29,6 +29,11 @@ jobs: token_format: 'access_token' workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' service_account: '${{ secrets.WIF_SERVICE_ACCOUNT }}' + create_credentials_file: true + + - name: Set GOOGLE_APPLICATION_CREDENTIALS + run: | + echo "GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS}" >> $GITHUB_ENV - name: Setup Node uses: actions/setup-node@v4 @@ -86,6 +91,8 @@ jobs: cd terraform && terraform init terraform plan -out=tfplan terraform apply -auto-approve tfplan + env: + GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - name: Allowlist IP address if: steps.validate_env.outputs.site_exists == 'true' From 7b096850e080effad44ae403b2e6fb8a1c19cf18 Mon Sep 17 00:00:00 2001 From: andersondario-ng Date: Wed, 12 Feb 2025 16:16:11 -0300 Subject: [PATCH 4/5] Only required changes --- .github/workflows/develop-workflow.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 700e78fce..59c48c554 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -29,12 +29,7 @@ jobs: token_format: 'access_token' workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' service_account: '${{ secrets.WIF_SERVICE_ACCOUNT }}' - create_credentials_file: true - - name: Set GOOGLE_APPLICATION_CREDENTIALS - run: | - echo "GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS}" >> $GITHUB_ENV - - name: Setup Node uses: actions/setup-node@v4 with: @@ -43,7 +38,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v3 with: - terraform_version: "0.13.7" + terraform_version: "1.5.0" - name: "Configure python" uses: actions/setup-python@v5 @@ -91,8 +86,6 @@ jobs: cd terraform && terraform init terraform plan -out=tfplan terraform apply -auto-approve tfplan - env: - GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - name: Allowlist IP address if: steps.validate_env.outputs.site_exists == 'true' From 2031305bdaf47490cee94fb1a4a5f9f7719bc99f Mon Sep 17 00:00:00 2001 From: andersondario-ng Date: Wed, 12 Feb 2025 16:18:17 -0300 Subject: [PATCH 5/5] Removing white space --- .github/workflows/develop-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 59c48c554..e21c10177 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -29,7 +29,7 @@ jobs: token_format: 'access_token' workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' service_account: '${{ secrets.WIF_SERVICE_ACCOUNT }}' - + - name: Setup Node uses: actions/setup-node@v4 with: