Skip to content

Commit

Permalink
Merge branch 'main' into MLPAB-2540-transition
Browse files Browse the repository at this point in the history
  • Loading branch information
hawx authored Dec 3, 2024
2 parents 2abe98f + b0db6d9 commit 33efaf5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion terraform/account/.envrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source ../../scripts/switch-terraform-version.sh
export TF_CLI_ARGS_init="-backend-config=role_arn=arn:aws:iam::311462405659:role/operator -upgrade -reconfigure"
export TF_CLI_ARGS_init="-backend-config=\"assume_role={role_arn=\\\"arn:aws:iam::311462405659:role/operator\\\"}\" -upgrade -reconfigure"
export TF_WORKSPACE=development
export TF_VAR_default_role=operator
export TF_VAR_pagerduty_api_key=$(aws-vault exec mlpa-dev -- aws secretsmanager get-secret-value --secret-id "pagerduty_api_key" | jq -r .'SecretString')
2 changes: 1 addition & 1 deletion terraform/environment/.envrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

source ../../scripts/switch-terraform-version.sh
export TF_CLI_ARGS_init="-backend-config=role_arn=arn:aws:iam::311462405659:role/operator -upgrade -reconfigure"
export TF_CLI_ARGS_init="-backend-config=\"assume_role={role_arn=\\\"arn:aws:iam::311462405659:role/operator\\\"}\" -upgrade -reconfigure"
export TF_VAR_default_role=operator
export TF_VAR_pagerduty_api_key=$(aws-vault exec mlpa-dev -- aws secretsmanager get-secret-value --secret-id "pagerduty_api_key" | jq -r .'SecretString')
export TF_VAR_container_version=$(aws-vault exec management-global -- aws ssm get-parameter --name "/modernising-lpa/container-version/production" --query 'Parameter.Value' --output text)
Expand Down

0 comments on commit 33efaf5

Please sign in to comment.