From 0cffc34b61588935ad80375e5ae849a8395bec97 Mon Sep 17 00:00:00 2001 From: Miles Izydorczak <56458475+milesizydorczak12@users.noreply.github.com> Date: Mon, 25 Sep 2023 21:12:17 -0400 Subject: [PATCH] Remove BYO resource registry examples and add comments in descriptions for registry swagger for warning on BYO not supported (#25745) --- .../createOrUpdate-UserCreated.json | 260 ------------------ ...SystemCreated.json => createOrUpdate.json} | 0 .../examples/Registries/get-UserCreated.json | 100 ------- .../{get-SystemCreated.json => get.json} | 0 .../examples/Registries/list-UserCreated.json | 104 ------- .../{list-SystemCreated.json => list.json} | 0 .../examples/Registries/removeRegions.json | 20 -- .../Registries/update-UserCreated.json | 116 -------- ...{update-SystemCreated.json => update.json} | 0 .../2023-06-01-preview/registries.json | 24 +- 10 files changed, 6 insertions(+), 618 deletions(-) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-UserCreated.json rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/{createOrUpdate-SystemCreated.json => createOrUpdate.json} (100%) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-UserCreated.json rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/{get-SystemCreated.json => get.json} (100%) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-UserCreated.json rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/{list-SystemCreated.json => list.json} (100%) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-UserCreated.json rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/{update-SystemCreated.json => update.json} (100%) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-UserCreated.json deleted file mode 100644 index b1655a62b1a3..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-UserCreated.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "test-rg", - "registryName": "string", - "api-version": "2023-06-01-preview", - "body": { - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "tags": {}, - "location": "string", - "kind": "string", - "identity": { - "type": "None", - "userAssignedIdentities": { - "string": {} - } - }, - "sku": { - "name": "string", - "tier": "Free", - "size": "string", - "family": "string", - "capacity": 1 - } - } - }, - "responses": { - "200": { - "headers": {}, - "body": { - "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": "Free", - "size": "string", - "family": "string", - "capacity": 1 - }, - "id": "string", - "name": "string", - "type": "string", - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "id": "string", - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:39", - "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:39", - "lastModifiedBy": "string", - "lastModifiedByType": "User" - } - } - }, - "201": { - "headers": {}, - "body": { - "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 - }, - "id": "string", - "name": "string", - "type": "string", - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "id": "string", - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:39", - "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:39", - "lastModifiedBy": "string", - "lastModifiedByType": "User" - } - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate-SystemCreated.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/createOrUpdate.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-UserCreated.json deleted file mode 100644 index b0fb61653201..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-UserCreated.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "test-rg", - "registryName": "string", - "api-version": "2023-06-01-preview" - }, - "responses": { - "200": { - "headers": {}, - "body": { - "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": "Free", - "size": "string", - "family": "string", - "capacity": 1 - }, - "id": "string", - "name": "string", - "type": "string", - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "id": "string", - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:45", - "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:45", - "lastModifiedBy": "string", - "lastModifiedByType": "User" - } - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get-SystemCreated.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/get.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-UserCreated.json deleted file mode 100644 index f590c86057fb..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-UserCreated.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "test-rg", - "api-version": "2023-06-01-preview" - }, - "responses": { - "200": { - "headers": {}, - "body": { - "value": [ - { - "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": "Free", - "size": "string", - "family": "string", - "capacity": 1 - }, - "id": "string", - "name": "string", - "type": "string", - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "id": "string", - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:42", - "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:42", - "lastModifiedBy": "string", - "lastModifiedByType": "User" - } - } - ], - "nextLink": "string" - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list-SystemCreated.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/list.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/removeRegions.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/removeRegions.json index bc9fbac84d6e..98dd91e1a624 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/removeRegions.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/removeRegions.json @@ -11,11 +11,6 @@ "location": "string", "storageAccountDetails": [ { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - }, "systemCreatedStorageAccount": { "storageAccountName": "string", "storageAccountType": "string", @@ -29,11 +24,6 @@ ], "acrDetails": [ { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - }, "systemCreatedAcrAccount": { "acrAccountName": "string", "acrAccountSku": "string", @@ -125,11 +115,6 @@ "location": "string", "storageAccountDetails": [ { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - }, "systemCreatedStorageAccount": { "storageAccountName": "string", "storageAccountType": "string", @@ -143,11 +128,6 @@ ], "acrDetails": [ { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - }, "systemCreatedAcrAccount": { "acrAccountName": "string", "acrAccountSku": "string", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-UserCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-UserCreated.json deleted file mode 100644 index 193afb890fe8..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-UserCreated.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "test-rg", - "registryName": "string", - "api-version": "2023-06-01-preview", - "body": { - "tags": {}, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "string": {} - } - }, - "sku": { - "name": "string", - "tier": "Basic", - "size": "string", - "family": "string", - "capacity": 1 - } - } - }, - "responses": { - "200": { - "headers": {}, - "body": { - "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": "Free", - "size": "string", - "family": "string", - "capacity": 1 - }, - "id": "string", - "name": "string", - "type": "string", - "properties": { - "regionDetails": [ - { - "location": "string", - "storageAccountDetails": [ - { - "userCreatedStorageAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ], - "acrDetails": [ - { - "userCreatedAcrAccount": { - "armResourceId": { - "resourceId": "string" - } - } - } - ] - } - ], - "intellectualPropertyPublisher": "string", - "publicNetworkAccess": "string", - "discoveryUrl": "string", - "managedResourceGroup": { - "resourceId": "string" - }, - "mlFlowRegistryUri": "string", - "privateEndpointConnections": [ - { - "id": "string", - "location": "string", - "properties": { - "provisioningState": "string", - "privateEndpoint": { - "id": "string", - "subnetArmId": "string" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "string", - "actionsRequired": "string" - }, - "groupIds": [ - "string" - ] - } - } - ] - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:58", - "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:58", - "lastModifiedBy": "string", - "lastModifiedByType": "User" - } - } - } - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-SystemCreated.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update-SystemCreated.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/examples/Registries/update.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/registries.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/registries.json index 7e35b524ffb9..f2c222a1e98a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/registries.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/registries.json @@ -88,10 +88,7 @@ }, "x-ms-examples": { "List registries with system created accounts.": { - "$ref": "./examples/Registries/list-SystemCreated.json" - }, - "List registries with user created accounts.": { - "$ref": "./examples/Registries/list-UserCreated.json" + "$ref": "./examples/Registries/list.json" } }, "x-ms-pageable": { @@ -207,10 +204,7 @@ }, "x-ms-examples": { "Get Registry with system created accounts.": { - "$ref": "./examples/Registries/get-SystemCreated.json" - }, - "Get Registry with user created accounts.": { - "$ref": "./examples/Registries/get-UserCreated.json" + "$ref": "./examples/Registries/get.json" } } }, @@ -265,10 +259,7 @@ }, "x-ms-examples": { "Update Registry with system created accounts.": { - "$ref": "./examples/Registries/update-SystemCreated.json" - }, - "Update Registry with user created accounts.": { - "$ref": "./examples/Registries/update-UserCreated.json" + "$ref": "./examples/Registries/update.json" } } }, @@ -329,10 +320,7 @@ }, "x-ms-examples": { "CreateOrUpdate Registry with system created accounts.": { - "$ref": "./examples/Registries/createOrUpdate-SystemCreated.json" - }, - "CreateOrUpdate Registry with user created accounts.": { - "$ref": "./examples/Registries/createOrUpdate-UserCreated.json" + "$ref": "./examples/Registries/createOrUpdate.json" } }, "x-ms-long-running-operation": true, @@ -435,7 +423,7 @@ "x-nullable": true }, "userCreatedAcrAccount": { - "description": "Details of user created ACR account to be used for the Registry", + "description": "Details of user created ACR account to be used for the Registry. Not supported in most cases and will throw 400 error if provided.", "$ref": "#/definitions/UserCreatedAcrAccount", "x-nullable": true } @@ -771,7 +759,7 @@ "x-nullable": true }, "userCreatedStorageAccount": { - "description": "Details of user created storage account to be used for the registry", + "description": "Details of user created storage account to be used for the registry. Not supported in most cases and will throw 400 error if provided.", "$ref": "#/definitions/UserCreatedStorageAccount", "x-nullable": true }