diff --git a/.github/actions/deploy-proxy/action.yml b/.github/actions/deploy-proxy/action.yml index 13bdc494f..0ffc05066 100644 --- a/.github/actions/deploy-proxy/action.yml +++ b/.github/actions/deploy-proxy/action.yml @@ -1,6 +1,9 @@ name: Deploy egress proxy description: Set egress space security groups and deploy proxy inputs: + cf_org: + description: The org the target app exists in. + required: true cf_space: description: The space the target app exists in. required: true @@ -16,6 +19,19 @@ inputs: runs: using: composite steps: + - name: Install cf-cli + shell: bash + run: | + curl -A "cg-deploy-action" -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=v8&source=github' + sudo dpkg -i cf-cli_amd64.deb + - name: Login to cf-cli + shell: bash + run: | + cf api api.fr.cloud.gov + cf auth + - name: Target org and space + shell: bash + run: cf target -o ${{ inputs.cf_org }} -s ${{ inputs.cf_space }} - name: Set restricted space egress shell: bash run: ./terraform/set_space_egress.sh -t -s ${{ inputs.cf_space }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6145bf296..43296f9c7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -101,9 +101,13 @@ jobs: .github/actions/deploy-proxy/action.yml .github/workflows/deploy.yml - name: Deploy egress proxy - if: steps.changed-egress-config.outputs.any_changed == 'true' + #if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy + env: + CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }} + CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} with: + cf_org: gsa-tts-benefits-studio cf_space: notify-staging app: notify-api-staging