Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom actions fail when action not defined in pipeline #3647

Merged
merged 8 commits into from
Aug 2, 2023
Merged

Custom actions fail when action not defined in pipeline #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e7465f
Custom actions fail in release 0.12
marrobi Aug 2, 2023
4f1bdc4
up api version
marrobi Aug 2, 2023
8106884
up api version
marrobi Aug 2, 2023
682165f
Merge branch 'marrobi/issue3646' of github.com:marrobi/AzureTRE into …
marrobi Aug 2, 2023
b959320
Make DRY
marrobi Aug 2, 2023
d2ee1af
Fix case where calling dict on empty pipeline
marrobi Aug 2, 2023
538d697
Merge branch 'main' into marrobi/issue3646
marrobi Aug 2, 2023
cb620b2
Merge branch 'marrobi/issue3646' of github.com:marrobi/AzureTRE into …
marrobi Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ FEATURES:
ENHANCEMENTS:

BUG FIXES:
* Cusotm actions fail on resources with a pipline ([#3646](https://github.com/microsoft/AzureTRE/issues/3646))

## 0.12.0 (July 27, 2023)

Expand Down
2 changes: 1 addition & 1 deletion api_app/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.15.6"
__version__ = "0.15.7"
12 changes: 9 additions & 3 deletions api_app/service_bus/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,24 @@ async def update_resource_for_step(operation_step: OperationStep, resource_repo:

parent_template = await resource_template_repo.get_template_by_name_and_version(step_resource.templateName, step_resource.templateVersion, step_resource.resourceType, step_resource_parent_service_name)

# if there are no pipelines, no need to continue with substitutions.
# if there are no pipelines, or custom action, no need to continue with substitutions.
if not parent_template.pipeline:
return step_resource

pipeline_primary_action = parent_template.pipeline.dict()[primary_action]
parent_template_pipeline_dict = parent_template.pipeline.dict()

# if action not defined as a pipeline, custom action, no need to continue with substitutions.
if primary_action not in parent_template_pipeline_dict:
return step_resource

pipeline_primary_action = parent_template_pipeline_dict[primary_action]
is_first_main_step = pipeline_primary_action and len(pipeline_primary_action) == 1 and pipeline_primary_action[0]['stepId'] == 'main'
if not pipeline_primary_action or is_first_main_step:
return step_resource

# get the template step
template_step = None
for step in parent_template.pipeline.dict()[primary_action]:
for step in parent_template_pipeline_dict[primary_action]:
if step["stepId"] == operation_step.templateStepId:
template_step = parse_obj_as(PipelineStep, step)
break
Expand Down
Loading