Merge pull request #21 from Concordium/lma/SRE-1048/rename-roles-on-a…

…ws-and-gcp-for-image-release removed double quotes
Concordium · Dec 18, 2024 · bb5b7be · bb5b7be
2 parents fc71f10 + 5751540
commit bb5b7be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/shared-variables/.env b/.github/shared-variables/.env
@@ -3,4 +3,5 @@ OBSERVABILITY_AWS_REGION=eu-west-1
 ENVIRONMENT_TO_AWS_REGION={"stagenet":"eu-west-1", "testnet":"eu-central-1", "mainnet":"eu-central-1", "flynet":"eu-west-1"}
 REGION_TO_SUBNET={"eu-west-1": "subnet-0420e07bd378fc8ef", "eu-central-1": "subnet-018c28ad04a57702e"}
 PROJECT_NAME=ConcordiumNode
-AWS_ROLE_ARN="arn:aws:iam::192549843005:role/github-infra-images-packer"
+AWS_ROLE_ARN=arn:aws:iam::192549843005:role/github-infra-images-packer
+GCP_SERVICE_ACCOUNT=github-infra-images-packer@concordium-mgmt-0.iam.gserviceaccount.com
diff --git a/.github/workflows/release-node-images.yaml b/.github/workflows/release-node-images.yaml
@@ -121,7 +121,7 @@ jobs:
         with:
           project_id: concordium-mgmt-0
           workload_identity_provider: projects/761241104197/locations/global/workloadIdentityPools/github/providers/concordium
-          service_account: github-infra-images-packer@concordium-mgmt-0.iam.gserviceaccount.com
+          service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
       - name: Setup AWS REGION
         run: |
           VALUE=$(echo '${{ env.ENVIRONMENT_TO_AWS_REGION }}' | jq -r --arg key "${{ matrix.env }}" '.[$key]')
@@ -269,7 +269,7 @@ jobs:
         with:
           project_id: concordium-mgmt-0
           workload_identity_provider: projects/761241104197/locations/global/workloadIdentityPools/github/providers/concordium
-          service_account: github-infra-images-packer@concordium-mgmt-0.iam.gserviceaccount.com
+          service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

diff --git a/.github/workflows/release-observability-images.yaml b/.github/workflows/release-observability-images.yaml
@@ -62,7 +62,7 @@ jobs:
         with:
           project_id: concordium-mgmt-0
           workload_identity_provider: projects/761241104197/locations/global/workloadIdentityPools/github/providers/concordium
-          service_account: github-infra-images-packer@concordium-mgmt-0.iam.gserviceaccount.com
+          service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
 
       - name: Configure AWS Credentials
         if: matrix.cloud_provider == 'aws'