From 159441200da1b918a8dae14b6e7e545779fe7cd5 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 11 Feb 2022 15:14:10 -0600 Subject: [PATCH 1/2] Removed x-ms-long-running-operation-options from MFE spec Removed from 2021-03-01-preview api version for non-POST LRO operations. Non-breaking change to fix autogenerated REST clients. --- .../preview/2021-03-01-preview/mfe.json | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json index 3555e5553b49..0b38d274ba9c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json @@ -2631,10 +2631,7 @@ "$ref": "./examples/Job/delete.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } + "x-ms-long-running-operation": true }, "get": { "tags": [ @@ -3061,10 +3058,7 @@ "$ref": "./examples/LabelingJob/createOrUpdate.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/labelingJobs/{id}/exportLabels": { @@ -3970,10 +3964,7 @@ "$ref": "./examples/OnlineEndpoint/delete.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } + "x-ms-long-running-operation": true }, "get": { "tags": [ @@ -4107,10 +4098,7 @@ "$ref": "./examples/OnlineEndpoint/update.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } + "x-ms-long-running-operation": true }, "put": { "tags": [ @@ -4191,10 +4179,7 @@ "$ref": "./examples/OnlineEndpoint/createOrUpdate.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/onlineEndpoints/{endpointName}/deployments": { @@ -4346,10 +4331,7 @@ "$ref": "./examples/OnlineDeployment/delete.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } + "x-ms-long-running-operation": true }, "get": { "tags": [ @@ -4505,10 +4487,7 @@ "$ref": "./examples/OnlineDeployment/K8sOnlineDeployment/update.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } + "x-ms-long-running-operation": true }, "put": { "tags": [ @@ -4600,10 +4579,7 @@ "$ref": "./examples/OnlineDeployment/K8sOnlineDeployment/createOrUpdate.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/onlineEndpoints/{endpointName}/deployments/{deploymentName}/getLogs": { From d90824a7e49308cc31e2a5751529612d247f457e Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 11 Feb 2022 16:34:35 -0600 Subject: [PATCH 2/2] Fixed validation errors in examples for MFE 2021-03-01-preview api version --- .../examples/BatchDeployment/createOrUpdate.json | 6 +++--- .../2021-03-01-preview/examples/BatchDeployment/get.json | 2 +- .../2021-03-01-preview/examples/BatchDeployment/list.json | 2 +- .../examples/BatchDeployment/update.json | 2 +- .../examples/BatchEndpoint/createOrUpdate.json | 8 ++++---- .../2021-03-01-preview/examples/BatchEndpoint/get.json | 4 ++-- .../2021-03-01-preview/examples/BatchEndpoint/list.json | 4 ++-- .../2021-03-01-preview/examples/BatchEndpoint/update.json | 4 ++-- .../examples/OnlineEndpoint/createOrUpdate.json | 8 ++++---- .../2021-03-01-preview/examples/OnlineEndpoint/get.json | 4 ++-- .../2021-03-01-preview/examples/OnlineEndpoint/list.json | 4 ++-- .../examples/OnlineEndpoint/update.json | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/createOrUpdate.json index e0665a3471b5..94577feb4575 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/createOrUpdate.json @@ -39,7 +39,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" @@ -110,7 +110,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" @@ -188,7 +188,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/get.json index 7b8786b625e3..38327d31c52f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/get.json @@ -44,7 +44,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/list.json index 60fd50774dd4..7035e7990d57 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/list.json @@ -45,7 +45,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/update.json index 47b43f35442c..d2a894821d07 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchDeployment/update.json @@ -51,7 +51,7 @@ "errorThreshold": 0, "retrySettings": { "maxRetries": 0, - "timeout": "string" + "timeout": "PT1M" }, "partitionKeys": [ "string" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/createOrUpdate.json index 7193dc10d7ae..4e88cb3f4115 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/createOrUpdate.json @@ -74,8 +74,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string" + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com" }, "systemData": { "createdAt": "2021-03-25T20:46:47.062Z", @@ -119,8 +119,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string" + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com" }, "systemData": { "createdAt": "2021-03-25T20:46:47.062Z", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/get.json index 48ee8272b3b9..fd0f75cfa852 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/get.json @@ -39,8 +39,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string" + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com" }, "systemData": { "createdAt": "2021-03-25T20:46:47.062Z", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/list.json index 6912243fd754..686704a35f55 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/list.json @@ -41,8 +41,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string" + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com" }, "systemData": { "createdAt": "2021-03-25T20:46:47.062Z", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/update.json index 06fab02ba585..064b83f15ec6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/BatchEndpoint/update.json @@ -46,8 +46,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string" + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com" }, "systemData": { "createdAt": "2021-03-25T20:46:47.062Z", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/createOrUpdate.json index 2c3bca23230a..3693e6a85df1 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/createOrUpdate.json @@ -75,8 +75,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string", + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com", "target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/compute123", "authMode": "AMLToken" } @@ -114,8 +114,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string", + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com", "target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/compute123", "authMode": "AMLToken" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/get.json index efffbb9b8232..9b2e6b05833d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/get.json @@ -39,8 +39,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string", + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com", "target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/compute123", "authMode": "AMLToken" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/list.json index 930030042af7..68008b825f44 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/list.json @@ -40,8 +40,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string", + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com", "target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/compute123", "authMode": "AMLToken" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/update.json index e2ef99f27303..c09a174dcf9f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/examples/OnlineEndpoint/update.json @@ -62,8 +62,8 @@ "myDeployment1": 0, "myDeployment2": 1 }, - "scoringUri": "string", - "swaggerUri": "string", + "scoringUri": "http://example.com", + "swaggerUri": "http://example.com", "target": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/computes/compute123", "authMode": "AMLToken" }