[Compute] image builder create: add --image-template; image template: rename template to builder

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

@@ -161,12 +161,12 @@
 short-summary: List custom VM images.
 """
 
-helps['image template'] = """
+helps['image builder'] = """
 type: group
 short-summary: Manage and build image builder templates.
 """
 
-helps['image template create'] = """
+helps['image builder create'] = """
 type: command
 short-summary: Create an image builder template.
 parameters:
@@ -180,10 +180,14 @@
         scripts="https://my-script-url.net/customize_script.sh"
         imagesource="Canonical:UbuntuServer:18.04-LTS:18.04.201903060"
 
-        az image template create --image-source $imagesource -n mytemplate -g my-group \\
+        az image builder create --image-source $imagesource -n mytemplate -g my-group \\
             --scripts $scripts --managed-image-destinations image_1=westus \\
             --shared-image-destinations my_shared_gallery/linux_image_def=westus,brazilsouth
 
+  - name: Create an image builder template using an image template file.
+    text: |
+        az image builder create -g my-group -n mytemplate --image-template filename
+
   - name: >
         [Advanced] Create an image template with multiple customizers and distributors using the CLI's object cache via --defer. Supports features such as: customizer and output names, powershell exit codes, inline scripts, windows restart, file customizers, artifact tags and vhd output distributors.
     text: |
@@ -192,171 +196,171 @@
 
         # create and update template object in local cli cache. Defers put request to ARM
         # Cache object ttl set via az configure.
-        az image template create --image-source $imagesource -n mytemplate \\
+        az image builder create --image-source $imagesource -n mytemplate \\
             -g my-group --scripts $script --defer
 
         # add customizers
-        az image template customizer add -n mytemplate -g my-group  \\
+        az image builder customizer add -n mytemplate -g my-group  \\
             --customizer-name my-pwsh-script --exit-codes 0 1 --inline-script \\
             "mkdir c:\\buildActions" "echo Azure-Image-Builder-Was-Here \\
              > c:\\buildActions\\Output.txt" --type powershell --defer
 
-        az image template customizer add -n mytemplate -g my-group \\
+        az image builder customizer add -n mytemplate -g my-group \\
             --customizer-name my-file-customizer --type file \\
             --file-source "https://my-file-source.net/file.txt"  \\
             --dest-path "c:\\buildArtifacts\\file.txt" --defer
 
         # add distributors
-        az image template output add -n mytemplate -g my-group --is-vhd \\
+        az image builder output add -n mytemplate -g my-group --is-vhd \\
             --output-name my-win-image-vhd --artifact-tags "is_vhd=True" --defer
 
-        az image template output add -n mytemplate -g my-group \\
+        az image builder output add -n mytemplate -g my-group \\
             --output-name my-win-image-managed --managed-image winImage \\
             --managed-image-location eastus \\
             --artifact-tags "is_vhd=False" --defer
 
         # Stop deferring put request to ARM. Create the template from the object cache.
         # Cache object will be deleted.
-        az image template update -n mytemplate -g my-group
+        az image builder update -n mytemplate -g my-group
 """
 
-helps['image template customizer'] = """
+helps['image builder customizer'] = """
 type: group
 short-summary: Manage image builder template customizers.
 """
 
-helps['image template customizer add'] = """
+helps['image builder customizer add'] = """
 type: command
 short-summary: Add an image builder customizer to an image builder template.
 long-summary: Must be used with --defer
 examples:
   - name: Add an inline shell customizer to an image template in the cli object cache
     text: |
-        az image template customizer add -n mytemplate -g my-group \\
+        az image builder customizer add -n mytemplate -g my-group \\
             --inline-script "sudo mkdir /buildArtifacts" \\
                             "sudo cp /tmp/index.html /buildArtifacts/index.html" \\
             --customizer-name shell-script-inline --type shell --defer
 
   - name: Add a file customizer to an image template in the cli object cache
     text: |
-        az image template customizer add -n mytemplate -g my-group \\
+        az image builder customizer add -n mytemplate -g my-group \\
             --customizer-name my-file --type file \\
             --file-source "https://my-remote-file.html" --dest-path "/tmp/index.html" --defer
 
   - name: Add a windows restart customizer to an image template in the cli object cache
     text: |
-        az image template customizer add -n mytemplate -g my-group \\
+        az image builder customizer add -n mytemplate -g my-group \\
         --customizer-name shell-script-url \\
         --restart-check-command "echo Azure-Image-Builder-Restarted-the-VM  > \\
                                 c:\\buildArtifacts\\restart.txt" \\
             --type windows-restart --restart-timeout 10m --defer
 
 """
 
-helps['image template customizer clear'] = """
+helps['image builder customizer clear'] = """
 type: command
 short-summary: Remove all image builder customizers from an image builder template.
 long-summary: Must be used with --defer
 """
 
-helps['image template customizer remove'] = """
+helps['image builder customizer remove'] = """
 type: command
 short-summary: Remove an image builder customizer from an image builder template.
 long-summary: Must be used with --defer
 """
 
-helps['image template delete'] = """
+helps['image builder delete'] = """
 type: command
 short-summary: Delete image builder template.
 """
 
-helps['image template list'] = """
+helps['image builder list'] = """
 type: command
 short-summary: List image builder templates.
 """
 
-helps['image template output'] = """
+helps['image builder output'] = """
 type: group
 short-summary: Manage image builder template output distributors.
 long-summary: >
     A customized image can be distributed as a managed image,
     a shared image in a shared image gallery (SIG), or as a VHD blob.
 """
 
-helps['image template output add'] = """
+helps['image builder output add'] = """
 type: command
 short-summary: Add an image builder output distributor to an image builder template.
 long-summary: Must be used with --defer. The output distributor can be a managed image, a gallery image, or as a VHD blob.
 examples:
   - name: Add a managed image distributor to an image template in the cli object cache. Specify a run output name.
     text: |
-        az image template output add -n mytemplate -g my-group \\
+        az image builder output add -n mytemplate -g my-group \\
             --managed-image my_desired_image_name --output-name managed_image_run_01 --defer
 
   - name: Add a shared image gallery distributor to an image template in the cli object cache. Specify its replication regions.
     text: |
-        az image template output add -n mytemplate -g my-group --gallery-name my_shared_gallery \\
+        az image builder output add -n mytemplate -g my-group --gallery-name my_shared_gallery \\
             --gallery-replication-regions westus brazilsouth \\
             --gallery-image-definition linux_image_def --defer
 
   - name: Add a VHD distributor to an image template in the cli object cache.
     text: |
-        az image template output add -n mytemplate -g my-group \\
+        az image builder output add -n mytemplate -g my-group \\
             --output-name my_vhd_image --is-vhd  --defer
 
 """
 
-helps['image template output clear'] = """
+helps['image builder output clear'] = """
 type: command
 short-summary: Remove all image builder output distributors from an image builder template.
 long-summary: Must be used with --defer
 """
 
-helps['image template output remove'] = """
+helps['image builder output remove'] = """
 type: command
 short-summary: Remove an image builder output distributor from an image builder template.
 long-summary: Must be used with --defer
 """
 
-helps['image template run'] = """
+helps['image builder run'] = """
 type: command
 short-summary: Build an image builder template.
 examples:
   - name: Start a template build run and then wait for it to finish.
     text: |
-        az image template run -n mytemplate -g my-group --no-wait
+        az image builder run -n mytemplate -g my-group --no-wait
 
-        az image template wait -n mytemplate -g aibmdi \\
+        az image builder wait -n mytemplate -g aibmdi \\
             --custom "lastRunStatus.runState!='running'"
 
-        az image template show -n mytemplate -g my-group
+        az image builder show -n mytemplate -g my-group
 """
 
-helps['image template show'] = """
+helps['image builder show'] = """
 type: command
 short-summary: Show an image builder template.
 examples:
   - name: Show an image builder template (autogenerated)
     text: |
-        az image template show --name mytemplate  --resource-group my-group
+        az image builder show --name mytemplate  --resource-group my-group
     crafted: true
 """
 
-helps['image template show-runs'] = """
+helps['image builder show-runs'] = """
 type: command
 short-summary: Show an image builder template's run outputs.
 examples:
   - name: Run a template build run and then view its run outputs.
     text: |
-        az image template run -n mytemplate -g my-group --no-wait
+        az image builder run -n mytemplate -g my-group --no-wait
 
-        az image template wait -n mytemplate -g aibmdi \\
+        az image builder wait -n mytemplate -g aibmdi \\
             --custom "lastRunStatus.runState!='running'"
 
-        az image template show-runs -n mytemplate -g my-group
+        az image builder show-runs -n mytemplate -g my-group
 """
 
-helps['image template update'] = """
+helps['image builder update'] = """
 type: command
 short-summary: Update an image builder template.
 long-summary: >
@@ -367,33 +371,33 @@
 examples:
   - name: |
         Create a template resource from a template object in the cli cache.
-        See "az image template create / output add / customizer add --help" and "az cache -h" for more information
+        See "az image builder create / output add / customizer add --help" and "az cache -h" for more information
     text: |
         # create and write template object to local cli cache
