Skip to content

[ARM] az ts : Add UiFormDefinition file support to TemplateSpecs for GA (05/04) #17869

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 35 commits into from
May 21, 2021
Merged

[ARM] az ts : Add UiFormDefinition file support to TemplateSpecs for GA (05/04) #17869

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0684cb1
Initial draft for formUiDefinition
TSunny007 Apr 3, 2021
f1bde75
Merge branch 'tsunkaraneni/formUiDefinition' of https://github.com/Ta…
Apr 26, 2021
7041975
Tested with generated SDK from https://github.com/Azure/sdk-release-r…
Apr 26, 2021
2987bbc
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
Apr 27, 2021
0e2af1c
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
Apr 27, 2021
1505239
TemplateSpecsVersion parameters artifacts and template have been repl…
Apr 27, 2021
b5f50da
Restored new lined at end of launch.json file
Apr 27, 2021
86ae0e9
reverting changes to setup.py until sdk release
Apr 27, 2021
27ec365
TemplateSpecs regression addressed https://github.com/Azure/azure-cli…
Apr 27, 2021
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
9ee036b
Re-recorded template specs tests live
Apr 27, 2021
558976e
Merge branch 'daetienn/TemplateSpecsBug' of https://github.com/detien…
Apr 27, 2021
3ee714d
Fixed CLI Style
Apr 27, 2021
34ec85e
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
Apr 27, 2021
f6889ee
Merged with dev
May 12, 2021
5c5fd4b
Merged with dev
May 13, 2021
383f31f
Merged with dev
May 13, 2021
6c8964c
Removed merge conflicts
May 13, 2021
825026b
Removed merge conflicts
May 13, 2021
94b7fe4
Restored new line for launch.json
May 13, 2021
86a3a6c
Restored new lines at end of files
May 13, 2021
8a28879
Bump template specs SDK to latest release
May 13, 2021
99e0b69
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
May 19, 2021
f8a211f
Tested with new SDK
May 19, 2021
5dad915
Deployments Tests with new SDK
May 19, 2021
16c5923
SDK Bump to 18.0.0
May 19, 2021
5d91751
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
May 19, 2021
80f06a9
Tracking Linux requirements
May 19, 2021
4c0617b
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
May 20, 2021
e2123a3
Merged with dev and added changes from https://github.com/Azure/azure…
May 20, 2021
9157323
Merge branch 'dev' of https://github.com/Azure/azure-cli into daetien…
May 20, 2021
5f1a9e3
Rerecord test_nw_connection_monitor_v2_creation
May 20, 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
Prev Previous commit
Next Next commit
Merged with dev
  • Loading branch information
Dania Etienne committed May 12, 2021
commit f6889ee93114d27329d0bc590743b06535145cbf
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/profiles/_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def default_api_version(self):
ResourceType.MGMT_RESOURCE_RESOURCES: '2020-10-01',
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2019-11-01',
ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2020-10-01',
ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2021-03-01-preview',
ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2021-05-01',
ResourceType.MGMT_NETWORK_DNS: '2018-05-01',
ResourceType.MGMT_KEYVAULT: '2021-04-01-preview',
ResourceType.MGMT_AUTHORIZATION: SDKProfile('2020-04-01-preview', {
Expand Down
10 changes: 5 additions & 5 deletions 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,11 +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")
resource = show_resource(cmd=cmd, resource_ids=[template_spec])
try:
template_obj = resource.properties['mainTemplate']
except Exception: # pylint: disable=broad-except
template_obj = resource.properties['template']
# The api-version for ResourceType.MGMT_RESOURCE_RESOURCES may get updated and point to another (newer) version of the api version for
# ResourceType.MGMT_RESOURCE_TEMPLATESPECS than our designated version. This ensures the api-version of all the rest requests for
# template_spec are consistent in the same profile:
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']
else:
template_content = (
run_bicep_command(["build", "--stdout", template_file])
Expand Down
367 changes: 367 additions & 0 deletions ...i/command_modules/resource/tests/latest/recordings/test_resource_group_deployment_ts.yaml
View file
Open in desktop

Large diffs are not rendered by default.

448 changes: 122 additions & 326 deletions ...ommand_modules/resource/tests/latest/recordings/test_resource_group_level_what_if_ts.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,487 changes: 50 additions & 1,437 deletions ...mmand_modules/resource/tests/latest/recordings/test_subscription_level_deployment_ts.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ azure-mgmt-redhatopenshift==0.1.0
azure-mgmt-redis==7.0.0rc1
azure-mgmt-relay==0.1.0
azure-mgmt-reservations==0.6.0
azure-mgmt-resource==12.1.0
azure-mgmt-resource==16.1.0
azure-mgmt-search==8.0.0
azure-mgmt-security==0.6.0
azure-mgmt-servicebus==0.6.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ azure-mgmt-redhatopenshift==0.1.0
azure-mgmt-redis==7.0.0rc1
azure-mgmt-relay==0.1.0
azure-mgmt-reservations==0.6.0
azure-mgmt-resource==12.1.0
azure-mgmt-resource==16.1.0
azure-mgmt-search==8.0.0
azure-mgmt-security==0.6.0
azure-mgmt-servicebus==0.6.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ azure-mgmt-redhatopenshift==0.1.0
azure-mgmt-redis==7.0.0rc1
azure-mgmt-relay==0.1.0
azure-mgmt-reservations==0.6.0
azure-mgmt-resource==12.1.0
azure-mgmt-resource==16.1.0
azure-mgmt-search==8.0.0
azure-mgmt-security==0.6.0
azure-mgmt-servicebus==0.6.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
'azure-mgmt-relay~=0.1.0',
'azure-mgmt-reservations==0.6.0', # TODO: Use requirements.txt instead of '==' #9781
# 'azure-mgmt-reservations~=0.6.0',
'azure-mgmt-resource==12.1.0',
'azure-mgmt-resource==16.1.0',
'azure-mgmt-search~=8.0',
'azure-mgmt-security~=0.6.0',
'azure-mgmt-servicebus~=0.6.0',
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.