diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index a474ed8be..93f78fc2b 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -51,8 +51,6 @@ jobs: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} @@ -64,8 +62,6 @@ jobs: --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" - --var AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" - --var AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" - name: Check for changes to egress config diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70a1c5c2c..4353e57b5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,8 +56,6 @@ jobs: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} @@ -69,8 +67,6 @@ jobs: --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" - --var AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" - --var AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" - name: Check for changes to egress config diff --git a/docs/deploying.md b/docs/deploying.md index 94d85af36..3d7b1ad4c 100644 --- a/docs/deploying.md +++ b/docs/deploying.md @@ -60,5 +60,5 @@ Rules for use: 1. start a pipenv shell as a shortcut to load `.env` file variables: `$ pipenv shell` 1. Deploy the application: ``` - cf push --vars-file deploy-config/sandbox.yml --var AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID --var AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY + cf push --vars-file deploy-config/sandbox.yml ``` diff --git a/manifest.yml b/manifest.yml index 7db86dd06..448c70b81 100644 --- a/manifest.yml +++ b/manifest.yml @@ -48,8 +48,6 @@ applications: INTERNAL_CLIENT_API_KEYS: '{"notify-admin":["((ADMIN_CLIENT_SECRET))"]}' DANGEROUS_SALT: ((DANGEROUS_SALT)) SECRET_KEY: ((SECRET_KEY)) - AWS_ACCESS_KEY_ID: ((AWS_ACCESS_KEY_ID)) - AWS_SECRET_ACCESS_KEY: ((AWS_SECRET_ACCESS_KEY)) AWS_US_TOLL_FREE_NUMBER: ((default_toll_free_number)) REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt"