From 4ebf49bfeb26246b35e6596b49417b9052a8c66b Mon Sep 17 00:00:00 2001 From: Alex Evans Date: Wed, 17 Apr 2024 15:02:36 +0200 Subject: [PATCH] fix: remove dangerous default ADF_ORG_STAGE and dont update config for ADF Org Specific config if Param not set (#717) --- .../adf-build/shared/generate_params.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/generate_params.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/generate_params.py index 106f7b25..b0ac5e22 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/generate_params.py +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/generate_params.py @@ -118,7 +118,7 @@ class PipelineDefinition(TypedDict): DEPLOYMENT_ACCOUNT_REGION = os.environ["AWS_REGION"] PROJECT_NAME = os.environ["ADF_PROJECT_NAME"] EMPTY_PARAMS_DICT: ParametersAndTags = {'Parameters': {}, 'Tags': {}} -ADF_ORG_STAGE = os.getenv("ADF_ORG_STAGE", "dev") +ADF_ORG_STAGE = os.getenv("ADF_ORG_STAGE") class Parameters: @@ -302,13 +302,14 @@ def create_parameter_files(self) -> None: current_params ) # Compare account_region final to global_stage - current_params = self._merge_params( - Parameters._parse( - params_root_path=self.cwd, - params_filename=f"global_{ADF_ORG_STAGE}", - ), - current_params, - ) + if ADF_ORG_STAGE: + current_params = self._merge_params( + Parameters._parse( + params_root_path=self.cwd, + params_filename=f"global_{ADF_ORG_STAGE}", + ), + current_params, + ) # Compare account_region final to global current_params = self._merge_params( Parameters._parse(