[ARM] az ts: Add new commands for template specs ; [ARM] az deployment : Add support for --template-spec -s

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -48,6 +48,7 @@ class ResourceType(Enum):  # pylint: disable=too-few-public-methods
     MGMT_RESOURCE_RESOURCES = ('azure.mgmt.resource.resources', 'ResourceManagementClient')
     MGMT_RESOURCE_SUBSCRIPTIONS = ('azure.mgmt.resource.subscriptions', 'SubscriptionClient')
     MGMT_RESOURCE_DEPLOYMENTSCRIPTS = ('azure.mgmt.resource.deploymentscripts', 'DeploymentScriptsClient')
+    MGMT_RESOURCE_TEMPLATESPECS = ('azure.mgmt.resource.templatespecs', 'TemplateSpecsClient')
     MGMT_MONITOR = ('azure.mgmt.monitor', 'MonitorManagementClient')
     DATA_KEYVAULT = ('azure.keyvault', 'KeyVaultClient')
     MGMT_EVENTHUB = ('azure.mgmt.eventhub', 'EventHubManagementClient')
@@ -150,6 +151,7 @@ def default_api_version(self):
         ResourceType.MGMT_RESOURCE_RESOURCES: '2020-06-01',
         ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2019-11-01',
         ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2019-10-01-preview',
+        ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2019-06-01-preview',
         ResourceType.MGMT_NETWORK_DNS: '2018-05-01',
         ResourceType.MGMT_KEYVAULT: '2019-09-01',
         ResourceType.MGMT_AUTHORIZATION: SDKProfile('2018-09-01-preview', {
@@ -520,6 +522,8 @@ def get_versioned_sdk(api_profile, resource_type, *attr_args, **kwargs):
     sub_mod_prefix = kwargs.get('mod', None)
     operation_group = kwargs.get('operation_group', None)
     sdk_path = get_versioned_sdk_path(api_profile, resource_type, operation_group)
+    if str(resource_type) == "ResourceType.MGMT_RESOURCE_TEMPLATESPECS":
+        sdk_path = 'azure.mgmt.resource.templatespecs.v2019_06_preview'
     if not attr_args:
         # No attributes to load. Return the versioned sdk
         return import_module(sdk_path)

src/azure-cli/azure/cli/command_modules/resource/_client_factory.py

@@ -58,6 +58,12 @@ def _resource_managementgroups_client_factory(cli_ctx, **_):
     return get_mgmt_service_client(cli_ctx, ManagementGroupsAPI, subscription_bound=False)
 
 
+def _resource_templatespecs_client_factory(cli_ctx, **_):
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    from azure.cli.core.profiles import ResourceType
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_TEMPLATESPECS)
+
+
 def cf_resource_groups(cli_ctx, _):
     return _resource_client_factory(cli_ctx).resource_groups
 
@@ -120,3 +126,7 @@ def cf_management_groups(cli_ctx, _):
 
 def cf_management_group_subscriptions(cli_ctx, _):
     return _resource_managementgroups_client_factory(cli_ctx).management_group_subscriptions
+
+
+def cf_resource_templatespecs(cli_ctx, _):
+    return _resource_templatespecs_client_factory(cli_ctx).template_specs

src/azure-cli/azure/cli/command_modules/resource/_help.py

@@ -256,6 +256,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment metadata.
   - name: --name -n
@@ -279,6 +281,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment metadata.
   - name: --name -n
@@ -297,6 +301,9 @@
     text: >
         az deployment create --location WestUS --template-file azuredeploy.json  \\
             --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This [email protected]
+  - name: Create a deployment at subscription scope from a template-spec
+    text: >
+        az deployment create --location WestUS --template-spec resourceID
 """
 
 helps['deployment export'] = """
@@ -388,6 +395,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment metadata.
   - name: --name -n
@@ -414,6 +423,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment metadata.
   - name: --name -n
@@ -448,6 +459,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment What-If operation metadata.
   - name: --name -n
@@ -549,6 +562,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --resource-group -g
     short-summary: The resource group to create deployment at.
   - name: --name -n
@@ -577,6 +592,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --resource-group -g
     short-summary: The resource group to create deployment at.
   - name: --name -n
@@ -603,6 +620,9 @@
         az deployment group create --resource-group testrg --name rollout01 \\
             --template-file azuredeploy.json  --parameters @params.json \\
             --parameters https://mysite/params.json --parameters MyValue=This [email protected]
+  - name: Create a deployment at subscription scope from a template-spec
+    text: >
+        az deployment group create --resource-group testrg --template-spec resourceID
 """
 
 helps['deployment group what-if'] = """
@@ -618,6 +638,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --resource-group -g
     short-summary: The resource group to execute deployment What-If operation at.
   - name: --name -n
@@ -726,6 +748,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --management-group-id -m
     short-summary: The management group id to create deployment at.
   - name: --name -n
@@ -750,6 +774,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --management-group-id -m
     short-summary: The management group id to create deployment at.
   - name: --name -n
@@ -783,6 +809,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --management-group-id -m
     short-summary: The management group id to create deployment at.
   - name: --name -n
@@ -886,6 +914,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --name -n
     short-summary: The deployment name.
   - name: --location -l
@@ -908,6 +938,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --location -l
     short-summary: The location to store the deployment What-If operation metadata.
   - name: --name -n
@@ -939,6 +971,8 @@
     short-summary: The path to the template file.
   - name: --template-uri -u
     short-summary: The URI to the template file.
+  - name: --template-spec -t
+    short-summary: The template spec resource id.
   - name: --name -n
     short-summary: The deployment name.
   - name: --location -l
@@ -2141,3 +2175,139 @@
     text: >
         az tag update --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName} --operation delete --tags key1=value1
 """
+
+helps['template-specs'] = """
+type: group
+short-summary: Manage template specs at subscription or resource group scope.
+"""
+
+helps['template-specs create'] = """
+type: command
+short-summary: Create or update a template spec and or template spec version.
+parameters:
+  - name: --resource-group -g
+    type: string
+    short-summary: Name of resource group.
+  - name: --name -n
+    type: string
+    short-summary: Name of the template spec.
+  - name: --version -v
+    type: string
+    short-summary: The template spec version.
+  - name: --template-file -f
+    type: template_spec
+    short-summary: The path to the template file.
+  - name: --location -l
+    short-summary: The location to store the template-spec.
+  - name: --display-name -d
+    type: string
+    short-summary: The display name of the template spec.
+  - name : --description
+    type: string
+    short-summary: The description of the root template spec.
+  - name : --vdescription
+    type: string
+    short-summary: The description of template spec version.
+  - name: --tags
+    short-summary: Resource Tags.
+examples:
+  - name: Create a template spec.
+    text: az template-specs create -g testRG --name TemplateSpecName -l WestUS --display-name "BasicTemplate" --description "Simple template spec"
+  - name: Create a template spec version.
+    text: az template-specs create -g testRG --name TemplateSpecName -v 2.0 -l WestUS --template-file templateSpec.json --vdescription "Less simple template spec"
+  - name: Create a template spec and a version of the template spec.
+    text: az template-specs create -g testRG --name TemplateSpecName -v 1.0 -l WestUS --template-file templateSpec.json --display-name "SimpleTemplate" --description "Basic template spec" --vdescription "Version of basic template spec"
+  - name: Update an existing template spec.
+    text: az template-specs create -g testrg -n MyTemplateSpecName -l WestUS -v 1.0 -f updatedFile.json
+"""
+
+helps['template-specs get'] = """
+type: command
+short-summary: Get the specified template spec or template spec version.
+parameters:
+  - name: --resource-group -g
+    type: string
+    short-summary: Name of the resource group.
+  - name: --name -n
+    type: string
+    short-summary: Name of the template spec.
+  - name: --version -v
+    type: string
+    short-summary: The template spec version.
+  - name: --template-spec -t
+    short-summary: The template spec resource ID.
+examples:
+  - name: Get the specified template spec with all versions.
+    text: az template-specs get -g testrg --name TemplateSpecName
+  - name: Get the specified template spec version.
+    text: az template-specs get -g testrg --name TemplateSpecName --version VersionName
+  - name: Get specified template spec based on the resource ID.
+    text: az template-specs get --template-spec resourceID
+"""
+
+helps['template-specs export'] = """
+type: command
+short-summary: Export the specified template spec and artifacts (if any) to the specified output folder.
+parameters:
+  - name: --resource-group -g
+    type: string
+    short-summary: Name of resource group.
+  - name: --name -n
+    type: string
+    short-summary: Name of the template spec.
+  - name: --version -v
+    type: string
+    short-summary: The template spec version.
+  - name: --template-spec -t
+    short-summary: The template spec resource ID.
+  - name: --output-folder
+    short-summary: Existing folder to output export(s).
+examples:
+  - name: Export the specified template spec with all versions.
+    text: az template-specs export -g testrg --name TemplateSpecName --output-folder C:/path/
+  - name: Export the specified template spec.
+    text: az template-specs export -t resourceID --output-folder C:/path/
+  - name: Export the specified template spec version.
+    text: az template-specs export -g testrg --name TemplateSpecName --version VersionName --output-folder C:/path/
+"""
+
+
+helps['template-specs delete'] = """
+type: command
+short-summary: Delete a specified template spec or template spec version by name or resource ID.
+parameters:
+  - name: --resource-group -g
+    type: string
+    short-summary: Name of resource group.
+  - name: --name -n
+    type: string
+    short-summary: Name of the template spec.
+  - name: --template-spec -t
+    short-summary: The template spec resource ID.
+  - name: --version -v
+    type: string
+    short-summary: The template spec version.
+examples:
+  - name: Delete the specified template spec and all versions.
+    text: az template-specs delete -g MyResourceGroup --name TemplateSpecName
+  - name: Delete the specified version from the template spec.
+    text: az template-specs delete -g MyResourceGroup --name TemplateSpecName --version VersionName
+  - name: Delete the template spec or version based on resource ID.
+    text: az template-specs delete --template-spec resourceID
+"""
+
+helps['template-specs list'] = """
+type: command
+short-summary: List all the template specs within the specified subscription or resource group.
+parameters:
+  - name: --resource-group -g
+    type: string
+    short-summary: Name of resource group.
+examples:
+  - name: List all template specs in current default subscription.
+    text: az template-specs list
+  - name: List all template specs in specified subscription.
+    text: az template-specs list --subscription Subscription
+  - name: List all template specs in resource group.
+    text: az template-specs list -g MyResourceGroup
+"""