diff --git a/.github/workflows/iam-promote-staging.yml b/.github/workflows/iam-promote-staging.yml index 1e7c487675..4b67d547dc 100644 --- a/.github/workflows/iam-promote-staging.yml +++ b/.github/workflows/iam-promote-staging.yml @@ -16,10 +16,10 @@ jobs: with: ref: ${{ github.event.inputs.commit }} # run tests - - name: Use Node.js 16 + - name: Use Node.js 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "yarn" - name: Install Packages run: yarn install @@ -43,7 +43,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGING }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGING }} - aws-region: us-east-1 + aws-region: us-west-2 # login to docker for AWS - name: Login to Amazon ECR @@ -75,10 +75,10 @@ jobs: cache-dependency-path: infra/package-lock.json # Update the pulumi stack with new image - run: | + cd aws npm install - cd staging - pulumi stack select -c gitcoin/dpopp/staging - pulumi config -s gitcoin/dpopp/staging set aws:region us-east-1 --non-interactive + pulumi stack select -c gitcoin/passport/staging + pulumi config -s gitcoin/passport/staging set aws:region us-west-2 --non-interactive working-directory: infra env: PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} @@ -86,14 +86,15 @@ jobs: id: pulumi with: command: up - stack-name: gitcoin/dpopp/staging + stack-name: gitcoin/passport/staging upsert: false - work-dir: infra/staging + work-dir: infra/aws env: PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_STAGING }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGING }} DOCKER_GTC_PASSPORT_IAM_IMAGE: ${{secrets.ECR_URL_STAGING}}:${{ needs.build-and-test.outputs.dockerTag }} ROUTE_53_ZONE: ${{ secrets.ROUTE53_ZONE_ID_STAGING }} - DOMAIN: ${{ secrets.DOMAIN_STAGING }} + ROUTE_53_DOMAIN: ${{ secrets.DOMAIN_STAGING }} IAM_SERVER_SSM_ARN: ${{ secrets.IAM_SERVER_SSM_ARN_STAGING }} + PASSPORT_VC_SECRETS_ARN: ${{ secrets.PASSPORT_VC_SECRETS_ARN_STAGING }} diff --git a/infra/aws/index.ts b/infra/aws/index.ts index ebaea288a1..c5289cd282 100644 --- a/infra/aws/index.ts +++ b/infra/aws/index.ts @@ -208,7 +208,8 @@ const taskDefinition = new aws.ecs.TaskDefinition(`passport-iam`, { logDriver: "awslogs", options: { "awslogs-group": "passport-iam", // "${serviceLogGroup.name}`, - "awslogs-region": `${regionId}`, + "awslogs-region": "us-west-2", // `${regionId}`, + "awslogs-create-group": "true", "awslogs-stream-prefix": "iam" } }, @@ -444,3 +445,4 @@ const serviceRecord = new aws.route53.Record("passport-record", { evaluateTargetHealth: true }] }); +