changed validator logic, added tests for template-specs list, changed…

… get template-specs to show template-specs, updated help commands, removed tag commands

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

@@ -2183,7 +2183,7 @@
 
 helps['template-specs create'] = """
 type: command
-short-summary: Create or update a template spec and or template spec version.
+short-summary: Create a template spec and or template spec version.
 parameters:
   - name: --resource-group -g
     type: string
@@ -2198,30 +2198,64 @@
     type: template_spec
     short-summary: The path to the template file.
   - name: --location -l
-    short-summary: The location to store the template-spec.
+    short-summary: The location to store the template-spec and template-spec version(s). Cannot be changed after creation.
   - 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
+  - name : --version-description
     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"
+    text: az template-specs create -g testRG --name TemplateSpecName -l WestUS --display-name "MyDisplayName" --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"
+    text: az template-specs create -g testRG --name TemplateSpecName -v 2.0 -l WestUS --template-file templateSpec.json --version-description "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
+    text: az template-specs create -g testRG --name TemplateSpecName -v 1.0 -l WestUS --template-file templateSpec.json --display-name "MyDisplayName" --description "Simple template spec" --version-description "Version of simple template spec"
 """
 
-helps['template-specs get'] = """
+helps['template-specs update'] = """
+type: command
+short-summary: Update a 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-spec -s
+    short-summary: The template spec resource ID.
+  - name: --template-file -f
+    type: template_spec
+    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 parent template spec.
+  - name : --version-description
+    type: string
+    short-summary: The description of template spec version.
+examples:
+  - name: Update the template content of a template spec or template spec version based on the resource ID.
+    text: az template-specs update --template-spec resourceID -f updatedFile.json
+  - name: Update the display name of a template spec based on the resource ID.
+    text: az template-specs update --template-spec resourceID --display-name "NewParentDisplayName"
+  - name: Update the description of a template spec version.
+    text: az template-specs update -g ExistingRG --name ExistingName -v 3.0 --version-description "New description"
+  - name: Update all the properties of a template spec version.
+    text: az template-specs update -g ExistingRG --name ExistingName -v 3.0 -f updatedTemplate.json --display-name "New parent display name" --description "New parent description" --version-description "New child description"
+"""
+
+helps['template-specs show'] = """
 type: command
 short-summary: Get the specified template spec or template spec version.
 parameters:
@@ -2237,12 +2271,12 @@
   - name: --template-spec -s
     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
+  - name: Show the specified template spec.
+    text: az template-specs show -g testrg --name TemplateSpecName
+  - name: Show the specified template spec version.
+    text: az template-specs show -g testrg --name TemplateSpecName --version VersionName
+  - name: Show the specified template spec or template spec version based on the resource ID.
+    text: az template-specs show --template-spec resourceID
 """
 
 helps['template-specs export'] = """
@@ -2298,16 +2332,21 @@
 
 helps['template-specs list'] = """
 type: command
-short-summary: List all the template specs within the specified subscription or resource group.
+short-summary: List template specs or template spec versions.
 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.
 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
+  - name: List all versions of parent template spec.
+    text: az template-specs list -g MyResourceGroup -n TemplateSpecName
 """

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

@@ -60,7 +60,7 @@ def _pack_artifacts(cmd, template_abs_file_path, context):
                                                                           includeNested=True)
 
         for template_link_obj in template_link_to_artifact_objs:
-            relative_path = str(template_link_obj['relative_path'])
+            relative_path = str(template_link_obj['relativePath'])
             if not relative_path:
                 continue
             # This is a templateLink to a local template... Get the absolute path of the
@@ -102,11 +102,11 @@ def _pack_artifacts(cmd, template_abs_file_path, context):
         context.CurrentDirectory = original_directory
 
 
-def _get_deployment_resource_objects(cmd, templateObj, includeNested=False):
+def _get_deployment_resource_objects(cmd, template_obj, includeNested=False):
     immediate_deployment_resources = []
 
-    if 'resources' in templateObj:
-        resources = templateObj['resources']
+    if 'resources' in template_obj:
+        resources = template_obj['resources']
         for resource in resources:
             if (str(resource['type']) == 'Microsoft.Resources/deployments') is True:
                 immediate_deployment_resources.append(resource)
@@ -122,16 +122,16 @@ def _get_deployment_resource_objects(cmd, templateObj, includeNested=False):
     return results
 
 
-def _get_template_links_to_artifacts(cmd, templateObj, includeNested=False):
-    deployment_resource_objs = _get_deployment_resource_objects(cmd, templateObj, includeNested)
+def _get_template_links_to_artifacts(cmd, template_obj, includeNested=False):
+    deployment_resource_objs = _get_deployment_resource_objects(cmd, template_obj, includeNested)
     template_link_objs = []
     # TODO: Verify JSON Objects
     for obj in deployment_resource_objs:
         if 'properties' in obj:
             props_obj = obj['properties']
             if 'templateLink' in props_obj:
                 template_link_obj = props_obj['templateLink']
