From 9a60418d3dd884c894d980027ee7ff2b1bbaeceb Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Thu, 23 Feb 2023 15:18:34 -0500 Subject: [PATCH 1/4] infra: change phd api key env variable --- .github/workflows/canary-ap-northeast-2.yml | 2 +- .github/workflows/canary-ca-central-1.yml | 2 +- .github/workflows/canary-eu-central-1.yml | 2 +- .github/workflows/canary-us-west-2.yml | 2 +- .github/workflows/production-ap-east-1.yml | 2 +- .github/workflows/production-ap-northeast-1.yml | 2 +- .github/workflows/production-ap-northeast-2.yml | 2 +- .github/workflows/production-ap-south-1.yml | 2 +- .github/workflows/production-ap-southeast-1.yml | 2 +- .github/workflows/production-ap-southeast-2.yml | 2 +- .github/workflows/production-ca-central-1.yml | 3 ++- .github/workflows/production-eu-central-1.yml | 4 ++-- .github/workflows/production-eu-north-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 3 ++- .github/workflows/production-eu-west-1.yml | 2 +- .github/workflows/production-eu-west-2.yml | 2 +- .github/workflows/production-eu-west-3.yml | 2 +- .github/workflows/production-us-east-1.yml | 2 +- .github/workflows/production-us-east-2.yml | 2 +- .github/workflows/production-us-west-1.yml | 2 +- .github/workflows/production-us-west-2.yml | 2 +- .github/workflows/staging-us-west-2.yml | 2 +- pocket-gateway/tasks/shared-envs.json | 2 +- 23 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/canary-ap-northeast-2.yml b/.github/workflows/canary-ap-northeast-2.yml index 0bd971de..c3124867 100644 --- a/.github/workflows/canary-ap-northeast-2.yml +++ b/.github/workflows/canary-ap-northeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-ca-central-1.yml b/.github/workflows/canary-ca-central-1.yml index 4e89ec4d..52bb0bfe 100644 --- a/.github/workflows/canary-ca-central-1.yml +++ b/.github/workflows/canary-ca-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-eu-central-1.yml b/.github/workflows/canary-eu-central-1.yml index ada73cba..41e45cd0 100644 --- a/.github/workflows/canary-eu-central-1.yml +++ b/.github/workflows/canary-eu-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-us-west-2.yml b/.github/workflows/canary-us-west-2.yml index 0f65f63b..eebe6092 100644 --- a/.github/workflows/canary-us-west-2.yml +++ b/.github/workflows/canary-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-east-1.yml b/.github/workflows/production-ap-east-1.yml index 63c7fabf..dd598b40 100644 --- a/.github/workflows/production-ap-east-1.yml +++ b/.github/workflows/production-ap-east-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-northeast-1.yml b/.github/workflows/production-ap-northeast-1.yml index 7f433376..c5a067d9 100644 --- a/.github/workflows/production-ap-northeast-1.yml +++ b/.github/workflows/production-ap-northeast-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-northeast-2.yml b/.github/workflows/production-ap-northeast-2.yml index ad15438c..147bbb0f 100644 --- a/.github/workflows/production-ap-northeast-2.yml +++ b/.github/workflows/production-ap-northeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-south-1.yml b/.github/workflows/production-ap-south-1.yml index d731adf5..88ca13ce 100644 --- a/.github/workflows/production-ap-south-1.yml +++ b/.github/workflows/production-ap-south-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-southeast-1.yml b/.github/workflows/production-ap-southeast-1.yml index 2642fc19..cff7a2e1 100644 --- a/.github/workflows/production-ap-southeast-1.yml +++ b/.github/workflows/production-ap-southeast-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-southeast-2.yml b/.github/workflows/production-ap-southeast-2.yml index 4c9f98ed..5778099f 100644 --- a/.github/workflows/production-ap-southeast-2.yml +++ b/.github/workflows/production-ap-southeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index 4460197e..a6a8966c 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -92,6 +92,7 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} + - name: Deploy / ca-central-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index 81e6e129..d91ae669 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -98,4 +98,4 @@ jobs: task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }} service: gateway-prod cluster: gateway-prod - wait-for-service-stability: true + wait-for-service-stability: true \ No newline at end of file diff --git a/.github/workflows/production-eu-north-1.yml b/.github/workflows/production-eu-north-1.yml index 5246aa8f..c865471b 100644 --- a/.github/workflows/production-eu-north-1.yml +++ b/.github/workflows/production-eu-north-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index c27f7c3d..d2c802c3 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -92,6 +92,7 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} + - name: Deploy / eu-south-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-west-1.yml b/.github/workflows/production-eu-west-1.yml index 65e4ade5..b7b2d7c4 100644 --- a/.github/workflows/production-eu-west-1.yml +++ b/.github/workflows/production-eu-west-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-west-2.yml b/.github/workflows/production-eu-west-2.yml index 6fcc3579..ad1afd33 100644 --- a/.github/workflows/production-eu-west-2.yml +++ b/.github/workflows/production-eu-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-west-3.yml b/.github/workflows/production-eu-west-3.yml index 13db2a3e..21a60285 100644 --- a/.github/workflows/production-eu-west-3.yml +++ b/.github/workflows/production-eu-west-3.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-east-1.yml b/.github/workflows/production-us-east-1.yml index 357958fd..0807c330 100644 --- a/.github/workflows/production-us-east-1.yml +++ b/.github/workflows/production-us-east-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-east-2.yml b/.github/workflows/production-us-east-2.yml index 8fbf91b0..78432750 100644 --- a/.github/workflows/production-us-east-2.yml +++ b/.github/workflows/production-us-east-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-west-1.yml b/.github/workflows/production-us-west-1.yml index f9e974ee..c83352d7 100644 --- a/.github/workflows/production-us-west-1.yml +++ b/.github/workflows/production-us-west-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-west-2.yml b/.github/workflows/production-us-west-2.yml index ccc2a332..d79fefee 100644 --- a/.github/workflows/production-us-west-2.yml +++ b/.github/workflows/production-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/staging-us-west-2.yml b/.github/workflows/staging-us-west-2.yml index 9c35b731..d5bc38f1 100644 --- a/.github/workflows/staging-us-west-2.yml +++ b/.github/workflows/staging-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/pocket-gateway/tasks/shared-envs.json b/pocket-gateway/tasks/shared-envs.json index f7d966d0..ae9083cd 100644 --- a/pocket-gateway/tasks/shared-envs.json +++ b/pocket-gateway/tasks/shared-envs.json @@ -21,7 +21,7 @@ "value": "${{ secrets.PHD_BASE_URL }}" }, { - "key": "PHD_API_KEY", + "key": "PHD_API_KEY_SERVICE_PRODUCTION", "value": "${{ secrets.PHD_API_KEY }}" }, { From 35c8bef0c0eeb52ddc2ad684b2634d00ce94f321 Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Fri, 24 Feb 2023 09:57:26 -0500 Subject: [PATCH 2/4] lint: fix lint --- .github/workflows/production-ca-central-1.yml | 1 - .github/workflows/production-eu-central-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index a6a8966c..90ffd2a1 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -92,7 +92,6 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} - - name: Deploy / ca-central-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index d91ae669..1398b7f0 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -98,4 +98,4 @@ jobs: task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }} service: gateway-prod cluster: gateway-prod - wait-for-service-stability: true \ No newline at end of file + wait-for-service-stability: true diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index d2c802c3..69fcd2b3 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -92,7 +92,6 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} - - name: Deploy / eu-south-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: From 1eac759a0ea72b649878d27a0e43e4e33755c4c7 Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Fri, 24 Feb 2023 10:29:33 -0500 Subject: [PATCH 3/4] infra: fix env name --- .github/workflows/canary-ap-northeast-2.yml | 2 +- .github/workflows/canary-ca-central-1.yml | 2 +- .github/workflows/canary-eu-central-1.yml | 2 +- .github/workflows/canary-us-west-2.yml | 2 +- .github/workflows/production-ap-east-1.yml | 2 +- .github/workflows/production-ap-northeast-1.yml | 2 +- .github/workflows/production-ap-northeast-2.yml | 2 +- .github/workflows/production-ap-south-1.yml | 2 +- .github/workflows/production-ap-southeast-1.yml | 2 +- .github/workflows/production-ap-southeast-2.yml | 2 +- .github/workflows/production-ca-central-1.yml | 3 ++- .github/workflows/production-eu-central-1.yml | 4 ++-- .github/workflows/production-eu-north-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 3 ++- .github/workflows/production-eu-west-1.yml | 2 +- .github/workflows/production-eu-west-2.yml | 2 +- .github/workflows/production-eu-west-3.yml | 2 +- .github/workflows/production-us-east-1.yml | 2 +- .github/workflows/production-us-east-2.yml | 2 +- .github/workflows/production-us-west-1.yml | 2 +- .github/workflows/production-us-west-2.yml | 2 +- .github/workflows/staging-us-west-2.yml | 2 +- pocket-gateway/tasks/shared-envs.json | 2 +- 23 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/canary-ap-northeast-2.yml b/.github/workflows/canary-ap-northeast-2.yml index c3124867..42c175e7 100644 --- a/.github/workflows/canary-ap-northeast-2.yml +++ b/.github/workflows/canary-ap-northeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-ca-central-1.yml b/.github/workflows/canary-ca-central-1.yml index 52bb0bfe..3cada593 100644 --- a/.github/workflows/canary-ca-central-1.yml +++ b/.github/workflows/canary-ca-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-eu-central-1.yml b/.github/workflows/canary-eu-central-1.yml index 41e45cd0..d4e46543 100644 --- a/.github/workflows/canary-eu-central-1.yml +++ b/.github/workflows/canary-eu-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/canary-us-west-2.yml b/.github/workflows/canary-us-west-2.yml index eebe6092..82c12c3d 100644 --- a/.github/workflows/canary-us-west-2.yml +++ b/.github/workflows/canary-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-east-1.yml b/.github/workflows/production-ap-east-1.yml index dd598b40..a20bdfd5 100644 --- a/.github/workflows/production-ap-east-1.yml +++ b/.github/workflows/production-ap-east-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-northeast-1.yml b/.github/workflows/production-ap-northeast-1.yml index c5a067d9..a0132d5c 100644 --- a/.github/workflows/production-ap-northeast-1.yml +++ b/.github/workflows/production-ap-northeast-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-northeast-2.yml b/.github/workflows/production-ap-northeast-2.yml index 147bbb0f..85e4d413 100644 --- a/.github/workflows/production-ap-northeast-2.yml +++ b/.github/workflows/production-ap-northeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-south-1.yml b/.github/workflows/production-ap-south-1.yml index 88ca13ce..c10646e8 100644 --- a/.github/workflows/production-ap-south-1.yml +++ b/.github/workflows/production-ap-south-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-southeast-1.yml b/.github/workflows/production-ap-southeast-1.yml index cff7a2e1..78617843 100644 --- a/.github/workflows/production-ap-southeast-1.yml +++ b/.github/workflows/production-ap-southeast-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ap-southeast-2.yml b/.github/workflows/production-ap-southeast-2.yml index 5778099f..918a2faa 100644 --- a/.github/workflows/production-ap-southeast-2.yml +++ b/.github/workflows/production-ap-southeast-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index 90ffd2a1..4c043640 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -92,6 +92,7 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} + - name: Deploy / ca-central-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index 1398b7f0..22402b55 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -98,4 +98,4 @@ jobs: task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }} service: gateway-prod cluster: gateway-prod - wait-for-service-stability: true + wait-for-service-stability: true \ No newline at end of file diff --git a/.github/workflows/production-eu-north-1.yml b/.github/workflows/production-eu-north-1.yml index c865471b..bbe81668 100644 --- a/.github/workflows/production-eu-north-1.yml +++ b/.github/workflows/production-eu-north-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index 69fcd2b3..41e6a2c6 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} @@ -92,6 +92,7 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} + - name: Deploy / eu-south-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-west-1.yml b/.github/workflows/production-eu-west-1.yml index b7b2d7c4..ca12a13d 100644 --- a/.github/workflows/production-eu-west-1.yml +++ b/.github/workflows/production-eu-west-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-west-2.yml b/.github/workflows/production-eu-west-2.yml index ad1afd33..9ee769bb 100644 --- a/.github/workflows/production-eu-west-2.yml +++ b/.github/workflows/production-eu-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-eu-west-3.yml b/.github/workflows/production-eu-west-3.yml index 21a60285..e34948c2 100644 --- a/.github/workflows/production-eu-west-3.yml +++ b/.github/workflows/production-eu-west-3.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-east-1.yml b/.github/workflows/production-us-east-1.yml index 0807c330..2081d25f 100644 --- a/.github/workflows/production-us-east-1.yml +++ b/.github/workflows/production-us-east-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-east-2.yml b/.github/workflows/production-us-east-2.yml index 78432750..96091cf7 100644 --- a/.github/workflows/production-us-east-2.yml +++ b/.github/workflows/production-us-east-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-west-1.yml b/.github/workflows/production-us-west-1.yml index c83352d7..cb4ee16a 100644 --- a/.github/workflows/production-us-west-1.yml +++ b/.github/workflows/production-us-west-1.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/production-us-west-2.yml b/.github/workflows/production-us-west-2.yml index d79fefee..f0c9163a 100644 --- a/.github/workflows/production-us-west-2.yml +++ b/.github/workflows/production-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/.github/workflows/staging-us-west-2.yml b/.github/workflows/staging-us-west-2.yml index d5bc38f1..e9bffe99 100644 --- a/.github/workflows/staging-us-west-2.yml +++ b/.github/workflows/staging-us-west-2.yml @@ -34,7 +34,7 @@ jobs: envkey_REDIS_LOCAL_TTL_FACTOR: ${{ secrets.REDIS_LOCAL_TTL_FACTOR }} envkey_BLOCKED_ADDRESSES_URL: ${{ secrets.BLOCKED_ADDRESSES_URL }} envkey_PHD_BASE_URL: ${{ secrets.PHD_BASE_URL }} - envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY }} + envkey_PHD_API_KEY_SERVICE_PRODUCTION: ${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }} envkey_DATABASE_ENCRYPTION_KEY: ${{ secrets.DATABASE_PRODUCTION_ENCRYPTION_KEY }} envkey_DISPATCH_URL: ${{ secrets.DISPATCH_URL }} envkey_ALTRUISTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_ALTRUISTS }} diff --git a/pocket-gateway/tasks/shared-envs.json b/pocket-gateway/tasks/shared-envs.json index ae9083cd..bec11ceb 100644 --- a/pocket-gateway/tasks/shared-envs.json +++ b/pocket-gateway/tasks/shared-envs.json @@ -22,7 +22,7 @@ }, { "key": "PHD_API_KEY_SERVICE_PRODUCTION", - "value": "${{ secrets.PHD_API_KEY }}" + "value": "${{ secrets.PHD_API_KEY_SERVICE_PRODUCTION }}" }, { "key": "DATABASE_ENCRYPTION_KEY", From 4c4098c2919b38b183ddc1b9b4fff009be561090 Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Tue, 28 Feb 2023 12:06:59 -0500 Subject: [PATCH 4/4] lint: run linter --- .github/workflows/production-ca-central-1.yml | 1 - .github/workflows/production-eu-central-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index 4c043640..f9b72956 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -92,7 +92,6 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} - - name: Deploy / ca-central-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index 22402b55..a5bd20e7 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -98,4 +98,4 @@ jobs: task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }} service: gateway-prod cluster: gateway-prod - wait-for-service-stability: true \ No newline at end of file + wait-for-service-stability: true diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index 41e6a2c6..bac71040 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -92,7 +92,6 @@ jobs: container-name: gateway image: ${{ steps.build-image.outputs.image }} - - name: Deploy / eu-south-1 uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: