Skip to content

[ARM] az deployment group create: Fix the compatibility issue of api-version for parameter --template-specs #17896

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

Merged
zhoxing-ms merged 8 commits into from
Apr 28, 2021
Merged

[ARM] az deployment group create: Fix the compatibility issue of api-version for parameter --template-specs #17896

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea75cdc
Customer reported bug fix
Apr 27, 2021
2527128
Removed _packing_engine changes
Apr 27, 2021
14e274b
Re-recorded test cases with template specs
Apr 27, 2021
28f7fc1
Reviewer suggestion
Apr 27, 2021
a800ce1
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
Apr 27, 2021
989c4b5
pylint supression added for broad-except
Apr 27, 2021
38e6d93
Added explanation for changes in code and updated logic
Apr 28, 2021
73ef8c2
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
Apr 28, 2021
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
6 changes: 5 additions & 1 deletion src/azure-cli/azure/cli/command_modules/resource/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,11 @@ def _prepare_deployment_properties_unmodified(cmd, deployment_scope, template_fi
template_obj = _remove_comments_from_json(_urlretrieve(template_uri).decode('utf-8'), file_path=template_uri)
elif template_spec:
template_link = TemplateLink(id=template_spec, mode="Incremental")
template_obj = show_resource(cmd=cmd, resource_ids=[template_spec]).properties['template']
resource = show_resource(cmd=cmd, resource_ids=[template_spec])

@zhoxing-ms zhoxing-ms Apr 28, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this logic is only for template_spec, could we specify the api-version to ResourceType.MGMT_RESOURCE_TEMPLATESPECS here? Otherwise, it will use the latest version and may be inconsistent with ResourceType.MGMT_RESOURCE_TEMPLATESPECS
In this way, we can ensure that the api-versions of all the rest requests for template_spec are consistent in the same profile

@zhoxing-ms zhoxing-ms Apr 28, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such as:

from azure.cli.core.profiles import get_api_version
api_version = get_api_version(cli_ctx, ResourceType.MGMT_RESOURCE_TEMPLATESPECS)
template_obj = show_resource(cmd=cmd, resource_ids=[template_spec], api_version=api_version).properties['template']

try:
template_obj = resource.properties['mainTemplate']
except Exception: # pylint: disable=broad-except
template_obj = resource.properties['template']
else:
template_content = (
run_bicep_command(["build", "--stdout", template_file])
Expand Down
Loading