From 35eb2a9013e8fd941a87dbd0c0550bd2df2dee53 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 4 Oct 2024 22:49:42 -0400 Subject: [PATCH 1/4] Add missing environment veriables to egress deploy action This changeset adds missing environment variables needed by the egress proxy to now properly deploy. Signed-off-by: Carlo Costino --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4da91e0f3..abcac49a0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -110,6 +110,9 @@ jobs: #if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy with: + cf_username: ${{ secrets.CLOUDGOV_USERNAME }} + cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} + cf_org: gsa-tts-benefits-studio cf_space: notify-staging app: notify-admin-staging From 2fbce24f97bb11783f3cc7f0e9624078c2d76f9f Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 9 Oct 2024 13:48:47 -0600 Subject: [PATCH 2/4] Add missing inputs to egress proxy deploy action This changeset adds a few missing inputs to the egress proxy deploy action so that it can use the provided environment variables properly. Signed-off-by: Carlo Costino --- .github/actions/deploy-proxy/action.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/actions/deploy-proxy/action.yml b/.github/actions/deploy-proxy/action.yml index 339d1fc78..393dd4b45 100644 --- a/.github/actions/deploy-proxy/action.yml +++ b/.github/actions/deploy-proxy/action.yml @@ -1,6 +1,15 @@ name: Deploy egress proxy description: Set egress space security groups and deploy proxy inputs: + cf_username: + description: The username to authenticate with. + required: true + cf_password: + description: The password to authenticate with. + required: true + cf_org: + description: The org the target app exists in. + required: true cf_space: description: The space the target app exists in. required: true From fd447e9a754ee6781c401e3db363305fb61d0f47 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 9 Oct 2024 14:20:10 -0600 Subject: [PATCH 3/4] Swap out config variables for env variables This changeset swaps the CF_USERNAME and CF_PASSWORD config vars to be proper env vars so they can be read in as expected. Signed-off-by: Carlo Costino --- .github/actions/deploy-proxy/action.yml | 6 ------ .github/workflows/deploy.yml | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/actions/deploy-proxy/action.yml b/.github/actions/deploy-proxy/action.yml index 393dd4b45..0ffc05066 100644 --- a/.github/actions/deploy-proxy/action.yml +++ b/.github/actions/deploy-proxy/action.yml @@ -1,12 +1,6 @@ name: Deploy egress proxy description: Set egress space security groups and deploy proxy inputs: - cf_username: - description: The username to authenticate with. - required: true - cf_password: - description: The password to authenticate with. - required: true cf_org: description: The org the target app exists in. required: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index abcac49a0..72614b09d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -109,9 +109,10 @@ jobs: - name: Deploy egress proxy #if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy + env: + CF_USERNAME: ${{ secrets.CF_USERNAME }} + CF_PASSWORD: ${{ secrets.CF_PASSWORD }} with: - cf_username: ${{ secrets.CLOUDGOV_USERNAME }} - cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} cf_org: gsa-tts-benefits-studio cf_space: notify-staging app: notify-admin-staging From f27703112a1d3a866c5bbdacf357df9d4e618ce1 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 10 Oct 2024 13:06:47 -0400 Subject: [PATCH 4/4] Use the correct environment variable names This changeset corrects the reference to the environment names that we are actually trying to reference. Signed-off-by: Carlo Costino --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72614b09d..09f69c73d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -110,8 +110,8 @@ jobs: #if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy env: - CF_USERNAME: ${{ secrets.CF_USERNAME }} - CF_PASSWORD: ${{ secrets.CF_PASSWORD }} + CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }} + CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} with: cf_org: gsa-tts-benefits-studio cf_space: notify-staging