Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ BUG FIXES:
* Fix cost display duplication when user resource is deleted - UI incorrectly reused cost data for remaining resources ([#4783](https://github.com/microsoft/AzureTRE/issues/4783))
* Fix type mismatch error where `{{ resource.parent.my_boolean_property }}` was returning string instead of the correct type ([#4813](https://github.com/microsoft/AzureTRE/issues/4813))
* Delete npm package lock file ([#4810](https://github.com/microsoft/AzureTRE/issues/4810))
* Fix property substitution not occuring where there is only a main step in the pipeline ([#4824](https://github.com/microsoft/AzureTRE/issues/4824))
* Switch from yarn to npm ([#4837](https://github.com/microsoft/AzureTRE/issues/4837))
* Fix Mysql template ignored storage_mb ([#4846](https://github.com/microsoft/AzureTRE/issues/4846))
* Fix duplicate `TOPIC_SUBSCRIPTION_NAME` in `core/terraform/airlock/airlock_processor.tf` ([#4847](https://github.com/microsoft/AzureTRE/pull/4847))
Expand Down
2 changes: 1 addition & 1 deletion api_app/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.25.13"
__version__ = "0.25.14"
8 changes: 7 additions & 1 deletion api_app/service_bus/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,15 @@ async def update_resource_for_step(operation_step: OperationStep, resource_repo:

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:

if not pipeline_primary_action:
return step_resource

if is_first_main_step:
single_step = pipeline_primary_action[0]
if not single_step.get('properties'):
return step_resource

# get the template step
template_step = None
for step in parent_template_pipeline_dict[primary_action]:
Expand Down
Loading