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

Fix secret saving if in first main step pipeline #3565

Merged
merged 4 commits into from
Jun 14, 2023
Merged

Fix secret saving if in first main step pipeline #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baaa06b
Fix secret saving if in first main step pipeline
SharonHart Jun 13, 2023
30d8467
Update _version.py
SharonHart Jun 14, 2023
531c8d3
Merge branch 'main' into shhart/bug/save-secret-first-main-step
SharonHart Jun 14, 2023
dcded46
Update CHANGELOG.md
SharonHart Jun 14, 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BUG FIXES:
* Azure ML connection URI is an object, not string ([#3486](https://github.com/microsoft/AzureTRE/issues/3486))
* Update key in Linux VM deploy script ([#3434](https://github.com/microsoft/AzureTRE/issues/3434))
* Add missing `azure_environment` porter parameters ([#3549](https://github.com/microsoft/AzureTRE/issues/3549))
* Fix airlock_notifier not getting the right smtp password ([#3561](https://github.com/microsoft/AzureTRE/issues/3561))
* Fix airlock_notifier not getting the right smtp password ([#3561](https://github.com/microsoft/AzureTRE/issues/3561), [#3571](https://github.com/microsoft/AzureTRE/issues/3571))

COMPONENTS:

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.2"
__version__ = "0.15.3"
6 changes: 4 additions & 2 deletions api_app/service_bus/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ 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 parent_template.pipeline is None:
if not parent_template.pipeline:
return step_resource

if parent_template.pipeline.dict()[primary_action] is None:
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
Expand Down