From d7378eb7a947d0bc87cd05a0e250a1826defdf1b Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Mon, 28 Feb 2022 11:55:41 -0600 Subject: [PATCH] sync with diskRP 2021-12-01 changes --- .../stable/2022-03-02/DiskRP/disk.json | 14 +++- .../2022-03-02/DiskRP/diskRPCommon.json | 36 +++++++++- .../2022-03-02/DiskRP/diskRestorePoint.json | 2 +- .../Disk_Create_WithDataAccessAuthMode.json | 47 +++++++++++++ .../Disk_Update_ToAddArchitecture.json | 70 +++++++++++++++++++ .../stable/2022-03-02/DiskRP/snapshot.json | 10 ++- 6 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Update_ToAddArchitecture.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/disk.json index 23fff161c261..530e0116637d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/disk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/disk.json @@ -103,6 +103,9 @@ "Create a managed disk and associate with disk access resource.": { "$ref": "./examples/diskExamples/Disk_Create_WithDiskAccess.json" }, + "Create a managed disk with dataAccessAuthMode": { + "$ref": "./examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json" + }, "Create a managed disk and associate with disk encryption set.": { "$ref": "./examples/diskExamples/Disk_Create_WithDiskEncryptionSet.json" }, @@ -195,6 +198,9 @@ }, "Update a managed disk to change tier.": { "$ref": "./examples/diskExamples/Disk_Update_ChangeTier.json" + }, + "Update a managed disk to add architecture.": { + "$ref": "./examples/diskExamples//Disk_Update_ToAddArchitecture.json" } } }, @@ -715,6 +721,9 @@ }, "publicNetworkAccess": { "$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess" + }, + "dataAccessAuthMode": { + "$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode" } }, "required": [ @@ -795,7 +804,7 @@ }, "supportedCapabilities": { "$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities", - "description": "List of supported capabilities (like accelerated networking) to be added on the OS disk." + "description": "List of supported capabilities to be added on the OS disk." }, "propertyUpdatesInProgress": { "readOnly": true, @@ -808,6 +817,9 @@ }, "publicNetworkAccess": { "$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess" + }, + "dataAccessAuthMode": { + "$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode" } }, "description": "Disk resource update properties." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRPCommon.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRPCommon.json index f71e4c3b1a6e..d8ce97823b90 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRPCommon.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRPCommon.json @@ -416,9 +416,21 @@ "acceleratedNetwork": { "type": "boolean", "description": "True if the image from which the OS disk is created supports accelerated networking." + }, + "architecture": { + "type": "string", + "description": "CPU architecture supported by an OS disk.", + "enum": [ + "x64", + "Arm64" + ], + "x-ms-enum": { + "name": "Architecture", + "modelAsString": true + } } }, - "description": "List of supported capabilities (like accelerated networking) persisted on the disk resource for VM use." + "description": "List of supported capabilities persisted on the disk resource for VM use." }, "DiskSecurityType": { "type": "string", @@ -508,6 +520,28 @@ } }, "description": "A disk access SAS uri." + }, + "DataAccessAuthMode": { + "type": "string", + "description": "Additional authentication requirements when exporting or uploading to a disk or snapshot.", + "enum": [ + "AzureActiveDirectory", + "None" + ], + "x-ms-enum": { + "name": "DataAccessAuthMode", + "modelAsString": true, + "values": [ + { + "value": "AzureActiveDirectory", + "description": "When export/upload URL is used, the system checks if the user has an identity in Azure Active Directory and has necessary permissions to export/upload the data. Please refer to aka.ms/DisksAzureADAuth." + }, + { + "value": "None", + "description": "No additional authentication would be performed when accessing export/upload URL." + } + ] + } } }, "parameters": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRestorePoint.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRestorePoint.json index d2e4f5650cef..566e09a87448 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRestorePoint.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskRestorePoint.json @@ -328,7 +328,7 @@ }, "supportedCapabilities": { "$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities", - "description": "List of supported capabilities (like accelerated networking) for the image from which the OS disk was created." + "description": "List of supported capabilities for the image from which the OS disk was created." }, "familyId": { "type": "string", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json new file mode 100644 index 000000000000..b75b887df49b --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2022-03-02", + "diskName": "myDisk", + "disk": { + "location": "West US", + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200, + "dataAccessAuthMode": "AzureActiveDirectory" + } + } + }, + "responses": { + "202": { + "body": { + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myDisk" + } + }, + "200": { + "body": { + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200, + "provisioningState": "Succeeded", + "dataAccessAuthMode": "AzureActiveDirectory" + }, + "location": "West US", + "name": "myDisk" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Update_ToAddArchitecture.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Update_ToAddArchitecture.json new file mode 100644 index 000000000000..15a5c3ce02df --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/examples/diskExamples/Disk_Update_ToAddArchitecture.json @@ -0,0 +1,70 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2022-03-02", + "diskName": "myDisk", + "disk": { + "properties": { + "supportedCapabilities": { + "architecture": "Arm64" + } + } + } + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDisk?api-version=2021-12-01" + }, + "body": { + "name": "myDisk", + "location": "westus", + "sku": { + "name": "Standard_LRS", + "tier": "Standard" + }, + "properties": { + "osType": "Windows", + "hyperVGeneration": "V1", + "supportedCapabilities": { + "architecture": "Arm64" + }, + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscription-id}/Providers/Microsoft.Compute/Locations/westus/Publishers/test_test_pmc2pc1/ArtifactTypes/VMImage/Offers/marketplace_vm_test/Skus/test_sku/Versions/1.0.0" + } + }, + "diskSizeGB": 127, + "provisioningState": "Updating" + } + } + }, + "200": { + "body": { + "name": "myDisk", + "location": "westus", + "sku": { + "name": "Standard_LRS", + "tier": "Standard" + }, + "properties": { + "osType": "Windows", + "hyperVGeneration": "V1", + "supportedCapabilities": { + "architecture": "Arm64" + }, + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscription-id}/Providers/Microsoft.Compute/Locations/westus/Publishers/test_test_pmc2pc1/ArtifactTypes/VMImage/Offers/marketplace_vm_test/Skus/test_sku/Versions/1.0.0" + } + }, + "diskSizeGB": 127, + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/snapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/snapshot.json index 38f307380436..b09577c194d5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/snapshot.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/snapshot.json @@ -522,7 +522,7 @@ }, "supportedCapabilities": { "$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities", - "description": "List of supported capabilities (like Accelerated Networking) for the image from which the source disk from the snapshot was originally created." + "description": "List of supported capabilities for the image from which the source disk from the snapshot was originally created." }, "creationData": { "$ref": "./diskRPCommon.json#/definitions/CreationData", @@ -586,6 +586,9 @@ "completionPercent": { "type": "number", "description": "Percentage complete for the background copy when a resource is created via the CopyStart operation." + }, + "dataAccessAuthMode": { + "$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode" } }, "required": [ @@ -634,9 +637,12 @@ "publicNetworkAccess": { "$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess" }, + "dataAccessAuthMode": { + "$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode" + }, "supportedCapabilities": { "$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities", - "description": "List of supported capabilities (like accelerated networking) for the image from which the OS disk was created." + "description": "List of supported capabilities for the image from which the OS disk was created." } }, "description": "Snapshot resource update properties."