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

Resource processor - Re-instate az login and az acr login commands prior to porter explain command to fix microsoft/AzureTRE#3950 #3951

Merged
merged 4 commits into from
May 30, 2024
Merged

Resource processor - Re-instate az login and az acr login commands prior to porter explain command to fix microsoft/AzureTRE#3950 #3951

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
488b238
Update commands.py
jonnyry May 24, 2024
c1d6ece
commands.py - fix linter whitespace error - W293 blank line contains …
jonnyry May 24, 2024
bdd9b5e
Update resource processor version and changelog
jonnyry May 24, 2024
d518d52
Merge branch 'microsoft:main' into jr/40-resource-processor-issue-on-…
jonnyry May 29, 2024
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 @@ -15,6 +15,7 @@ BUG FIXES:
* Remove TLS1.0/1.1 support from Application Gateway ([#3914](https://github.com/microsoft/AzureTRE/issues/3914))
* GitHub Actions version updates. ([#3847](https://github.com/microsoft/AzureTRE/issues/3847))
* Add workaround to avoid name clashes for storage accounts([#3863](https://github.com/microsoft/AzureTRE/pull/3858))
* Resource processor fails to deploy first workspace on fresh TRE deployment ([#3950](https://github.com/microsoft/AzureTRE/issues/3950))
* Dependency and Vulnerability updates

COMPONENTS:
Expand Down
2 changes: 1 addition & 1 deletion resource_processor/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.8.5"
__version__ = "0.8.6"
4 changes: 3 additions & 1 deletion resource_processor/resources/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ async def build_porter_command_for_outputs(msg_body):


async def get_porter_parameter_keys(config, msg_body):
command = [f"porter explain --reference {config['registry_server']}/{msg_body['name']}:v{msg_body['version']} --output json"]
command = [f"{azure_login_command(config)} && \
{azure_acr_login_command(config)} && \
porter explain --reference {config['registry_server']}/{msg_body['name']}:v{msg_body['version']} --output json"]

proc = await asyncio.create_subprocess_shell(
''.join(command),
Expand Down
Loading