Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

renaming account ids to aws account ids #1678

Merged
merged 1 commit into from
Nov 27, 2024
Merged

renaming account ids to aws account ids #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check_rds_cluster_update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_to_main_production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge_to_main_staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terragrunt_plan_production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terragrunt_plan_staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terragrunt_quicksight_production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion aws/github/api-secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion aws/github/manifest-secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion aws/github/terraform-secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
Loading