copying over 2024-02-01 changes from ADO

Azure · Apr 29, 2024 · aa54d74 · aa54d74
1 parent b9829c1
commit aa54d74
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 24 deletions.
diff --git a/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CancelImageBuild.json b/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CancelImageBuild.json
@@ -15,4 +15,3 @@
     }
   }
 }
-
diff --git a/...r/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateImageTemplateLinux.json b/...r/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateImageTemplateLinux.json
@@ -145,4 +145,3 @@
     }
   }
 }
-
diff --git a/...Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateImageTemplateWindows.json b/...Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateImageTemplateWindows.json
@@ -370,4 +370,3 @@
     }
   }
 }
-
diff --git a/...r/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateSourceImageTrigger.json b/...r/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/CreateSourceImageTrigger.json
@@ -22,7 +22,7 @@
           "status": {
             "code": "Healthy",
             "message": "",
-            "time": "2023-07-21T17:32:28Z"
+            "time": "2024-02-21T17:32:28Z"
           },
           "provisioningState": "Succeeded"
         }
@@ -38,12 +38,11 @@
           "status": {
             "code": "Healthy",
             "message": "",
-            "time": "2023-07-21T17:32:28Z"
+            "time": "2024-02-21T17:32:28Z"
           },
           "provisioningState": "Succeeded"
         }
       }
     }
   }
 }
-
diff --git a/...anager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/DeleteImageTemplate.json b/...anager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/DeleteImageTemplate.json
@@ -14,4 +14,3 @@
     "204": {}
   }
 }
-
diff --git a/...urce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/DeleteTrigger.json b/...urce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/DeleteTrigger.json
@@ -15,4 +15,3 @@
     "204": {}
   }
 }
-
diff --git a/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetImageTemplate.json b/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetImageTemplate.json
@@ -53,4 +53,3 @@
     }
   }
 }
-
diff --git a/...ource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetRunOutput.json b/...ource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetRunOutput.json
@@ -20,4 +20,3 @@
     }
   }
 }
-
diff --git a/...esource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetTrigger.json b/...esource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/GetTrigger.json
@@ -16,7 +16,7 @@
           "status": {
             "code": "Healthy",
             "message": "",
-            "time": "2023-07-21T17:32:28Z"
+            "time": "2024-02-21T17:32:28Z"
           },
           "provisioningState": "Succeeded"
         },
@@ -25,4 +25,3 @@
     }
   }
 }
-
diff --git a/...manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListImageTemplates.json b/...manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListImageTemplates.json
@@ -107,4 +107,3 @@
     }
   }
 }
-
diff --git a/...ger/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListImageTemplatesByRg.json b/...ger/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListImageTemplatesByRg.json
@@ -116,4 +116,3 @@
     }
   }
 }
-
diff --git a/...rce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListRunOutputs.json b/...rce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListRunOutputs.json
@@ -33,4 +33,3 @@
     }
   }
 }
-
diff --git a/...ource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListTriggers.json b/...ource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/ListTriggers.json
@@ -17,7 +17,7 @@
               "status": {
                 "code": "Healthy",
                 "message": "",
-                "time": "2023-07-21T17:32:28Z"
+                "time": "2024-02-21T17:32:28Z"
               },
               "provisioningState": "Succeeded"
             },
@@ -29,4 +29,3 @@
     }
   }
 }
-
diff --git a/...rce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/OperationsList.json b/...rce-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/OperationsList.json
@@ -139,4 +139,3 @@
     }
   }
 }
-
diff --git a/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/RunImageTemplate.json b/...e-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/RunImageTemplate.json
@@ -15,4 +15,3 @@
     "200": {}
   }
 }
-
diff --git a/...er/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateTags.json b/...er/Microsoft.VirtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateTags.json
@@ -66,4 +66,3 @@
     }
   }
 }
-
diff --git a/...irtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateToRemoveIdentities.json b/...irtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateToRemoveIdentities.json
@@ -60,4 +60,3 @@
     }
   }
 }
