From af731c7f383726ced94b2e0da0d196bc01813146 Mon Sep 17 00:00:00 2001 From: bhaskar brahma Date: Tue, 5 Apr 2022 14:13:25 -0700 Subject: [PATCH 1/4] saving work --- ...pdateASimpleGalleryApplicationVersion.json | 24 +++++++++++++++++++ .../GetAGalleryApplicationVersion.json | 8 +++++++ .../stable/2021-10-01/gallery.json | 22 +++++++++++++++++ .../2022-03-01/ComputeRP/computeRPCommon.json | 8 +++++++ ...Machine_Create_WithApplicationProfile.json | 4 +++- ...caleSet_Create_WithApplicationProfile.json | 4 +++- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json index bcad03693de2..2fc713fb845b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json @@ -47,6 +47,14 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, + "settings":{ + "packageFileName": "package.zip", + "configFileName": "configuration.cfg" + }, + "advancedSettings": { + "timoeut": "300", + "user": "root" + }, "enableHealthCheck": false, "targetRegions": [ { @@ -80,6 +88,14 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, + "settings":{ + "packageFileName": "package.zip", + "configFileName": "configuration.cfg" + }, + "advancedSettings": { + "timoeut": "300", + "user": "root" + }, "enableHealthCheck": false, "targetRegions": [ { @@ -113,6 +129,14 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, + "settings":{ + "packageFileName": "package.zip", + "configFileName": "configuration.cfg" + }, + "advancedSettings": { + "timoeut": "300", + "user": "root" + }, "enableHealthCheck": false, "targetRegions": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json index 5c9aba68e905..56e3e64ebfd4 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json @@ -23,6 +23,14 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, + "settings":{ + "packageFileName": "package.zip", + "configFileName": "configuration.cfg" + }, + "advancedSettings": { + "timoeut": "300", + "user": "root" + }, "enableHealthCheck": false, "targetRegions": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json index 6ea8b84eaf44..04b06620c28b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json @@ -2098,6 +2098,16 @@ "manageActions": { "$ref": "#/definitions/UserArtifactManage" }, + "settings": { + "$ref": "#/definitions/UserArtifactSettings" + }, + "advancedSettings": { + "type": "object", + "additionalProperties":{ + "type": "string" + }, + "description": "Optional. Additional settings to pass to the VMApp extension. For advanced used only." + }, "enableHealthCheck": { "type": "boolean", "description": "Optional. Whether or not this application reports health." @@ -2149,6 +2159,18 @@ "remove" ] }, + "UserArtifactSettings": { + "properties": { + "packageFileName": { + "type": "string", + "description": "Optional. The file to rename the downloaded package to on the VM. If not present, then the file will be called . This is limited to 4096 characters." + }, + "configFileName": { + "type": "string", + "description": "Optional. The file to rename the downloaded config to on the VM. If not present, then the file will be called _config. This is limited to 4096 characters." + } + } + }, "GalleryImage": { "properties": { "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/computeRPCommon.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/computeRPCommon.json index 6f915250349b..2b60977103b5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/computeRPCommon.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/computeRPCommon.json @@ -1113,6 +1113,14 @@ "configurationReference": { "type": "string", "description": "Optional, Specifies the uri to an azure blob that will replace the default configuration for the package if provided" + }, + "treatFailureAsDeploymentFailure": { + "type": "boolean", + "description": "Optional, If true, any failure for any operation in the VmApplication will fail the deployment" + }, + "enableAutomaticUpgrade": { + "type": "boolean", + "description": "If set to true, when a new Gallery Application version is available in PIR/SIG, it will be automatically updated for the VM/VMSS" } }, "required": [ diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json index 17de80acb0f8..ecbd93efcda4 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json @@ -32,7 +32,9 @@ "tags": "myTag1", "order": 1, "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", - "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config" + "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config", + "treatFailureAsDeploymentFailure" : false, + "enableAutomaticUpgrade": false }, { "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdg/resourceGroups/myresourceGroupName3/providers/Microsoft.Compute/galleries/myGallery2/applications/MyApplication2/versions/1.1" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineScaleSetExamples/VirtualMachineScaleSet_Create_WithApplicationProfile.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineScaleSetExamples/VirtualMachineScaleSet_Create_WithApplicationProfile.json index cb166119ca20..e9043baef017 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineScaleSetExamples/VirtualMachineScaleSet_Create_WithApplicationProfile.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineScaleSetExamples/VirtualMachineScaleSet_Create_WithApplicationProfile.json @@ -35,7 +35,9 @@ "tags": "myTag1", "order": 1, "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", - "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config" + "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config", + "treatFailureAsDeploymentFailure": true, + "enableAutomaticUpgrade": false }, { "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdg/resourceGroups/myresourceGroupName3/providers/Microsoft.Compute/galleries/myGallery2/applications/MyApplication2/versions/1.1" From f830443fc02f57330ea9dc27a37e9f4bc6ca8010 Mon Sep 17 00:00:00 2001 From: bhaskar brahma Date: Tue, 5 Apr 2022 15:03:54 -0700 Subject: [PATCH 2/4] ran prettier --- .../CreateOrUpdateASimpleGalleryApplicationVersion.json | 6 +++--- .../examples/gallery/GetAGalleryApplicationVersion.json | 2 +- .../Microsoft.Compute/stable/2021-10-01/gallery.json | 2 +- .../VirtualMachine_Create_WithApplicationProfile.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json index 2fc713fb845b..a876c0881fc7 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json @@ -47,7 +47,7 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings":{ + "settings": { "packageFileName": "package.zip", "configFileName": "configuration.cfg" }, @@ -88,7 +88,7 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings":{ + "settings": { "packageFileName": "package.zip", "configFileName": "configuration.cfg" }, @@ -129,7 +129,7 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings":{ + "settings": { "packageFileName": "package.zip", "configFileName": "configuration.cfg" }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json index 56e3e64ebfd4..d083f9ced785 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json @@ -23,7 +23,7 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings":{ + "settings": { "packageFileName": "package.zip", "configFileName": "configuration.cfg" }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json index 04b06620c28b..9363b11e7aad 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json @@ -2103,7 +2103,7 @@ }, "advancedSettings": { "type": "object", - "additionalProperties":{ + "additionalProperties": { "type": "string" }, "description": "Optional. Additional settings to pass to the VMApp extension. For advanced used only." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json index ecbd93efcda4..ed157ac0efea 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_WithApplicationProfile.json @@ -33,7 +33,7 @@ "order": 1, "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config", - "treatFailureAsDeploymentFailure" : false, + "treatFailureAsDeploymentFailure": false, "enableAutomaticUpgrade": false }, { From bcd61af33583ae6a7b0a203954b23e4da2fc8acb Mon Sep 17 00:00:00 2001 From: bhaskar brahma Date: Thu, 7 Apr 2022 14:05:38 -0700 Subject: [PATCH 3/4] fix LintDiff, SpellCheck --- .../Microsoft.Compute/stable/2021-10-01/gallery.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json index 9363b11e7aad..b218999ba824 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json @@ -2160,14 +2160,15 @@ ] }, "UserArtifactSettings": { + "type": "object", "properties": { "packageFileName": { "type": "string", - "description": "Optional. The file to rename the downloaded package to on the VM. If not present, then the file will be called . This is limited to 4096 characters." + "description": "Optional. The name to assign the downloaded package file on the VM. If not specified, downloaded file will be named the same as the gallery application name. This is limited to 4096 characters." }, "configFileName": { "type": "string", - "description": "Optional. The file to rename the downloaded config to on the VM. If not present, then the file will be called _config. This is limited to 4096 characters." + "description": "Optional. The name to assign the downloaded config file on the VM. If not specified, the configuration file will be named `_config`. This is limited to 4096 characters." } } }, From f2ee82a60f028d65c9572abb6ef0d501cf2dba14 Mon Sep 17 00:00:00 2001 From: "REDMOND\\bhbrahma" Date: Mon, 18 Apr 2022 14:21:10 -0700 Subject: [PATCH 4/4] reverted changes made to gallery.json. The changes to gallery.json will be part of separate PR. --- ...pdateASimpleGalleryApplicationVersion.json | 24 ------------------- .../GetAGalleryApplicationVersion.json | 8 ------- .../stable/2021-10-01/gallery.json | 22 ----------------- 3 files changed, 54 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json index a876c0881fc7..bcad03693de2 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/CreateOrUpdateASimpleGalleryApplicationVersion.json @@ -47,14 +47,6 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings": { - "packageFileName": "package.zip", - "configFileName": "configuration.cfg" - }, - "advancedSettings": { - "timoeut": "300", - "user": "root" - }, "enableHealthCheck": false, "targetRegions": [ { @@ -88,14 +80,6 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings": { - "packageFileName": "package.zip", - "configFileName": "configuration.cfg" - }, - "advancedSettings": { - "timoeut": "300", - "user": "root" - }, "enableHealthCheck": false, "targetRegions": [ { @@ -129,14 +113,6 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings": { - "packageFileName": "package.zip", - "configFileName": "configuration.cfg" - }, - "advancedSettings": { - "timoeut": "300", - "user": "root" - }, "enableHealthCheck": false, "targetRegions": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json index d083f9ced785..5c9aba68e905 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/examples/gallery/GetAGalleryApplicationVersion.json @@ -23,14 +23,6 @@ "install": "powershell -command \"Expand-Archive -Path package.zip -DestinationPath C:\\package\"", "remove": "del C:\\package " }, - "settings": { - "packageFileName": "package.zip", - "configFileName": "configuration.cfg" - }, - "advancedSettings": { - "timoeut": "300", - "user": "root" - }, "enableHealthCheck": false, "targetRegions": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json index 9363b11e7aad..6ea8b84eaf44 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json @@ -2098,16 +2098,6 @@ "manageActions": { "$ref": "#/definitions/UserArtifactManage" }, - "settings": { - "$ref": "#/definitions/UserArtifactSettings" - }, - "advancedSettings": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Optional. Additional settings to pass to the VMApp extension. For advanced used only." - }, "enableHealthCheck": { "type": "boolean", "description": "Optional. Whether or not this application reports health." @@ -2159,18 +2149,6 @@ "remove" ] }, - "UserArtifactSettings": { - "properties": { - "packageFileName": { - "type": "string", - "description": "Optional. The file to rename the downloaded package to on the VM. If not present, then the file will be called . This is limited to 4096 characters." - }, - "configFileName": { - "type": "string", - "description": "Optional. The file to rename the downloaded config to on the VM. If not present, then the file will be called _config. This is limited to 4096 characters." - } - } - }, "GalleryImage": { "properties": { "properties": {