renaming account ids to aws account ids (#1678)

[review]
cds-snc · Nov 27, 2024 · 6b99553 · 6b99553
1 parent c500551
commit 6b99553
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/check_rds_cluster_update.yml b/.github/workflows/check_rds_cluster_update.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Configure AWS credentials using OIDC
       uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
       with:
-        role-to-assume: arn:aws:iam::${{ secrets.STAGING_ACCOUNT_ID }}:role/notification-terraform-apply
+        role-to-assume: arn:aws:iam::${{ secrets.STAGING_AWS_ACCOUNT_ID }}:role/notification-terraform-apply
         role-session-name: RDSClusterUpdateCheck
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
 

diff --git a/.github/workflows/merge_to_main_production.yml b/.github/workflows/merge_to_main_production.yml
@@ -14,7 +14,7 @@ defaults:
     shell: bash
 
 env:
-  ACCOUNT_ID: ${{ secrets.PRODUCTION_ACCOUNT_ID }}
+  ACCOUNT_ID: ${{ secrets.PRODUCTION_AWS_ACCOUNT_ID }}
   AWS_REGION: ca-central-1
   ENVIRONMENT: production
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PRODUCTION }}

diff --git a/.github/workflows/merge_to_main_staging.yml b/.github/workflows/merge_to_main_staging.yml
@@ -18,7 +18,7 @@ defaults:
     shell: bash
 
 env:
-  ACCOUNT_ID: ${{ secrets.STAGING_ACCOUNT_ID }}
+  ACCOUNT_ID: ${{ secrets.STAGING_AWS_ACCOUNT_ID }}
   AWS_REGION: ca-central-1
   ENVIRONMENT: staging
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_STAGING }}
@@ -40,7 +40,7 @@ jobs:
 
       - uses: ./.github/actions/setup-terraform
         with:
-          role_to_assume: arn:aws:iam::${{env.ACCOUNT_ID}}:role/notification-terraform-apply
+          role_to_assume: arn:aws:iam::${{env.STAGING_AWS_ACCOUNT_ID}}:role/notification-terraform-apply
           role_session_name: NotifyTerraformDevApply
 
       - name: Install 1Pass CLI

diff --git a/.github/workflows/terragrunt_plan_production.yml b/.github/workflows/terragrunt_plan_production.yml
@@ -13,7 +13,7 @@ permissions:
 
 env:
   ENVIRONMENT: production
-  ACCOUNT_ID: ${{ secrets.PRODUCTION_ACCOUNT_ID }}
+  ACCOUNT_ID: ${{ secrets.PRODUCTION_AWS_ACCOUNT_ID }}
   AWS_REGION: ca-central-1
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PRODUCTION }}
   WORKFLOW: true

diff --git a/.github/workflows/terragrunt_plan_staging.yml b/.github/workflows/terragrunt_plan_staging.yml
@@ -2,7 +2,7 @@ name: "Terragrunt plan STAGING"
 
 env:
   ENVIRONMENT: staging
-  ACCOUNT_ID: ${{ secrets.STAGING_ACCOUNT_ID }}
+  ACCOUNT_ID: ${{ secrets.STAGING_AWS_ACCOUNT_ID }}
   AWS_REGION: ca-central-1
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_STAGING }}
   WORKFLOW: true

diff --git a/.github/workflows/terragrunt_quicksight_production.yml b/.github/workflows/terragrunt_quicksight_production.yml
@@ -12,7 +12,7 @@ defaults:
     shell: bash
 
 env:
-  ACCOUNT_ID: ${{ secrets.PRODUCTION_ACCOUNT_ID }}
+  ACCOUNT_ID: ${{ secrets.PRODUCTION_AWS_ACCOUNT_ID }}
   AWS_REGION: ca-central-1
   ENVIRONMENT: production
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PRODUCTION }}

diff --git a/aws/github/api-secrets.tf b/aws/github/api-secrets.tf
@@ -1,6 +1,6 @@
 resource "github_actions_secret" "api_account_id" {
   repository      = data.github_repository.notification_api.name
-  secret_name     = "${upper(var.env)}_ACCOUNT_ID"
+  secret_name     = "${upper(var.env)}_AWS_ACCOUNT_ID"
   plaintext_value = var.account_id
 }
 

diff --git a/aws/github/manifest-secrets.tf b/aws/github/manifest-secrets.tf
@@ -1,6 +1,6 @@
 resource "github_actions_secret" "manifests_account_id" {
   repository      = data.github_repository.notification_manifests.name
-  secret_name     = "${upper(var.env)}_ACCOUNT_ID"
+  secret_name     = "${upper(var.env)}_AWS_ACCOUNT_ID"
   plaintext_value = var.account_id
 }
 

diff --git a/aws/github/terraform-secrets.tf b/aws/github/terraform-secrets.tf
@@ -1,6 +1,6 @@
 resource "github_actions_secret" "account_id" {
   repository      = data.github_repository.notification_terraform.name
-  secret_name     = "${upper(var.env)}_ACCOUNT_ID"
+  secret_name     = "${upper(var.env)}_AWS_ACCOUNT_ID"
   plaintext_value = var.account_id
 }