-
diff --git a/...crosoft.VirtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateVmProfile.json b/...crosoft.VirtualMachineImages/stable/2024-02-01/examples/UpdateImageTemplateVmProfile.json
@@ -0,0 +1,73 @@
+{
+  "parameters": {
+    "subscriptionId": "{subscription-id}",
+    "resourceGroupName": "myResourceGroup",
+    "imageTemplateName": "myImageTemplate",
+    "api-version": "2024-02-01",
+    "parameters": {
+      "properties": {
+        "vmProfile": {
+          "osDiskSizeGB": 127,
+          "vmSize": "{updated_vmsize}",
+          "vnetConfig": {
+            "containerInstanceSubnetId": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/subnetname",
+            "subnetId": "{updated_aci_subnet}"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate",
+        "name": "myImageTemplate",
+        "location": "westus",
+        "type": "Microsoft.VirtualMachineImages/imageTemplates",
+        "identity": {
+          "type": "None"
+        },
+        "tags": {
+          "tag": "tag-value"
+        },
+        "properties": {
+          "source": {
+            "type": "ManagedImage",
+            "imageId": "/subscriptions/{subscription-id}/resourceGroups/source_rg/providers/Microsoft.Compute/images/source_image"
+          },
+          "customize": [
+            {
+              "type": "Shell",
+              "name": "Shell customization example",
+              "scriptUri": "https://example.com/path/to/script.sh"
+            }
+          ],
+          "distribute": [
+            {
+              "type": "ManagedImage",
+              "location": "1_location",
+              "runOutputName": "image_it_pir_1",
+              "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1",
+              "artifactTags": {
+                "tagName": "value"
+              }
+            }
+          ],
+          "vmProfile": {
+            "osDiskSizeGB": 127,
+            "vmSize": "{updated_vmsize}",
+            "vnetConfig": {
+              "containerInstanceSubnetId": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/subnetname",
+              "subnetId": "{updated_aci_subnet}}"
+            }
+          }
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2024-02-01"
+      }
+    }
+  }
+}
diff --git a/...ilder/resource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/imagebuilder.json b/...ilder/resource-manager/Microsoft.VirtualMachineImages/stable/2024-02-01/imagebuilder.json
@@ -1324,12 +1324,16 @@
       "properties": {
         "subnetId": {
           "type": "string",
-          "description": "Resource id of a pre-existing subnet."
+          "description": "Resource id of a pre-existing subnet on which the build VM and validation VM will be deployed"
+        },
+        "containerInstanceSubnetId": {
+          "type": "string",
+          "description": "Resource id of a pre-existing subnet on which Azure Container Instance will be deployed for Isolated Builds. This field may be specified only if `subnetId` is also specified and must be on the same Virtual Network as the subnet specified in `subnetId`."
         },
         "proxyVmSize": {
           "type": "string",
           "default": "",
-          "description": "Size of the proxy virtual machine used to pass traffic to the build VM and validation VM. Omit or specify empty string to use the default (Standard_A1_v2)."
+          "description": "Size of the proxy virtual machine used to pass traffic to the build VM and validation VM. This must not be specified if `containerInstanceSubnetId` is specified because no proxy virtual machine is deployed in that case. Omit or specify empty string to use the default (Standard_A1_v2)."
         }
       }
     },
@@ -1490,6 +1494,36 @@
         }
       }
     },
+    "ImageTemplateAutoRun": {
+      "type": "object",
+      "description": "Indicates if the image template needs to be built on create/update",
+      "properties": {
+        "state": {
+          "type": "string",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "AutoRunState",
+            "modelAsString": false,
+            "values": [
+              {
+                "value": "Enabled",
+                "description": "Autorun is enabled",
+                "name": "AutoRunEnabled"
+              },
+              {
+                "value": "Disabled",
+                "description": "Autorun is disabled",
+                "name": "AutoRunDisabled"
+              }
+            ]
+          },
+          "description": "Enabling this field will trigger an automatic build on image template creation or update."
+        }
+      }
+    },
     "ImageTemplateProperties": {
       "type": "object",
       "description": "Describes the properties of an image template",
@@ -1613,6 +1647,22 @@
           "type": "string",
           "description": "The staging resource group id in the same subscription as the image template that will be used to build the image. This read-only field differs from 'stagingResourceGroup' only if the value specified in the 'stagingResourceGroup' field is empty.",
           "readOnly": true
+        },
+        "autoRun": {
+          "$ref": "#/definitions/ImageTemplateAutoRun",
+          "description": "Indicates whether or not to automatically run the image template build on template creation or update."
+        },
+        "managedResourceTags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-ms-mutability": [
+            "read",
+            "create",
+            "update"
+          ],
+          "description": "Tags that will be applied to the resource group and/or resources created by the service."
         }
       },
       "required": [
@@ -1732,6 +1782,10 @@
               },
               "x-ms-identifiers": [],
               "description": "The distribution targets where the image output needs to go to."
+            },
+            "vmProfile": {
+              "$ref": "#/definitions/ImageTemplateVmProfile",
+              "description": "Describes how virtual machine is set up to build images"
             }
           }
         }
@@ -2036,4 +2090,3 @@
     }
   }
 }
-