From 232fed5ee8a739f45dd92e47e808e891f63df473 Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 11:35:43 -0700 Subject: [PATCH 1/7] add december registries swagger + examples --- .../createOrUpdate-SystemCreated.json | 9 ++-- .../Registries/get-SystemCreated.json | 3 +- .../Registries/list-SystemCreated.json | 3 +- .../Registries/listBySubscription.json | 3 +- .../Registries/update-SystemCreated.json | 3 +- .../2022-12-01-preview/registries.json | 42 +++++++++++++++++++ 6 files changed, 56 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json index df5a64c00e3a..28990b803d4e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json @@ -23,7 +23,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], @@ -83,7 +84,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], @@ -163,7 +165,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/get-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/get-SystemCreated.json index 207c5a2f2e2e..5649989e6968 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/get-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/get-SystemCreated.json @@ -30,7 +30,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/list-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/list-SystemCreated.json index de6c7d88c39e..aeb114c7f585 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/list-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/list-SystemCreated.json @@ -32,7 +32,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/listBySubscription.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/listBySubscription.json index d954af56ff4d..2e946c7de95d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/listBySubscription.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/listBySubscription.json @@ -32,7 +32,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json index e450dc3819bf..85752df937b9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json @@ -48,7 +48,8 @@ "storageAccountHnsEnabled": false, "armResourceId": { "resourceId": "string" - } + }, + "allowBlobPublicAccess": false } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json index 29351fb1e351..e7588ad8d624 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json @@ -111,6 +111,7 @@ "RegistryManagement" ], "summary": "Delete registry.", + "x-ms-long-running-operation": true, "operationId": "Registries_Delete", "produces": [ "application/json" @@ -143,6 +144,27 @@ "200": { "description": "Success" }, + "202": { + "description": "Accepted", + "headers": { + "x-ms-async-operation-timeout": { + "description": "Timeout for the client to use when polling the asynchronous operation.", + "type": "string", + "format": "duration" + }, + "Location": { + "description": "URI to poll for asynchronous operation result.", + "type": "string" + }, + "Retry-After": { + "description": "Duration the client should wait between requests, in seconds.", + "type": "integer", + "format": "int32", + "maximum": 600, + "minimum": 10 + } + } + }, "204": { "description": "No Content" } @@ -255,6 +277,12 @@ "schema": { "$ref": "#/definitions/RegistryTrackedResource" } + }, + "202": { + "description": "Success", + "schema": { + "$ref": "#/definitions/RegistryTrackedResource" + } } }, "x-ms-examples": { @@ -328,6 +356,12 @@ "schema": { "$ref": "#/definitions/RegistryTrackedResource" } + }, + "202": { + "description": "Created", + "schema": { + "$ref": "#/definitions/RegistryTrackedResource" + } } }, "x-ms-examples": { @@ -386,6 +420,10 @@ "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type.", "type": "string" }, + "location": { + "description": "The geo-location where the resource lives.", + "type": "string" + }, "properties": { "description": "Additional attributes of the entity.", "$ref": "#/definitions/PartialRegistry" @@ -534,6 +572,7 @@ }, "RegistryTrackedResource": { "required": [ + "location", "properties" ], "type": "object", @@ -778,6 +817,9 @@ "description": "Allowed values:\r\n\"Standard_LRS\",\r\n\"Standard_GRS\",\r\n\"Standard_RAGRS\",\r\n\"Standard_ZRS\",\r\n\"Standard_GZRS\",\r\n\"Standard_RAGZRS\",\r\n\"Premium_LRS\",\r\n\"Premium_ZRS\"", "type": "string", "x-nullable": true + }, + "allowBlobPublicAccess": { + "type": "boolean" } }, "additionalProperties": false From 179744c1a0112d089e0838f7eec8c1d54c0c6916 Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 12:10:32 -0700 Subject: [PATCH 2/7] add status code 202 in examples --- .../examples/Registries/createOrUpdate-SystemCreated.json | 3 ++- .../examples/Registries/createOrUpdate-UserCreated.json | 3 ++- .../preview/2022-12-01-preview/examples/Registries/delete.json | 1 + .../examples/Registries/update-SystemCreated.json | 3 ++- .../examples/Registries/update-UserCreated.json | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json index 28990b803d4e..6e81324b6942 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json @@ -221,6 +221,7 @@ "capacity": 1 } } - } + }, + "202": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json index 5016f27dbada..dd28782eea3e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json @@ -209,6 +209,7 @@ "capacity": 1 } } - } + }, + "202": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json index 4dbf76a53f02..5382e4e82681 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json index 85752df937b9..038db21de703 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json @@ -104,6 +104,7 @@ "capacity": 1 } } - } + }, + "202": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json index 20628a2f762f..e34829f5cf12 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json @@ -100,6 +100,7 @@ "capacity": 1 } } - } + }, + "202": {} } } From 30e8f150b16aa0937d7ee812da80ca59b271ece2 Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 13:41:58 -0700 Subject: [PATCH 3/7] fix 202 examples --- .../createOrUpdate-SystemCreated.json | 82 ++++++++++++++++++- .../createOrUpdate-UserCreated.json | 78 +++++++++++++++++- .../examples/Registries/delete.json | 6 +- .../Registries/update-SystemCreated.json | 82 ++++++++++++++++++- .../Registries/update-UserCreated.json | 78 +++++++++++++++++- 5 files changed, 321 insertions(+), 5 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json index 6e81324b6942..af8ace383bfe 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json @@ -222,6 +222,86 @@ } } }, - "202": {} + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "systemCreatedStorageAccount": { + "storageAccountType": "string", + "storageAccountHnsEnabled": false, + "armResourceId": { + "resourceId": "string" + }, + "allowBlobPublicAccess": false + } + } + ], + "acrDetails": [ + { + "systemCreatedAcrAccount": { + "acrAccountSku": "string", + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Free", + "size": "string", + "family": "string", + "capacity": 1 + } + } + } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json index dd28782eea3e..d4c61e29d5a8 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json @@ -210,6 +210,82 @@ } } }, - "202": {} + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "userCreatedStorageAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ], + "acrDetails": [ + { + "userCreatedAcrAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Free", + "size": "string", + "family": "string", + "capacity": 1 + } + } + } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json index 5382e4e82681..47568043a203 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json @@ -7,7 +7,11 @@ }, "responses": { "200": {}, - "202": {}, + "202": { + "headers": {}, + "Location": "example_location", + "Retry-After": 100 + }, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json index 038db21de703..3d9aa47b3872 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json @@ -105,6 +105,86 @@ } } }, - "202": {} + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "systemCreatedStorageAccount": { + "storageAccountType": "string", + "storageAccountHnsEnabled": false, + "armResourceId": { + "resourceId": "string" + }, + "allowBlobPublicAccess": false + } + } + ], + "acrDetails": [ + { + "systemCreatedAcrAccount": { + "acrAccountSku": "string", + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Basic", + "size": "string", + "family": "string", + "capacity": 1 + } + } + } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json index e34829f5cf12..06801b231346 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json @@ -101,6 +101,82 @@ } } }, - "202": {} + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "userCreatedStorageAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ], + "acrDetails": [ + { + "userCreatedAcrAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Basic", + "size": "string", + "family": "string", + "capacity": 1 + } + } + } } } From 1f68562389c68edbae86ce983a01f247ef12623e Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 14:30:28 -0700 Subject: [PATCH 4/7] fixes --- .../examples/Registries/delete.json | 5 --- .../Registries/update-SystemCreated.json | 5 ++- .../Registries/update-UserCreated.json | 5 ++- .../2022-12-01-preview/registries.json | 45 +++++++------------ 4 files changed, 25 insertions(+), 35 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json index 47568043a203..4dbf76a53f02 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json @@ -7,11 +7,6 @@ }, "responses": { "200": {}, - "202": { - "headers": {}, - "Location": "example_location", - "Retry-After": 100 - }, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json index 3d9aa47b3872..bd3cd1265c6a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-SystemCreated.json @@ -106,7 +106,10 @@ } }, "202": { - "headers": {}, + "headers": { + "Location": "example_location", + "Retry-After": 100 + }, "body": { "id": "string", "name": "string", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json index 06801b231346..190012eac8fa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/update-UserCreated.json @@ -102,7 +102,10 @@ } }, "202": { - "headers": {}, + "headers": { + "Location": "example_location", + "Retry-After": 100 + }, "body": { "id": "string", "name": "string", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json index e7588ad8d624..2c63f350d2aa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json @@ -112,6 +112,9 @@ ], "summary": "Delete registry.", "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, "operationId": "Registries_Delete", "produces": [ "application/json" @@ -144,27 +147,6 @@ "200": { "description": "Success" }, - "202": { - "description": "Accepted", - "headers": { - "x-ms-async-operation-timeout": { - "description": "Timeout for the client to use when polling the asynchronous operation.", - "type": "string", - "format": "duration" - }, - "Location": { - "description": "URI to poll for asynchronous operation result.", - "type": "string" - }, - "Retry-After": { - "description": "Duration the client should wait between requests, in seconds.", - "type": "integer", - "format": "int32", - "maximum": 600, - "minimum": 10 - } - } - }, "204": { "description": "No Content" } @@ -280,6 +262,19 @@ }, "202": { "description": "Success", + "headers": { + "Location": { + "description": "URI to poll for asynchronous operation result.", + "type": "string" + }, + "Retry-After": { + "description": "Duration the client should wait between requests, in seconds.", + "type": "integer", + "format": "int32", + "maximum": 600, + "minimum": 10 + } + }, "schema": { "$ref": "#/definitions/RegistryTrackedResource" } @@ -302,7 +297,7 @@ "operationId": "Registries_CreateOrUpdate", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" }, "consumes": [ "application/json" @@ -356,12 +351,6 @@ "schema": { "$ref": "#/definitions/RegistryTrackedResource" } - }, - "202": { - "description": "Created", - "schema": { - "$ref": "#/definitions/RegistryTrackedResource" - } } }, "x-ms-examples": { From 381b338edcd0beda3631240ca5aeb82f16ed3cd1 Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 14:46:16 -0700 Subject: [PATCH 5/7] fixes --- .../createOrUpdate-SystemCreated.json | 81 ------------------- .../createOrUpdate-UserCreated.json | 77 ------------------ .../examples/Registries/delete.json | 6 ++ .../2022-12-01-preview/registries.json | 25 ++++-- 4 files changed, 25 insertions(+), 164 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json index af8ace383bfe..28990b803d4e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json @@ -221,87 +221,6 @@ "capacity": 1 } } - }, - "202": { - "headers": {}, - "body": { - "id": "string", - "name": "string", - "type": "string", - "properties": { - "description": "string", - "tags": { - "string": "string" - }, - "properties": { - "string": "string" - }, - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "systemCreatedStorageAccount": { - "storageAccountType": "string", - "storageAccountHnsEnabled": false, - "armResourceId": { - "resourceId": "string" - }, - "allowBlobPublicAccess": false - } - } - ], - "acrDetails": [ - { - "systemCreatedAcrAccount": { - "acrAccountSku": "string", - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "managedResourceGroup": { - "resourceId": "string" - }, - "privateLinkCount": 0, - "publicNetworkAccess": "Disabled", - "mlFlowRegistryUri": "string", - "intellectualPropertyPublisher": "string", - "discoveryUrl": "string" - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999Z", - "createdBy": "string", - "createdByType": "ManagedIdentity", - "lastModifiedAt": "2020-01-01T12:34:56.999Z", - "lastModifiedBy": "string", - "lastModifiedByType": "Application" - }, - "tags": {}, - "location": "string", - "kind": "string", - "identity": { - "type": "SystemAssigned", - "principalId": "00000000-1111-2222-3333-444444444444", - "tenantId": "00000000-1111-2222-3333-444444444444", - "userAssignedIdentities": { - "string": { - "principalId": "00000000-1111-2222-3333-444444444444", - "clientId": "00000000-1111-2222-3333-444444444444" - } - } - }, - "sku": { - "name": "string", - "tier": "Free", - "size": "string", - "family": "string", - "capacity": 1 - } - } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json index d4c61e29d5a8..5016f27dbada 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json @@ -209,83 +209,6 @@ "capacity": 1 } } - }, - "202": { - "headers": {}, - "body": { - "id": "string", - "name": "string", - "type": "string", - "properties": { - "description": "string", - "tags": { - "string": "string" - }, - "properties": { - "string": "string" - }, - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "managedResourceGroup": { - "resourceId": "string" - }, - "privateLinkCount": 0, - "publicNetworkAccess": "Disabled", - "mlFlowRegistryUri": "string", - "intellectualPropertyPublisher": "string", - "discoveryUrl": "string" - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999Z", - "createdBy": "string", - "createdByType": "ManagedIdentity", - "lastModifiedAt": "2020-01-01T12:34:56.999Z", - "lastModifiedBy": "string", - "lastModifiedByType": "Application" - }, - "tags": {}, - "location": "string", - "kind": "string", - "identity": { - "type": "SystemAssigned", - "principalId": "00000000-1111-2222-3333-444444444444", - "tenantId": "00000000-1111-2222-3333-444444444444", - "userAssignedIdentities": { - "string": { - "principalId": "00000000-1111-2222-3333-444444444444", - "clientId": "00000000-1111-2222-3333-444444444444" - } - } - }, - "sku": { - "name": "string", - "tier": "Free", - "size": "string", - "family": "string", - "capacity": 1 - } - } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json index 4dbf76a53f02..1378c983c31c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/delete.json @@ -7,6 +7,12 @@ }, "responses": { "200": {}, + "202": { + "headers": { + "Location": "example_location", + "Retry-After": 100 + } + }, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json index 2c63f350d2aa..dc5d56f02cbe 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json @@ -113,7 +113,7 @@ "summary": "Delete registry.", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" }, "operationId": "Registries_Delete", "produces": [ @@ -131,7 +131,8 @@ "name": "registryName", "description": "Name of registry. This is case-insensitive", "required": true, - "type": "string" + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -147,6 +148,22 @@ "200": { "description": "Success" }, + "202": { + "description": "Success", + "headers": { + "Location": { + "description": "URI to poll for asynchronous operation result.", + "type": "string" + }, + "Retry-After": { + "description": "Duration the client should wait between requests, in seconds.", + "type": "integer", + "format": "int32", + "maximum": 600, + "minimum": 10 + } + } + }, "204": { "description": "No Content" } @@ -409,10 +426,6 @@ "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type.", "type": "string" }, - "location": { - "description": "The geo-location where the resource lives.", - "type": "string" - }, "properties": { "description": "Additional attributes of the entity.", "$ref": "#/definitions/PartialRegistry" From 12b3f787cdea57a57568b2926b30cde97dcb4eaa Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Wed, 2 Nov 2022 14:56:11 -0700 Subject: [PATCH 6/7] fix --- .../preview/2022-12-01-preview/registries.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json index dc5d56f02cbe..b234d88cd6c5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json @@ -113,7 +113,7 @@ "summary": "Delete registry.", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "location" }, "operationId": "Registries_Delete", "produces": [ From 16308e669c8b629e444d3cf0c0e9a54ef6011049 Mon Sep 17 00:00:00 2001 From: Komal Yadav Date: Thu, 3 Nov 2022 12:20:06 -0700 Subject: [PATCH 7/7] add 202 back in for put/patch --- .../createOrUpdate-SystemCreated.json | 81 +++++++++++++++++++ .../createOrUpdate-UserCreated.json | 77 ++++++++++++++++++ .../2022-12-01-preview/registries.json | 13 ++- 3 files changed, 170 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json index 28990b803d4e..bb6c5e3ff8bd 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-SystemCreated.json @@ -221,6 +221,87 @@ "capacity": 1 } } + }, + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "systemCreatedStorageAccount": { + "storageAccountType": "string", + "storageAccountHnsEnabled": false, + "armResourceId": { + "resourceId": "string" + }, + "allowBlobPublicAccess": false + } + } + ], + "acrDetails": [ + { + "systemCreatedAcrAccount": { + "acrAccountSku": "string", + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "Key", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "ManagedIdentity" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned,UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Standard", + "size": "string", + "family": "string", + "capacity": 1 + } + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json index 5016f27dbada..95baaa39a425 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/examples/Registries/createOrUpdate-UserCreated.json @@ -209,6 +209,83 @@ "capacity": 1 } } + }, + "202": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "description": "string", + "tags": { + "string": "string" + }, + "properties": { + "string": "string" + }, + "regionDetails": [ + { + "location": "string", + "storageAccountDetails": [ + { + "userCreatedStorageAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ], + "acrDetails": [ + { + "userCreatedAcrAccount": { + "armResourceId": { + "resourceId": "string" + } + } + } + ] + } + ], + "managedResourceGroup": { + "resourceId": "string" + }, + "privateLinkCount": 0, + "publicNetworkAccess": "Disabled", + "mlFlowRegistryUri": "string", + "intellectualPropertyPublisher": "string", + "discoveryUrl": "string" + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999Z", + "createdBy": "string", + "createdByType": "Key", + "lastModifiedAt": "2020-01-01T12:34:56.999Z", + "lastModifiedBy": "string", + "lastModifiedByType": "ManagedIdentity" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned,UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Standard", + "size": "string", + "family": "string", + "capacity": 1 + } + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json index b234d88cd6c5..7c4e37a9a5cd 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-12-01-preview/registries.json @@ -149,8 +149,13 @@ "description": "Success" }, "202": { - "description": "Success", + "description": "Accepted", "headers": { + "x-ms-async-operation-timeout": { + "description": "Timeout for the client to use when polling the asynchronous operation.", + "type": "string", + "format": "duration" + }, "Location": { "description": "URI to poll for asynchronous operation result.", "type": "string" @@ -368,6 +373,12 @@ "schema": { "$ref": "#/definitions/RegistryTrackedResource" } + }, + "202": { + "description": "Created", + "schema": { + "$ref": "#/definitions/RegistryTrackedResource" + } } }, "x-ms-examples": {