From 0c100dd7cc27699c250283cf2c5d9308e36a29df Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Fri, 4 Oct 2024 10:26:23 -0600 Subject: [PATCH 1/3] Change references name in deploy tool --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6145bf296..b2ca9c975 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,7 +55,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: cloud-gov/cg-cli-tools@main + uses: cloud-gov/cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} From 584f24390ceaafa8cb5714cbc9027dfc96e1832b Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Fri, 4 Oct 2024 11:17:34 -0600 Subject: [PATCH 2/3] Switch back repo reference and update deploy tool for demo/prod scripts --- .github/workflows/deploy-demo.yml | 8 +++++--- .github/workflows/deploy-prod.yml | 8 +++++--- .github/workflows/deploy.yml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 9886eff6c..2895a3d6c 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -49,7 +49,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: 18f/cg-deploy-action@main + uses: cloud-gov/cg-cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} @@ -64,8 +64,9 @@ jobs: cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} cf_org: gsa-tts-benefits-studio cf_space: notify-demo - push_arguments: >- - --vars-file deploy-config/demo.yml + cf_command: >- + push -f manifest.yml + --vars-file deploy-config/staging.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" @@ -73,6 +74,7 @@ jobs: --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL" --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD" --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL" + --strategy rolling - name: Check for changes to templates.json id: changed-templates diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 0778f3c78..ed544ccb0 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -53,7 +53,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: 18f/cg-deploy-action@main + uses: cloud-gov/cg-cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} @@ -68,8 +68,9 @@ jobs: cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} cf_org: gsa-tts-benefits-studio cf_space: notify-production - push_arguments: >- - --vars-file deploy-config/production.yml + cf_command: >- + push -f manifest.yml + --vars-file deploy-config/staging.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" @@ -77,6 +78,7 @@ jobs: --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL" --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD" --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL" + --strategy rolling - name: Check for changes to templates.json id: changed-templates diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b2ca9c975..6145bf296 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,7 +55,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: cloud-gov/cli-tools@main + uses: cloud-gov/cg-cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} From 497f91af4dc8baa75847e68ce54edf94cea59da9 Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Fri, 4 Oct 2024 11:20:57 -0600 Subject: [PATCH 3/3] Fix deploy config references --- .github/workflows/deploy-demo.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 2895a3d6c..0bb7e1ec8 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -66,7 +66,7 @@ jobs: cf_space: notify-demo cf_command: >- push -f manifest.yml - --vars-file deploy-config/staging.yml + --vars-file deploy-config/demo.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index ed544ccb0..c84cf7324 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -70,7 +70,7 @@ jobs: cf_space: notify-production cf_command: >- push -f manifest.yml - --vars-file deploy-config/staging.yml + --vars-file deploy-config/production.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET"