From 53ff0165bb3cc3f981f0f9857147d1e9f7f52c80 Mon Sep 17 00:00:00 2001 From: Mikko Kauhanen Date: Thu, 12 Dec 2024 14:08:08 +0200 Subject: [PATCH] Add UTILITY_ACCOUNT_ID env param --- .github/workflows/deploy_dev.yml | 4 ++++ aoe-infra/infra/cdk.sh | 2 +- deploy-scripts/deploy.sh | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 45b9e35e0..b69df1ea0 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -45,8 +45,12 @@ jobs: - name: Run CDK Diff if: ${{ github.event.inputs.proceedDeploy == 'false' }} run: ./deploy-scripts/04-deploy-dev.sh diff + env: + UTILITY_ACCOUNT_ID: ${{ secrets.UTILITY_ACCOUNT_ID }} - name: Run CDK Deploy if: ${{ github.event.inputs.proceedDeploy == 'true' }} run: ./deploy-scripts/04-deploy-dev.sh deploy + env: + UTILITY_ACCOUNT_ID: ${{ secrets.UTILITY_ACCOUNT_ID }} diff --git a/aoe-infra/infra/cdk.sh b/aoe-infra/infra/cdk.sh index cb508434d..80933585e 100755 --- a/aoe-infra/infra/cdk.sh +++ b/aoe-infra/infra/cdk.sh @@ -5,7 +5,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../scripts/common-f main() { use_correct_node_version npm_ci_if_package_lock_has_changed - npx cdk --context environment="$ENV" --context UTILITY_ACCOUNT_ID=637423428507 "$@" + npx cdk --context environment="$ENV" --context UTILITY_ACCOUNT_ID="$UTILITY_ACCOUNT_ID" "$@" } main "$@" diff --git a/deploy-scripts/deploy.sh b/deploy-scripts/deploy.sh index 9d3e5f36c..787cbad43 100755 --- a/deploy-scripts/deploy.sh +++ b/deploy-scripts/deploy.sh @@ -12,8 +12,6 @@ function main { use_correct_node_version end_gh_actions_group - - if [[ "$ACTION" == "diff" ]]; then start_gh_actions_group "Diff $ENV" diff @@ -23,8 +21,6 @@ function main { deploy end_gh_actions_group fi - - } function deploy {