-        az image template create --image-source {image_source} -n mytemplate -g my-group \\
+        az image builder create --image-source {image_source} -n mytemplate -g my-group \\
             --scripts {script} --managed-image-destinations image_1=westus --defer
 
         # add customizers and outputs to local cache template object via az image template output / customizer add
         # one can also update cache object properties through generic update options, such as: --set
-        az image template output add -n mytemplate -g my-group --output-name my-win-image-managed \\
+        az image builder output add -n mytemplate -g my-group --output-name my-win-image-managed \\
             --artifact-tags "is_vhd=False"  --managed-image winImage --managed-image-location eastus --defer
 
         # send template create request to azure to create template resource
-        az image template update -n mytemplate -g my-group
+        az image builder update -n mytemplate -g my-group
 """
 
-helps['image template wait'] = """
+helps['image builder wait'] = """
 type: command
 short-summary: Place the CLI in a waiting state until a condition of the template is met.
 examples:
   - name: Start a template build run and then wait for it to finish.
     text: |
-        az image template run -n mytemplate -g my-group --no-wait
+        az image builder run -n mytemplate -g my-group --no-wait
 
-        az image template wait -n mytemplate -g aibmdi \\
+        az image builder wait -n mytemplate -g aibmdi \\
             --custom "lastRunStatus.runState!='running'"
 
-        az image template show -n mytemplate -g my-group
+        az image builder show -n mytemplate -g my-group
 """
 
 helps['image update'] = """

src/azure-cli/azure/cli/command_modules/vm/_image_builder.py

@@ -5,10 +5,13 @@
 
 # TODO refactor out _image_builder commands.
 # i.e something like image_builder/_client_factory image_builder/commands.py image_builder/_params.py
-
+import os
 import re
+import json
+import traceback
 from enum import Enum
 
+import requests
 
 try:
     from urllib.parse import urlparse
@@ -152,6 +155,9 @@ def _validate_location(location, location_names, location_display_names):
 
 
 def process_image_template_create_namespace(cmd, namespace):  # pylint: disable=too-many-locals, too-many-branches, too-many-statements
+    if namespace.image_template is not None:
+        return
+
     from azure.cli.core.commands.parameters import get_subscription_locations
 
     source = None
@@ -370,16 +376,47 @@ def process_img_tmpl_output_add_namespace(cmd, namespace):
 
 # region Custom Commands
 
-def create_image_template(  # pylint: disable=too-many-locals
+def create_image_template(  # pylint: disable=too-many-locals, too-many-branches, too-many-statements
         cmd, client, resource_group_name, image_template_name, location=None,
         source_dict=None, scripts_list=None, destinations_lists=None, build_timeout=None, tags=None,
         source=None, scripts=None, checksum=None, managed_image_destinations=None,  # pylint: disable=unused-argument
-        shared_image_destinations=None, no_wait=False):  # pylint: disable=unused-argument, too-many-locals
+        shared_image_destinations=None, no_wait=False, image_template=None):  # pylint: disable=unused-argument, too-many-locals
     from azure.mgmt.imagebuilder.models import (ImageTemplate, ImageTemplateSharedImageVersionSource,
                                                 ImageTemplatePlatformImageSource, ImageTemplateIsoSource, ImageTemplateManagedImageSource,  # pylint: disable=line-too-long
                                                 ImageTemplateShellCustomizer, ImageTemplatePowerShellCustomizer,
                                                 ImageTemplateManagedImageDistributor, ImageTemplateSharedImageDistributor)  # pylint: disable=line-too-long
 
+    if image_template is not None:
+        if os.path.exists(image_template):
+            # Local file
+            with open(image_template) as f:
+                content = f.read()
+        else:
+            # It should be an URL
+            msg = '\nusage error: --image-template is not a correct local path or URL'
+            try:
+                r = requests.get(image_template)
+            except Exception:
+                raise CLIError(traceback.format_exc() + msg)
+            if r.status_code != 200:
+                raise CLIError(traceback.format_exc() + msg)
+            content = r.content
+
+        try:
+            obj = json.loads(content)
+        except json.JSONDecodeError:
+            raise CLIError(traceback.format_exc() +
+                           '\nusage error: Content of --image-template is not a valid JSON string')
+        content = {}
+        if 'properties' in obj:
+            content = obj['properties']
+        if 'location' in obj:
+            content['location'] = obj['location']
+        if 'tags' in obj:
+            content['tags'] = obj['tags']
+        return client.virtual_machine_image_templates.create_or_update(
+            parameters=content, resource_group_name=resource_group_name, image_template_name=image_template_name)
+
     template_source, template_scripts, template_destinations = None, [], []
 
     # create image template source settings