From cf63f5aaeef3e2960ae2e8f0ffd6ac028139c886 Mon Sep 17 00:00:00 2001 From: lydialim Date: Tue, 28 Feb 2023 14:57:37 +0100 Subject: [PATCH 1/2] [Bug] Fix custom pipeline type not loaded It was getting the wrong property name so it always sets the default pipeline --- .../adf-build/shared/cdk/cdk_stacks/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/main.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/main.py index be2867054..1fe8135b3 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/main.py +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/main.py @@ -40,7 +40,7 @@ def __init__( pipeline_type = ( stack_input['pipeline_input'] .get('params', {}) - .get('type', DEFAULT_PIPELINE) + .get('pipeline_type', DEFAULT_PIPELINE) .lower() ) From 4be87f6ed8dc7ea2c126fc95155303fcd7c20a6a Mon Sep 17 00:00:00 2001 From: Lydia Date: Mon, 3 Apr 2023 19:03:24 +0200 Subject: [PATCH 2/2] Fix pipeline_type test cases --- .../shared/cdk/cdk_stacks/tests/test_pipeline_creation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/tests/test_pipeline_creation.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/tests/test_pipeline_creation.py index bd99b3af4..04a6a295e 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/tests/test_pipeline_creation.py +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_stacks/tests/test_pipeline_creation.py @@ -15,7 +15,7 @@ def test_pipeline_generation_fails_if_pipeline_type_is_not_specified(mock): stack_input = {"pipeline_input": {"params": {}}} stack_input["pipeline_input"]["name"] = "test-stack" - stack_input["pipeline_input"]["params"]["type"] = "fail" + stack_input["pipeline_input"]["params"]["pipeline_type"] = "fail" app = core.App() with pytest.raises(ValueError): pipeline_stack = PipelineStack(app, stack_input) @@ -35,7 +35,6 @@ def test_pipeline_generation_works_when_no_type_specified(mock): def test_pipeline_generation_works_when_no_type_specified(mock): stack_input = {"pipeline_input": {"params": {}}} stack_input["pipeline_input"]["name"] = "test-stack" - stack_input["pipeline_input"]["params"]["type"] = "Default" app = core.App() PipelineStack(app, stack_input)