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

src/azure-cli/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+**Compute**
+
+* image template create: Add --customize and --distribute.
+
 **IoT Central**
 
 * Support app creation/update with the new sku name ST0, ST1, ST2.

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

@@ -7,6 +7,8 @@
 # i.e something like image_builder/_client_factory image_builder/commands.py image_builder/_params.py
 
 import re
+import json
+from json import JSONDecodeError
 from enum import Enum
 
 
@@ -374,7 +376,7 @@ def create_image_template(  # pylint: disable=too-many-locals
         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, customize=None, distribute=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,
@@ -394,29 +396,46 @@ def create_image_template(  # pylint: disable=too-many-locals
 
     # create image template customizer settings
     # Script structure can be found in _parse_script's function definition
-    for script in scripts_list:
-        script.pop("is_url")
-        script["script_uri"] = script.pop("script")
-
-        if script["type"] == ScriptType.SHELL:
-            template_scripts.append(ImageTemplateShellCustomizer(**script))
-        elif script["type"] == ScriptType.POWERSHELL:
-            template_scripts.append(ImageTemplatePowerShellCustomizer(**script))
-        else:  # Should never happen
-            logger.debug("Script %s has type %s", script["script"], script["type"])
-            raise CLIError("Script {} has an invalid type.".format(script["script"]))
+    if customize is not None:
+        if scripts_list:
+            raise CLIError('usage error: Do not use --scripts and --customize together')
+        try:
+            template_scripts = json.loads(customize)
+        except JSONDecodeError:
+            raise CLIError('usage error: JSON decode error in --customize')
+    else:
+        for script in scripts_list:
+            script.pop("is_url")
+            script["script_uri"] = script.pop("script")
+
+            if script["type"] == ScriptType.SHELL:
+                template_scripts.append(ImageTemplateShellCustomizer(**script))
+            elif script["type"] == ScriptType.POWERSHELL:
+                template_scripts.append(ImageTemplatePowerShellCustomizer(**script))
+            else:  # Should never happen
+                logger.debug("Script %s has type %s", script["script"], script["type"])
+                raise CLIError("Script {} has an invalid type.".format(script["script"]))
 
     # create image template distribution / destination settings
-    for dest_type, rid, loc_info in destinations_lists:
-        parsed = parse_resource_id(rid)
-        if dest_type == _DestType.MANAGED_IMAGE:
-            template_destinations.append(ImageTemplateManagedImageDistributor(
-                image_id=rid, location=loc_info, run_output_name=parsed['name']))
-        elif dest_type == _DestType.SHARED_IMAGE_GALLERY:
-            template_destinations.append(ImageTemplateSharedImageDistributor(
-                gallery_image_id=rid, replication_regions=loc_info, run_output_name=parsed['child_name_1']))
-        else:
-            logger.info("No applicable destination found for destination %s", str(tuple([dest_type, rid, loc_info])))
+    if distribute is not None:
+        if destinations_lists:
+            raise CLIError('usage error: Do not use (--managed-image-destinations | --shared-image-destinations) and --distribute together')
+        try:
+            template_destinations = json.loads(distribute)
+        except JSONDecodeError:
+            raise CLIError('usage error: JSON decode error in --distribute')
+
+    else:
+        for dest_type, rid, loc_info in destinations_lists:
+            parsed = parse_resource_id(rid)
+            if dest_type == _DestType.MANAGED_IMAGE:
+                template_destinations.append(ImageTemplateManagedImageDistributor(
+                    image_id=rid, location=loc_info, run_output_name=parsed['name']))
+            elif dest_type == _DestType.SHARED_IMAGE_GALLERY:
+                template_destinations.append(ImageTemplateSharedImageDistributor(
+                    gallery_image_id=rid, replication_regions=loc_info, run_output_name=parsed['child_name_1']))
+            else:
+                logger.info("No applicable destination found for destination %s", str(tuple([dest_type, rid, loc_info])))
 
     image_template = ImageTemplate(source=template_source, customize=template_scripts, distribute=template_destinations,
                                    location=location, build_timeout_in_minutes=build_timeout, tags=(tags or {}))

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

@@ -195,11 +195,13 @@ def load_arguments(self, _):
         c.argument('', arg_type=ib_source_type)
 
         # Image Customizer Arguments
+        c.argument('customize', arg_type=ib_customizer_type, help='Specify the properties used to describe the customization steps of the image. JSON format. Do not use it together with --scripts. Examples: https://github.com/danielsollondon/azvmimagebuilder/tree/master/quickquickstarts')
         c.argument('scripts', arg_type=ib_customizer_type)
         c.argument('', arg_type=ib_customizer_type)
         c.argument('', arg_type=ib_customizer_type)
 
         # Image Output Arguments
+        c.argument('distribute', arg_type=ib_cutput_type, help='The distribution targets where the image output needs to go to. JSON format. Do not use it together with other arguments in Ouput Arguments.')
         c.argument('managed_image_destinations', arg_type=ib_cutput_type)
         c.argument('shared_image_destinations', arg_type=ib_cutput_type)
         c.argument('output_name', arg_type=ib_cutput_type)

src/azure-cli/azure/cli/command_modules/vm/tests/latest/cus.json

@@ -0,0 +1,39 @@
+[
+    {
+        "type": "Shell",
+        "name": "RunScriptFromSource",
+        "scriptUri": "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript.sh"
+    },
+
+    {
+        "type": "Shell",
+        "name": "CheckSumCompareShellScript",
+        "scriptUri": "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh",
+        "sha256Checksum": "ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93"
+    },
+
+    {
+        "type": "File",
+        "name": "downloadBuildArtifacts",
+        "sourceUri": "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html",
+        "destination":"/tmp/index.html"
+    },
+
+    {
+        "type": "Shell",
+        "name": "setupBuildPath",
+        "inline": [
+            "sudo mkdir /buildArtifacts",
+            "sudo cp /tmp/index.html /buildArtifacts/index.html"
+        ]
+    },
+
+    {
+        "type": "Shell",
+        "name": "InstallUpgrades",
+        "inline": [
+            "sudo apt install unattended-upgrades"
+        ]
+    }
+
+]