diff --git a/backend/dataall/modules/datapipelines/cdk/datapipelines_cdk_pipeline.py b/backend/dataall/modules/datapipelines/cdk/datapipelines_cdk_pipeline.py index 75167db66..d5020a2a9 100644 --- a/backend/dataall/modules/datapipelines/cdk/datapipelines_cdk_pipeline.py +++ b/backend/dataall/modules/datapipelines/cdk/datapipelines_cdk_pipeline.py @@ -67,7 +67,7 @@ def __init__(self, target_uri): ) ) CDKPipelineStack.write_ddk_json_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="ddk.json", pipeline_environment=self.pipeline_environment, development_environments=self.development_environments, pipeline_name=self.pipeline.name) - CDKPipelineStack.write_ddk_app_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="app.py", pipeline=self.pipeline, development_environments=self.development_environments) + CDKPipelineStack.write_ddk_app_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="app.py", pipeline=self.pipeline, development_environments=self.development_environments, pipeline_environment=self.pipeline_environment) logger.info(f"Pipeline Repo {self.pipeline.repo} Exists...Handling Update") update_cmds = [ @@ -94,7 +94,7 @@ def __init__(self, target_uri): raise Exception except Exception as e: self.initialize_repo() - CDKPipelineStack.write_ddk_app_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="app.py", pipeline=self.pipeline, development_environments=self.development_environments) + CDKPipelineStack.write_ddk_app_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="app.py", pipeline=self.pipeline, development_environments=self.development_environments, pipeline_environment=self.pipeline_environment) CDKPipelineStack.write_ddk_json_multienvironment(path=os.path.join(self.code_dir_path, self.pipeline.repo), output_file="ddk.json", pipeline_environment=self.pipeline_environment, development_environments=self.development_environments, pipeline_name=self.pipeline.name) self.git_push_repo() @@ -157,7 +157,7 @@ def write_ddk_json_multienvironment(path, output_file, pipeline_environment, dev print(json, file=text_file) @staticmethod - def write_ddk_app_multienvironment(path, output_file, pipeline, development_environments): + def write_ddk_app_multienvironment(path, output_file, pipeline, development_environments, pipeline_environment): header = f""" # !/usr/bin/env python3 @@ -177,7 +177,7 @@ def __init__( super().__init__(scope, f"dataall-{{environment_id.title()}}", **kwargs) DataallPipelineStack(self, "{pipeline.name}-DataallPipelineStack", environment_id) -id = f"dataall-cdkpipeline-{pipeline.DataPipelineUri}" +id = f"{pipeline_environment.resourcePrefix}-cdkpipeline-{pipeline.DataPipelineUri}" cicd_pipeline = ( ddk.CICDPipelineStack( app,