-                if 'relative_path' in template_link_obj:
+                if 'relativePath' in template_link_obj:
                     template_link_objs.append(template_link_obj)
     return template_link_objs
 

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

@@ -524,15 +524,21 @@ def load_arguments(self, _):
         c.argument('location', options_list=['--location', '-l'])
         c.argument('display_name', options_list=['--display-name', '-d'])
         c.argument('description', options_list=['--description'])
-        c.argument('vdescription', options_list=['--vdescription'])
-        c.argument('tags')
+        c.argument('version_description', options_list=['--version-description'])
 
-    with self.argument_context('template-specs get') as c:
-        c.argument('template_spec', options_list=['--template-spec', '-s'])
+    with self.argument_context('template-specs update') as c:
+        c.argument('template_spec', options_list=['--template-spec', '-s'], is_preview=True, min_api='2019-06-01')
+        c.argument('template_file', options_list=['--template-file', '-f'])
+        c.argument('display_name', options_list=['--display-name', '-d'])
+        c.argument('description', options_list=['--description'])
+        c.argument('version_description', options_list=['--version-description'])
+
+    with self.argument_context('template-specs show') as c:
+        c.argument('template_spec', options_list=['--template-spec', '-s'], is_preview=True, min_api='2019-06-01')
 
     with self.argument_context('template-specs export') as c:
         c.argument('output_folder', options_list=['--output-folder'])
-        c.argument('template_spec', options_list=['--template-spec', '-s'])
+        c.argument('template_spec', options_list=['--template-spec', '-s'], is_preview=True, min_api='2019-06-01')
 
     with self.argument_context('template-specs delete') as c:
-        c.argument('template_spec', options_list=['--template-spec', '-s'])
+        c.argument('template_spec', options_list=['--template-spec', '-s'], is_preview=True, min_api='2019-06-01')

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

@@ -27,7 +27,7 @@ def _validate_template_spec(namespace):
             raise CLIError('incorrect usage: Please enter '
                            'a resource group and resource name or a resource ID for --template-spec')
     else:
-        from msrestazure.tools import is_valid_resource_id
+        from azure.mgmt.core.tools import is_valid_resource_id
         if not is_valid_resource_id(namespace.template_spec):
             raise CLIError('--template-spec is not a valid resource ID.')
 
@@ -47,7 +47,7 @@ def _validate_deployment_name_with_template_specs(namespace):
         if namespace.template_uri and urlparse(namespace.template_uri).scheme:
             template_filename = urlsplit(namespace.template_uri).path
         if namespace.template_spec:
-            from msrestazure.tools import parse_resource_id, is_valid_resource_id
+            from azure.mgmt.core.tools import parse_resource_id, is_valid_resource_id
             if not is_valid_resource_id(namespace.template_spec):
                 raise CLIError('--template-spec is not a valid resource ID.')
             template_filename = parse_resource_id(namespace.template_spec).get('resource_name')
@@ -74,7 +74,7 @@ def _validate_deployment_name(namespace):
 
 
 def process_deployment_create_namespace(namespace):
-    if bool(namespace.template_uri) == bool(namespace.template_file) == bool(namespace.template_spec):
+    if [bool(namespace.template_uri), bool(namespace.template_file), bool(namespace.template_spec)].count(True) != 1:
         raise CLIError('incorrect usage: Chose only one of'
                        ' --template-file FILE | --template-uri URI | --template-spec ID to pass in')
     if(bool(namespace.template_uri) or bool(namespace.template_file)):

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

@@ -298,9 +298,10 @@ def load_command_table(self, _):
         g.custom_command('delete', 'delete_deployment_script', confirmation=True)
 
     with self.command_group('template-specs', resource_templatespecs_sdk, resource_type=ResourceType.MGMT_RESOURCE_TEMPLATESPECS, is_preview=True) as g:
-        g.custom_command('create', 'create_or_update_template_spec', validator=_validate_template_input)
+        g.custom_command('create', 'create_template_spec', validator=_validate_template_input)
+        g.custom_command('update', 'update_template_spec', validator=_validate_template_input, confirmation=True)
         g.custom_command('export', 'export_template_spec', validator=_validate_template_spec_out)
-        g.custom_show_command('get', 'get_template_spec', validator=_validate_template_spec)
+        g.custom_show_command('show', 'show_template_spec', validator=_validate_template_spec)
         g.custom_command('list', 'list_template_specs')
         g.custom_command('delete', 'delete_template_spec', validator=_validate_template_spec, confirmation=True)