From 6b0f97f47ceb25ace0a7a896b29ee36866c63c7c Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Thu, 16 Dec 2021 20:18:20 +0000 Subject: [PATCH] Revert "Spec for ProtectedSettingsFromKeyVault and AllowExtensionOperations (#16590)" (#17121) This reverts commit 220cfd0638942c04275d69fd485ceb2da02a96d3. --- .../stable/2021-07-01/compute.json | 21 +- ...eSetWithProtectedSettingsFromKeyVault.json | 293 ------------------ ...MExtensionWithSuppressFailureEnabled.json} | 12 - 3 files changed, 1 insertion(+), 325 deletions(-) delete mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/{UpdateVMExtension.json => UpdateVMExtensionWithSuppressFailureEnabled.json} (63%) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json index 72c20aea0672..981eeb6f69e0 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json @@ -1723,7 +1723,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "Update VM extension.": { - "$ref": "./examples/compute/UpdateVMExtension.json" + "$ref": "./examples/compute/UpdateVMExtensionWithSuppressFailureEnabled.json" } } }, @@ -5425,9 +5425,6 @@ }, "Create a scale set with spot restore policy": { "$ref": "./examples/compute/CreateAScaleSetWithSpotRestorePolicy.json" - }, - "Create a VMSS with an extension with protectedSettingsFromKeyVault": { - "$ref": "./examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json" } } }, @@ -9533,10 +9530,6 @@ "suppressFailures": { "type": "boolean", "description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false." - }, - "protectedSettingsFromKeyVault": { - "type": "object", - "description": "The extensions protected settings that are passed by reference, and consumed from key vault" } }, "description": "Describes the properties of a Virtual Machine Extension." @@ -9578,10 +9571,6 @@ "suppressFailures": { "type": "boolean", "description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false." - }, - "protectedSettingsFromKeyVault": { - "type": "object", - "description": "The extensions protected settings that are passed by reference, and consumed from key vault" } }, "description": "Describes the properties of a Virtual Machine Extension." @@ -12597,10 +12586,6 @@ "$ref": "#/definitions/VaultSecretGroup" }, "description": "Specifies set of certificates that should be installed onto the virtual machines in the scale set. To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows)." - }, - "allowExtensionOperations": { - "type": "boolean", - "description": "Specifies whether extension operations should be allowed on the virtual machine scale set.

This may only be set to False when no extensions are present on the virtual machine scale set." } }, "description": "Describes a virtual machine scale set OS profile." @@ -13371,10 +13356,6 @@ "suppressFailures": { "type": "boolean", "description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false." - }, - "protectedSettingsFromKeyVault": { - "type": "object", - "description": "The extensions protected settings that are passed by reference, and consumed from key vault" } }, "description": "Describes the properties of a Virtual Machine Scale Set Extension." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json deleted file mode 100644 index a46730933b7e..000000000000 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "resourceGroupName": "myResourceGroup", - "vmScaleSetName": "{vmss-name}", - "api-version": "2021-07-01", - "parameters": { - "sku": { - "tier": "Standard", - "capacity": 3, - "name": "Standard_D1_v2" - }, - "location": "westus", - "properties": { - "overprovision": true, - "virtualMachineProfile": { - "storageProfile": { - "imageReference": { - "sku": "2016-Datacenter", - "publisher": "MicrosoftWindowsServer", - "version": "latest", - "offer": "WindowsServer" - }, - "osDisk": { - "caching": "ReadWrite", - "managedDisk": { - "storageAccountType": "Standard_LRS" - }, - "createOption": "FromImage" - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "storageUri": "http://{existing-storage-account-name}.blob.core.windows.net", - "enabled": true - } - }, - "osProfile": { - "computerNamePrefix": "{vmss-name}", - "adminUsername": "{your-username}", - "adminPassword": "{your-password}" - }, - "extensionProfile": { - "extensions": [ - { - "name": "{extension-name}", - "properties": { - "autoUpgradeMinorVersion": false, - "publisher": "{extension-Publisher}", - "type": "{extension-Type}", - "typeHandlerVersion": "{handler-version}", - "settings": {}, - "protectedSettingsFromKeyVault": { - "sourceVault": { - "id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName" - }, - "secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e" - } - } - } - ] - }, - "networkProfile": { - "networkInterfaceConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "primary": true, - "enableIPForwarding": true, - "ipConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "subnet": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/{existing-virtual-network-name}/subnets/{existing-subnet-name}" - } - } - } - ] - } - } - ] - } - }, - "upgradePolicy": { - "mode": "Manual" - } - } - } - }, - "responses": { - "200": { - "body": { - "sku": { - "tier": "Standard", - "capacity": 3, - "name": "Standard_D1_v2" - }, - "name": "{vmss-name}", - "properties": { - "singlePlacementGroup": true, - "overprovision": true, - "uniqueId": "d053ec5a-8da6-495f-ab13-38216503c6d7", - "virtualMachineProfile": { - "storageProfile": { - "imageReference": { - "sku": "2016-Datacenter", - "publisher": "MicrosoftWindowsServer", - "version": "latest", - "offer": "WindowsServer" - }, - "osDisk": { - "caching": "ReadWrite", - "managedDisk": { - "storageAccountType": "Standard_LRS" - }, - "createOption": "FromImage" - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "storageUri": "http://nsgdiagnostic.blob.core.windows.net", - "enabled": true - } - }, - "osProfile": { - "computerNamePrefix": "{vmss-name}", - "adminUsername": "{your-username}", - "secrets": [], - "windowsConfiguration": { - "provisionVMAgent": true, - "enableAutomaticUpdates": true - } - }, - "extensionProfile": { - "extensions": [ - { - "name": "{extension-name}", - "properties": { - "autoUpgradeMinorVersion": false, - "publisher": "{extension-Publisher}", - "type": "{extension-Type}", - "typeHandlerVersion": "{handler-version}", - "settings": {}, - "protectedSettingsFromKeyVault": { - "sourceVault": { - "id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName" - }, - "secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e" - } - } - } - ] - }, - "networkProfile": { - "networkInterfaceConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "dnsSettings": { - "dnsServers": [] - }, - "primary": true, - "enableIPForwarding": true, - "ipConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "subnet": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" - }, - "privateIPAddressVersion": "IPv4" - } - } - ], - "enableAcceleratedNetworking": false - } - } - ] - } - }, - "upgradePolicy": { - "mode": "Manual" - }, - "provisioningState": "Creating" - }, - "location": "westus", - "type": "Microsoft.Compute/virtualMachineScaleSets", - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}" - } - }, - "201": { - "body": { - "sku": { - "tier": "Standard", - "capacity": 3, - "name": "Standard_D1_v2" - }, - "name": "{vmss-name}", - "properties": { - "singlePlacementGroup": true, - "overprovision": true, - "uniqueId": "d053ec5a-8da6-495f-ab13-38216503c6d7", - "virtualMachineProfile": { - "storageProfile": { - "imageReference": { - "sku": "2016-Datacenter", - "publisher": "MicrosoftWindowsServer", - "version": "latest", - "offer": "WindowsServer" - }, - "osDisk": { - "caching": "ReadWrite", - "managedDisk": { - "storageAccountType": "Standard_LRS" - }, - "createOption": "FromImage" - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "storageUri": "http://nsgdiagnostic.blob.core.windows.net", - "enabled": true - } - }, - "osProfile": { - "computerNamePrefix": "{vmss-name}", - "adminUsername": "{your-username}", - "secrets": [], - "windowsConfiguration": { - "provisionVMAgent": true, - "enableAutomaticUpdates": true - } - }, - "extensionProfile": { - "extensions": [ - { - "name": "{extension-name}", - "properties": { - "autoUpgradeMinorVersion": false, - "publisher": "{extension-Publisher}", - "type": "{extension-Type}", - "typeHandlerVersion": "{handler-version}", - "settings": {}, - "protectedSettingsFromKeyVault": { - "sourceVault": { - "id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName" - }, - "secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e" - } - } - } - ] - }, - "networkProfile": { - "networkInterfaceConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "dnsSettings": { - "dnsServers": [] - }, - "primary": true, - "enableIPForwarding": true, - "ipConfigurations": [ - { - "name": "{vmss-name}", - "properties": { - "subnet": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" - }, - "privateIPAddressVersion": "IPv4" - } - } - ], - "enableAcceleratedNetworking": false - } - } - ] - } - }, - "upgradePolicy": { - "mode": "Manual" - }, - "provisioningState": "Creating" - }, - "location": "westus", - "type": "Microsoft.Compute/virtualMachineScaleSets", - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}" - } - } - } -} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtension.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtensionWithSuppressFailureEnabled.json similarity index 63% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtension.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtensionWithSuppressFailureEnabled.json index 0d4bcf6ddcc1..4c8b071f90b8 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtension.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/UpdateVMExtensionWithSuppressFailureEnabled.json @@ -14,12 +14,6 @@ "suppressFailures": true, "settings": { "UserName": "xyz@microsoft.com" - }, - "protectedSettingsFromKeyVault": { - "sourceVault": { - "id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName" - }, - "secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e" } } } @@ -40,12 +34,6 @@ "suppressFailures": true, "settings": { "UserName": "xyz@microsoft.com" - }, - "protectedSettingsFromKeyVault": { - "sourceVault": { - "id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName" - }, - "secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e" } } }