From 54779387062152a0494b37a38a713d32361b867f Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 16:34:39 -0700 Subject: [PATCH 01/20] API spec for AzureML Batch Endpoints and deployments --- .../2020-09-01-preview/batchInference.json | 790 ++++++++++++++++++ .../createOrUpdateBatchDeployment.json | 131 +++ .../examples/createOrUpdateBatchEndpoint.json | 72 ++ .../examples/getBatchDeployment.json | 58 ++ .../examples/getBatchDeployments.json | 147 ++++ .../examples/getBatchEndpoint.json | 36 + .../examples/getBatchEndpoints.json | 83 ++ .../examples/listKeysBatchEndpoints.json | 17 + 8 files changed, 1334 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json new file mode 100644 index 000000000000..93ef0d9d8262 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -0,0 +1,790 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Machine Learning Workspaces", + "description": "These APIs allow end users to operate on Azure Machine Learning Workspace resources.", + "version": "2020-12-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { + "put": { + "tags": [ + "BatchDeployment" + ], + "summary": "Creates a batch inference deployment.", + "operationId": "BatchDeployments_CreateOrUpdate", + "x-ms-examples": { + "Create or update BatchDeployment": { + "$ref": "./examples/createOrUpdateBatchDeployment.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference deployment definition object.", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + } + }, + "get": { + "tags": [ + "BatchDeployment" + ], + "summary": "Gets a batch inference deployment by id.", + "operationId": "BatchDeployments_Get", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchDeployment" + ], + "summary": "Delete Batch Inference deployment.", + "operationId": "BatchDeployments_Delete", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "API version.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { + "get": { + "tags": [ + "BatchDeployment" + ], + "summary": "Lists Batch inference deployments in the workspace.", + "operationId": "BatchDeployments_List", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/getBatchDeployment.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchDeploymentResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}": { + "put": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Creates a batch inference endpoint.", + "operationId": "BatchEndpoints_CreateOrUpdate", + "x-ms-examples": { + "Create or update BatchEndpoint": { + "$ref": "./examples/createOrUpdateBatchEndpoint.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference endpoint definition object.", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + } + }, + "get": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Gets a batch inference endpoint by name.", + "operationId": "BatchEndpoints_Get", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "Version of Azure Machine Learning resource provider API.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Delete Batch Inference Endpoint.", + "operationId": "BatchEndpoints_Delete", + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "query", + "name": "api-version", + "description": "API version.", + "type": "string" + }, + { + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "in": "path", + "name": "workspaceName", + "required": true, + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints": { + "get": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Lists Batch inference endpoint in the workspace.", + "operationId": "BatchEndpoints_List", + "x-ms-examples": { + "Get BatchEndpoint": { + "$ref": "./examples/getBatchEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "in": "query", + "name": "$skipToken", + "description": "Continuation token for pagination.", + "type": "string" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchEndpointResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/listkeys": { + "post": { + "tags": [ + "BatchEndpoint" + ], + "summary": "Lists batch Inference Endpoint keys.", + "operationId": "BatchEndpoints_ListKeys", + "x-ms-examples": { + "List Keys": { + "$ref": "./examples/listKeysBatchEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/InferenceEndpointKeysResource" + } + } + } + } + } + }, + "parameters": { + "LocationNameParameter": { + "name": "locationName", + "description": "location of Azure Machine Learning workspace.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "EndpointNameParameter": { + "name": "endpointName", + "description": "Name of the Azure Machine Learning Batch Inference endpoint.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "EndpointDeploymentIdParameter": { + "name": "deploymentId", + "description": "Identifier of the Azure Machine Learning Batch Inference Deployment.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + } + }, + "definitions": { + "BatchDeploymentResource": { + "description": "Azure Resource Manager resource Envelope", + "required": [ + "properties" + ], + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The resource URL of the entity (not URL encoded).", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the resource entity.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The resource provider and type.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/BatchDeployment" + }, + "systemData": { + "$ref": "#/definitions/SystemData" + }, + "allOf": [ + { + "$ref": "types.json#/definitions/TrackedResource" + } + ] + } + }, + "BatchDeploymentResourcePaginatedResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BatchDeploymentResource" + } + }, + "continuationToken": { + "type": "string" + }, + "nextLink": { + "type": "string" + } + } + }, + "BatchEndpointResource": { + "description": "Azure Resource Manager resource Envelope", + "required": [ + "properties" + ], + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The resource URL of the entity (not URL encoded).", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the resource entity.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The resource provider and type.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/BatchEndpoint" + }, + "systemData": { + "$ref": "#/definitions/SystemData" + }, + "allOf": [ + { + "$ref": "types.json#/definitions/TrackedResource" + } + ] + } + }, + "BatchEndpointResourcePaginatedResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BatchEndpointResource" + } + }, + "continuationToken": { + "type": "string" + }, + "nextLink": { + "type": "string" + } + } + }, + "BatchRetrySettings": { + "description": "Retry settings for a batch inference operation.", + "type": "object", + "properties": { + "maximumRetries": { + "format": "int32", + "description": "Maximum retry count for a mini-batch", + "type": "integer" + }, + "timeoutInSeconds": { + "format": "int32", + "description": "Invocation timeout for a mini-batch, in seconds.", + "type": "integer" + } + } + }, + "BatchPartitioningScheme": { + "description": "Partitioning scheme for batch inference operation.", + "type": "object", + "properties": { + "partitioningKey": { + "description": "Partition key used for Named partitioning.", + "type": "string" + }, + "miniBatchSize": { + "format": "int64", + "description": "Size of the mini-batch passed to each batch invocation.\r\nFor FileDataset, this is the number of files per mini-batch.\r\nFor TabularDataset, this is the size of the records in bytes, per mini-batch.", + "type": "integer" + } + } + }, + "BatchLoggingLevel": { + "description": "Log verbosity for batch inferencing.\r\nIncreasing verbosity order for logging is : Warning, Info and Debug\r\nDefault value is Info.", + "enum": [ + "Info", + "Warning", + "Debug" + ], + "type": "string", + "x-ms-enum": { + "name": "BatchLoggingLevel", + "modelAsString": false + } + }, + "BatchOutputAction": { + "description": "Enum to determine how batch inferencing will handle output", + "enum": [ + "SummaryOnly", + "AppendRow" + ], + "type": "string", + "x-ms-enum": { + "name": "BatchOutputAction", + "modelAsString": false + } + }, + "BatchOutputConfiguration": { + "description": "Batch inference output configuration.", + "type": "object", + "properties": { + "outputAction": { + "$ref": "#/definitions/BatchOutputAction" + }, + "appendRowFileName": { + "description": "Customized output file name for append_row output action.", + "type": "string" + } + } + }, + "BatchDeploymentSettings": { + "description": "Batch inference specific settings per deployment.", + "type": "object", + "properties": { + "computeId": { + "description": "Compute artifact Identifier", + "type": "string" + }, + "errorThreshold": { + "format": "int32", + "description": "Error threshold, if the error count for the entire input goes above this value,\r\nthe batch inference will be aborted. Range is [-1, int.MaxValue]\r\n-1 value indicates, ignore all failures during batch inference\r\nFor FileDataset count of file failures\r\nFor TabularDataset, this is the count of record failures", + "type": "integer" + }, + "retrySettings": { + "$ref": "#/definitions/BatchRetrySettings" + }, + "partitioningScheme": { + "$ref": "#/definitions/BatchPartitioningScheme" + }, + "loggingLevel": { + "$ref": "#/definitions/BatchLoggingLevel" + }, + "outputConfiguration": { + "$ref": "#/definitions/BatchOutputConfiguration" + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json new file mode 100644 index 000000000000..09ce30834aec --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -0,0 +1,131 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "deploymentId": "testBatchDeployment", + "body": { + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId" : "cluster-name", + "partitioningScheme": { + "miniBatchSize": 20 + }, + "outputConfiguration": { + "outputAction": "AppendRow" + }, + "errorThreshold": 5, + "retrySettings": { + "timeoutInSeconds": 30 + } + }, + "codeConfiguration": { + "codeArtifactId": "some code artifact", + "startupCommand": "batch_scoring.py" + }, + "environmentId": "some environment", + "properties": { + "description": "string" + }, + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json new file mode 100644 index 000000000000..ff7fab0d242e --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "body": { + "location": "westus2euap", + "tags": {}, + "properties": { + "name": "test9301", + "description": "Testing pipeline endpoint creation", + "authMode": "AMLTokenAuth", + "trafficRoute": "{'testDeployment1': 100, 'testDeployment2': 0}", + "computeConfiguration": { + "computeType": "AMLCompute" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json new file mode 100644 index 000000000000..7bd3d6ef3cfa --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -0,0 +1,58 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", + "name": "testBatchDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json new file mode 100644 index 000000000000..622fdaf62039 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -0,0 +1,147 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment1", + "name": "testBatchDeployment1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment2", + "name": "testBatchDeployment2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment3", + "name": "testBatchDeployment3", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", + "location": "westus2euap", + "tags": {}, + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "batchSettings": { + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } + }, + "description": "Testing deployment creation", + "properties": { + "description": "string" + }, + "modelId": "some model", + "codeConfiguration": { + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] + }, + "environmentId": "some environment", + "provisioningState": "Succeeded", + } + } + ], + "nextLink": "nextLink" + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json new file mode 100644 index 000000000000..1f89d7c0f332 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName", + "name": "testBatchEndpoint", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json new file mode 100644 index 000000000000..46eb5633602c --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -0,0 +1,83 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName1", + "name": "testBatchEndpoint1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName2", + "name": "testBatchEndpoint2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName3", + "name": "testBatchEndpoint3", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints", + "location": "westus2euap", + "tags": {}, + "properties": { + "status": "NotStarted", + "authMode": "AMLTokenAuth", + "provisioningState": "Succeeded", + "trafficRoute": { + "testDeployment1": 100, + "testDeployment2": 0 + }, + "computeConfiguration": { + "computeType": "AMLCompute" + }, + "properties": { + "description": "Testing pipeline endpoint creation" + } + } + } + ], + "nextLink": "nextLink" + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json new file mode 100644 index 000000000000..ce3252cac832 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "primaryKey": "primary key value...", + "secondaryKey": "secondary key value...", + } + } +} From 00abc20bbfe0cf850656775f62d640a3c539d287 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 16:43:28 -0700 Subject: [PATCH 02/20] Update readme --- .../preview/2020-09-01-preview/batchInference.json | 10 ---------- .../machinelearningservices/resource-manager/readme.md | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 93ef0d9d8262..ce60f204eb1b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -613,11 +613,6 @@ "systemData": { "$ref": "#/definitions/SystemData" }, - "allOf": [ - { - "$ref": "types.json#/definitions/TrackedResource" - } - ] } }, "BatchDeploymentResourcePaginatedResult": { @@ -666,11 +661,6 @@ "systemData": { "$ref": "#/definitions/SystemData" }, - "allOf": [ - { - "$ref": "types.json#/definitions/TrackedResource" - } - ] } }, "BatchEndpointResourcePaginatedResult": { diff --git a/specification/machinelearningservices/resource-manager/readme.md b/specification/machinelearningservices/resource-manager/readme.md index af746a0266f1..71d26044005e 100644 --- a/specification/machinelearningservices/resource-manager/readme.md +++ b/specification/machinelearningservices/resource-manager/readme.md @@ -117,6 +117,7 @@ These settings apply only when `--tag=package-2020-09-01-preview` is specified o ``` yaml $(tag) == 'package-2020-09-01-preview' input-file: - Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +- Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json ``` ### Tag: package-2020-05-01-preview From 4719434847c1d5fddf3c40a35f0b57da24533520 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Fri, 2 Oct 2020 22:44:00 -0700 Subject: [PATCH 03/20] Fix validation errors --- .../2020-09-01-preview/batchInference.json | 16 ++++++++++++--- .../createOrUpdateBatchDeployment.json | 9 +++++---- .../examples/deleteBatchDeployment.json | 20 +++++++++++++++++++ .../examples/deleteBatchEndpoint.json | 19 ++++++++++++++++++ .../examples/getBatchDeployment.json | 3 +-- .../examples/getBatchDeployments.json | 6 +++--- .../examples/getBatchEndpoint.json | 1 - .../examples/listKeysBatchEndpoints.json | 6 +++--- 8 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index ce60f204eb1b..414c803829fa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -167,6 +167,11 @@ ], "summary": "Delete Batch Inference deployment.", "operationId": "BatchDeployments_Delete", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/deleteBatchDeployment.json" + } + }, "produces": [ "text/plain", "application/json", @@ -255,7 +260,7 @@ "name": "api-version", "description": "Version of Azure Machine Learning resource provider API.", "type": "string" - }, + } ], "responses": { "default": { @@ -403,6 +408,11 @@ ], "summary": "Delete Batch Inference Endpoint.", "operationId": "BatchEndpoints_Delete", + "x-ms-examples": { + "Get BatchDeployment": { + "$ref": "./examples/deleteBatchEndpoint.json" + } + }, "produces": [ "text/plain", "application/json", @@ -612,7 +622,7 @@ }, "systemData": { "$ref": "#/definitions/SystemData" - }, + } } }, "BatchDeploymentResourcePaginatedResult": { @@ -660,7 +670,7 @@ }, "systemData": { "$ref": "#/definitions/SystemData" - }, + } } }, "BatchEndpointResourcePaginatedResult": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 09ce30834aec..f3e1fd33afac 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -33,7 +33,7 @@ "environmentId": "some environment", "properties": { "description": "string" - }, + } } } }, @@ -79,9 +79,10 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } - }, + } + }, "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment", @@ -123,7 +124,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json new file mode 100644 index 000000000000..9b17cb1540ba --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", + "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." + } + }, + "204": {} + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json new file mode 100644 index 000000000000..60eb65e37b95 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", + "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." + } + }, + "204": {} + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json index 7bd3d6ef3cfa..97bb98792e7e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -3,7 +3,6 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", "deploymentId": "testBatchDeployment", "api-version": "2020-12-01-preview" @@ -50,7 +49,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json index 622fdaf62039..519755b773bb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -50,7 +50,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } }, { @@ -93,7 +93,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } }, { @@ -136,7 +136,7 @@ ] }, "environmentId": "some environment", - "provisioningState": "Succeeded", + "provisioningState": "Succeeded" } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index 1f89d7c0f332..ebdf4c342ab6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -3,7 +3,6 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", - "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", "api-version": "2020-12-01-preview" }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json index ce3252cac832..da4bd2db7c83 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json @@ -4,14 +4,14 @@ "resourceGroupName": "resourceGroup-1234", "workspaceName": "testworkspace", "api-version": "2020-09-01-preview", - "endpointName": "testBatchEndpoint", - "api-version": "2020-12-01-preview" + "endpointName": "testBatchEndpoint" }, "responses": { "200": { "body": { "primaryKey": "primary key value...", - "secondaryKey": "secondary key value...", + "secondaryKey": "secondary key value..." } + } } } From 9bfaf746e3273318433ac1d2e8a332590606c1d7 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 00:19:17 -0700 Subject: [PATCH 04/20] Validation fixes --- .../2020-09-01-preview/batchInference.json | 249 +++++++++++++++++- .../createOrUpdateBatchDeployment.json | 114 ++++---- .../examples/deleteBatchDeployment.json | 2 +- .../examples/deleteBatchEndpoint.json | 2 +- .../examples/getBatchDeployment.json | 46 ++-- .../examples/getBatchDeployments.json | 134 +++++----- .../examples/getBatchEndpoint.json | 2 +- .../examples/getBatchEndpoints.json | 2 +- ...points.json => listKeysBatchEndpoint.json} | 0 9 files changed, 388 insertions(+), 163 deletions(-) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/{listKeysBatchEndpoints.json => listKeysBatchEndpoint.json} (100%) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 414c803829fa..8764e104bf40 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -86,7 +86,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -150,7 +150,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -213,7 +213,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -266,7 +266,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -330,7 +330,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -391,7 +391,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -451,7 +451,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -501,7 +501,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -554,7 +554,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, "200": { @@ -621,7 +621,7 @@ "$ref": "#/definitions/BatchDeployment" }, "systemData": { - "$ref": "#/definitions/SystemData" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -669,7 +669,7 @@ "$ref": "#/definitions/BatchEndpoint" }, "systemData": { - "$ref": "#/definitions/SystemData" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -759,6 +759,231 @@ } } }, + "InferenceEndpointKeysResource": { + "description": "Inference endpoint keys.", + "type": "object", + "properties": { + "primaryKey": { + "description": "Primary key.", + "type": "string" + }, + "secondaryKey": { + "description": "Secondary key.", + "type": "string" + } + } + }, + "DeploymentScaleSettings": { + "type": "object", + "properties": { + "nodeCount": { + "format": "int32", + "description": "Number of Compute nodes to be used for running the deployment", + "type": "integer" + } + } + }, + "DeploymentProvisioningState": { + "enum": [ + "Creating", + "Deleting", + "Scaling", + "Updating", + "Succeeded", + "Failed" + ], + "type": "string", + "x-ms-enum": { + "name": "DeploymentProvisioningState", + "modelAsString": false + } + }, + "EndpointProvisioningState": { + "description": "State of endpoint provisioning.", + "enum": [ + "Creating", + "Deleting", + "Succeeded", + "Failed" + ], + "type": "string", + "x-ms-enum": { + "name": "EndpointProvisioningState", + "modelAsString": false + } + }, + "EndpointAuthModeType": { + "enum": [ + "AMLTokenAuth", + "KeyAuth" + ], + "type": "string", + "x-ms-enum": { + "name": "EndpointAuthModeType", + "modelAsString": false + } + }, + "BatchDeployment": { + "description": "Batch inference settings per deployment.", + "type": "object", + "properties": { + "scaleSettings": { + "$ref": "#/definitions/DeploymentScaleSettings" + }, + "batchSettings": { + "$ref": "#/definitions/BatchDeploymentSettings" + }, + "tags": { + "description": "Tag dictionary. Tags can be added, removed, and updated.", + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "create", + "read", + "update" + ] + }, + "description": { + "description": "Description of the endpoint deployment.", + "type": "string" + }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "modelId": { + "description": "Model identifier.", + "type": "string" + }, + "codeConfiguration": { + "$ref": "#/definitions/CodeConfiguration" + }, + "environmentId": { + "description": "Environment specification for the endpoint deployment.", + "type": "string" + }, + "provisioningState": { + "$ref": "#/definitions/DeploymentProvisioningState" + } + } + }, + "CommandType": { + "enum": [ + "Command", + "Python" + ], + "type": "string", + "x-ms-enum": { + "name": "CommandType", + "modelAsString": false + } + }, + "BatchEndpoint": { + "description": "Batch endpoint configuration", + "type": "object", + "properties": { + "tags": { + "description": "Tag dictionary. Tags can be added, removed, and updated.", + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "create", + "read", + "update" + ] + }, + "description": { + "description": "Description of the inference endpoint.", + "type": "string" + }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "trafficRules": { + "description": "Traffic rules on how the traffic will be routed across deployments.", + "type": "object", + "additionalProperties": { + "format": "int32", + "type": "integer" + } + }, + "computeConfiguration": { + "$ref": "#/definitions/ComputeConfiguration" + }, + "provisioningState": { + "$ref": "#/definitions/EndpointProvisioningState" + }, + "endpoint": { + "format": "uri", + "description": "Endpoint URI", + "type": "string", + "readOnly": true + }, + "swaggerEndpoint": { + "format": "uri", + "description": "Endpoint Swagger URI", + "type": "string", + "readOnly": true + }, + "authMode": { + "$ref": "#/definitions/EndpointAuthModeType" + } + } + }, + "CodeConfiguration": { + "required": [ + "command" + ], + "type": "object", + "properties": { + "commandType": { + "$ref": "#/definitions/CommandType" + }, + "codeArtifactId": { + "description": "The ID of the code asset.", + "type": "string" + }, + "command": { + "description": "The command to execute on startup of the job.", + "minLength": 1, + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ComputeType": { + "enum": [ + "AMLCompute", + "AKS", + "ACI" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeType", + "modelAsString": false + } + }, + "ComputeConfiguration": { + "type": "object", + "properties": { + "computeType": { + "$ref": "#/definitions/ComputeType" + } + } + }, "BatchDeploymentSettings": { "description": "Batch inference specific settings per deployment.", "type": "object", @@ -787,4 +1012,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index f3e1fd33afac..4c01c8693ed7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -11,20 +11,20 @@ "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId" : "cluster-name", - "partitioningScheme": { - "miniBatchSize": 20 - }, - "outputConfiguration": { - "outputAction": "AppendRow" - }, - "errorThreshold": 5, - "retrySettings": { - "timeoutInSeconds": 30 - } + "computeId": "cluster-name", + "partitioningScheme": { + "miniBatchSize": 20 + }, + "outputConfiguration": { + "outputAction": "AppendRow" + }, + "errorThreshold": 5, + "retrySettings": { + "timeoutInSeconds": 30 + } }, "codeConfiguration": { "codeArtifactId": "some code artifact", @@ -44,27 +44,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -72,11 +72,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -89,27 +89,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -117,11 +117,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -129,4 +129,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json index 9b17cb1540ba..ed0a227a2907 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json index 60eb65e37b95..e643ed287946 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json index 97bb98792e7e..817f84d77493 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployment.json @@ -14,27 +14,27 @@ "name": "testBatchDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -42,11 +42,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -54,4 +54,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json index 519755b773bb..911260591bb9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchDeployments.json @@ -15,27 +15,27 @@ "name": "testBatchDeployment1", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -43,11 +43,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -58,27 +58,27 @@ "name": "testBatchDeployment2", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -86,11 +86,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -101,27 +101,27 @@ "name": "testBatchDeployment3", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments", "location": "westus2euap", - "tags": {}, + "tags": {}, "properties": { "scaleSettings": { - "nodeCount": 1 + "nodeCount": 1 }, "batchSettings": { - "computeId": "some compute", - "errorThreshold": 5, - "retrySettings": { - "maximumRetries": 0, - "timeoutInSeconds": 30 - }, - "partitioningScheme": { - "partitioningKey": null, - "miniBatchSize": 20 - }, - "loggingLevel": "Info", - "outputConfiguration": { - "outputAction": "AppendRow", - "appendRowFileName": null - } + "computeId": "some compute", + "errorThreshold": 5, + "retrySettings": { + "maximumRetries": 0, + "timeoutInSeconds": 30 + }, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "loggingLevel": "Info", + "outputConfiguration": { + "outputAction": "AppendRow", + "appendRowFileName": null + } }, "description": "Testing deployment creation", "properties": { @@ -129,11 +129,11 @@ }, "modelId": "some model", "codeConfiguration": { - "commandType": "Command", - "codeArtifactId": "some code artifact", - "command": [ - "batch_scoring.py" - ] + "commandType": "Command", + "codeArtifactId": "some code artifact", + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "provisioningState": "Succeeded" @@ -144,4 +144,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index ebdf4c342ab6..71dde26d754d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json index 46eb5633602c..b180d6d76bc1 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -80,4 +80,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json similarity index 100% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoints.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/listKeysBatchEndpoint.json From 7419faa809a73baee5e7e01606f5b6a79f97e545 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 18:12:10 -0700 Subject: [PATCH 05/20] Fix validation errors --- .../2020-09-01-preview/batchInference.json | 39 ++++++++++++++++--- .../createOrUpdateBatchDeployment.json | 5 +-- .../examples/createOrUpdateBatchEndpoint.json | 2 +- .../examples/deleteBatchDeployment.json | 6 --- .../examples/deleteBatchEndpoint.json | 6 --- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 8764e104bf40..9d3657b94ae3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -168,7 +168,7 @@ "summary": "Delete Batch Inference deployment.", "operationId": "BatchDeployments_Delete", "x-ms-examples": { - "Get BatchDeployment": { + "Delete BatchDeployment": { "$ref": "./examples/deleteBatchDeployment.json" } }, @@ -218,6 +218,9 @@ }, "200": { "description": "Success" + }, + "204": { + "description": "Success" } } } @@ -230,8 +233,8 @@ "summary": "Lists Batch inference deployments in the workspace.", "operationId": "BatchDeployments_List", "x-ms-examples": { - "Get BatchDeployment": { - "$ref": "./examples/getBatchDeployment.json" + "Get BatchDeployments": { + "$ref": "./examples/getBatchDeployments.json" } }, "produces": [ @@ -353,6 +356,11 @@ ], "summary": "Gets a batch inference endpoint by name.", "operationId": "BatchEndpoints_Get", + "x-ms-examples": { + "Get BatchEndpoint": { + "$ref": "./examples/getBatchEndpoint.json" + } + }, "produces": [ "text/plain", "application/json", @@ -409,7 +417,7 @@ "summary": "Delete Batch Inference Endpoint.", "operationId": "BatchEndpoints_Delete", "x-ms-examples": { - "Get BatchDeployment": { + "Delete BatchEndpoint": { "$ref": "./examples/deleteBatchEndpoint.json" } }, @@ -456,6 +464,9 @@ }, "200": { "description": "Success" + }, + "204": { + "description": "Success" } } } @@ -468,8 +479,8 @@ "summary": "Lists Batch inference endpoint in the workspace.", "operationId": "BatchEndpoints_List", "x-ms-examples": { - "Get BatchEndpoint": { - "$ref": "./examples/getBatchEndpoint.json" + "Get BatchEndpoints": { + "$ref": "./examples/getBatchEndpoints.json" } }, "produces": [ @@ -599,6 +610,11 @@ "required": [ "properties" ], + "allOf": [ + { + "$ref": "machineLearningServices.json#/definitions/Resource" + } + ], "type": "object", "x-ms-azure-resource": true, "properties": { @@ -620,6 +636,17 @@ "properties": { "$ref": "#/definitions/BatchDeployment" }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 4c01c8693ed7..3bc0cebb35c4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -6,7 +6,7 @@ "api-version": "2020-09-01-preview", "endpointName": "testEndpointName", "deploymentId": "testBatchDeployment", - "body": { + "properties": { "location": "westus2euap", "tags": {}, "properties": { @@ -27,8 +27,7 @@ } }, "codeConfiguration": { - "codeArtifactId": "some code artifact", - "startupCommand": "batch_scoring.py" + "command": ["batch_scoring.py"] }, "environmentId": "some environment", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json index ff7fab0d242e..a0b83d07f86b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -5,7 +5,7 @@ "workspaceName": "testworkspace", "api-version": "2020-09-01-preview", "endpointName": "testBatchEndpoint", - "body": { + "properties": { "location": "westus2euap", "tags": {}, "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json index ed0a227a2907..af642589108e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchDeployment.json @@ -9,12 +9,6 @@ }, "responses": { "200": {}, - "202": { - "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", - "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." - } - }, "204": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json index e643ed287946..ae1161f741dc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchEndpoint.json @@ -8,12 +8,6 @@ }, "responses": { "200": {}, - "202": { - "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...", - "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..." - } - }, "204": {} } } From 543f78eda4da7f99a6fc1ba88c0f92b680072f2b Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 22:24:18 -0700 Subject: [PATCH 06/20] Validation fixes part 2 --- .../2020-09-01-preview/batchInference.json | 47 +++++++++++++------ .../createOrUpdateBatchDeployment.json | 4 +- .../examples/createOrUpdateBatchEndpoint.json | 8 ++-- .../examples/getBatchEndpoint.json | 3 +- .../examples/getBatchEndpoints.json | 9 ++-- 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 9d3657b94ae3..a2f2127c1871 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -674,6 +674,11 @@ "required": [ "properties" ], + "allOf": [ + { + "$ref": "machineLearningServices.json#/definitions/Resource" + } + ], "type": "object", "x-ms-azure-resource": true, "properties": { @@ -695,6 +700,17 @@ "properties": { "$ref": "#/definitions/BatchEndpoint" }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -991,25 +1007,28 @@ } } }, - "ComputeType": { - "enum": [ - "AMLCompute", - "AKS", - "ACI" - ], - "type": "string", - "x-ms-enum": { - "name": "ComputeType", - "modelAsString": false - } - }, "ComputeConfiguration": { + "description": "Compute Configuration of the endpoint.", "type": "object", + "required": [ + "computeType" + ], "properties": { "computeType": { - "$ref": "#/definitions/ComputeType" + "enum": [ + "ACI", + "AKS", + "AMLCompute" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeConfigurationType", + "modelAsString": true + }, + "description": "Compute Configuration type such as ACI, AKS, or AMLCompute" } - } + }, + "discriminator": "computeType" }, "BatchDeploymentSettings": { "description": "Batch inference specific settings per deployment.", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json index 3bc0cebb35c4..b8de6569d3f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchDeployment.json @@ -27,7 +27,9 @@ } }, "codeConfiguration": { - "command": ["batch_scoring.py"] + "command": [ + "batch_scoring.py" + ] }, "environmentId": "some environment", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json index a0b83d07f86b..115a17f407b4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchEndpoint.json @@ -12,7 +12,7 @@ "name": "test9301", "description": "Testing pipeline endpoint creation", "authMode": "AMLTokenAuth", - "trafficRoute": "{'testDeployment1': 100, 'testDeployment2': 0}", + "trafficRules": "{'testDeployment1': 100, 'testDeployment2': 0}", "computeConfiguration": { "computeType": "AMLCompute" } @@ -28,10 +28,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -52,10 +51,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json index 71dde26d754d..bea57cd9cb57 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoint.json @@ -15,10 +15,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json index b180d6d76bc1..70947630b075 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchEndpoints.json @@ -16,10 +16,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -38,10 +37,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, @@ -60,10 +58,9 @@ "location": "westus2euap", "tags": {}, "properties": { - "status": "NotStarted", "authMode": "AMLTokenAuth", "provisioningState": "Succeeded", - "trafficRoute": { + "trafficRules": { "testDeployment1": 100, "testDeployment2": 0 }, From 81fd25c6049aa064dbefafbfde78854518a721b7 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 23:03:06 -0700 Subject: [PATCH 07/20] Fix spec errors --- .../2020-09-01-preview/batchInference.json | 111 +++++------------- 1 file changed, 27 insertions(+), 84 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index a2f2127c1871..3f1a6f108aba 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -109,6 +109,11 @@ ], "summary": "Gets a batch inference deployment by id.", "operationId": "BatchDeployments_Get", + "x-ms-examples": { + "Create or update BatchDeployment": { + "$ref": "./examples/getBatchDeployment.json" + } + }, "produces": [ "text/plain", "application/json", @@ -116,34 +121,22 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "#/parameters/EndpointDeploymentIdParameter" }, { - "$ref": "#/parameters/EndpointDeploymentIdParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -179,34 +172,22 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "#/parameters/EndpointDeploymentIdParameter" }, { - "$ref": "#/parameters/EndpointDeploymentIdParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "API version.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -257,12 +238,6 @@ }, { "$ref": "#/parameters/EndpointNameParameter" - }, - { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" } ], "responses": { @@ -368,31 +343,19 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "Version of Azure Machine Learning resource provider API.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -428,31 +391,19 @@ ], "parameters": [ { - "$ref": "#/parameters/EndpointNameParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { - "in": "query", - "name": "api-version", - "description": "API version.", - "type": "string" + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, { - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" }, { - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" }, { - "in": "path", - "name": "workspaceName", - "required": true, - "type": "string" + "$ref": "#/parameters/EndpointNameParameter" } ], "responses": { @@ -646,9 +597,6 @@ "additionalProperties": { "type": "string" } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -710,9 +658,6 @@ "additionalProperties": { "type": "string" } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -968,13 +913,11 @@ "$ref": "#/definitions/EndpointProvisioningState" }, "endpoint": { - "format": "uri", "description": "Endpoint URI", "type": "string", "readOnly": true }, "swaggerEndpoint": { - "format": "uri", "description": "Endpoint Swagger URI", "type": "string", "readOnly": true From 8df3726a5657b41ae2b37e87ca10505d36fe9265 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Sat, 3 Oct 2020 23:31:15 -0700 Subject: [PATCH 08/20] Fix version --- .../preview/2020-09-01-preview/batchInference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 3f1a6f108aba..7c5121b6992c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Machine Learning Workspaces", "description": "These APIs allow end users to operate on Azure Machine Learning Workspace resources.", - "version": "2020-12-01-preview" + "version": "2020-09-01-preview" }, "host": "management.azure.com", "schemes": [ From 42a3585bc8a477e8a4fbd5d50eeb52540474e3f2 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 8 Oct 2020 23:46:07 -0700 Subject: [PATCH 09/20] PR feedback from ARM API review --- .../2020-09-01-preview/batchInference.json | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 7c5121b6992c..86cc680427fc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -41,6 +41,7 @@ ], "summary": "Creates a batch inference deployment.", "operationId": "BatchDeployments_CreateOrUpdate", + "x-ms-long-running-operation": true, "x-ms-examples": { "Create or update BatchDeployment": { "$ref": "./examples/createOrUpdateBatchDeployment.json" @@ -266,6 +267,7 @@ ], "summary": "Creates a batch inference endpoint.", "operationId": "BatchEndpoints_CreateOrUpdate", + "x-ms-long-running-operation": true, "x-ms-examples": { "Create or update BatchEndpoint": { "$ref": "./examples/createOrUpdateBatchEndpoint.json" @@ -821,18 +823,6 @@ "batchSettings": { "$ref": "#/definitions/BatchDeploymentSettings" }, - "tags": { - "description": "Tag dictionary. Tags can be added, removed, and updated.", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "create", - "read", - "update" - ] - }, "description": { "description": "Description of the endpoint deployment.", "type": "string" @@ -875,18 +865,6 @@ "description": "Batch endpoint configuration", "type": "object", "properties": { - "tags": { - "description": "Tag dictionary. Tags can be added, removed, and updated.", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "create", - "read", - "update" - ] - }, "description": { "description": "Description of the inference endpoint.", "type": "string" From 3fb57a515c5cc8a4b97ef7cf83d0254f5e4b2974 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 00:02:33 -0800 Subject: [PATCH 10/20] Batch job deployments --- package-lock.json | 2279 +++++++++++------ package.json | 2 +- .../2020-09-01-preview/batchInference.json | 540 +++- .../examples/createBatchJobDeployment.json | 52 + .../examples/deleteBatchJobDeployment.json | 15 + .../examples/getBatchJobDeployment.json | 37 + .../examples/getBatchJobDeployments.json | 63 + .../examples/operationsList.json | 25 + .../examples/updateBatchJobDeployment.json | 49 + 9 files changed, 2306 insertions(+), 756 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json diff --git a/package-lock.json b/package-lock.json index 47e96443676a..3c71257dda88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,9 +24,9 @@ } }, "@azure/oad": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@azure/oad/-/oad-0.8.1.tgz", - "integrity": "sha512-Xl5vTMkfPkv0wVUgbvfITpaV07o6RIPOWpyPcCiZgQpkpfc0vsSh4SK3K4JSJ44z4BXTOhCSmkYgv/Zvtq/vSQ==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@azure/oad/-/oad-0.8.4.tgz", + "integrity": "sha512-s1NQ+YQvwudU4+8zjzjBS7OOByU2NcBcUxOxNFTNP6N7MDaWHHckCOFAJYJF+H83lGqNa6IGdBSjZsCfZwCZpw==", "dev": true, "requires": { "@ts-common/fs": "^0.2.0", @@ -35,16 +35,23 @@ "@ts-common/json-parser": "^0.9.0", "@ts-common/source-map": "^0.5.0", "@ts-common/string-map": "^0.3.0", + "acorn": "^5.7.4", "autorest": "^2.0.4407", "glob": "^7.1.3", + "handlebars": "^4.5.3", "js-yaml": "^3.13.1", "json-pointer": "^0.6.0", "json-refs": "^3.0.13", + "kind-of": "^6.0.3", + "lodash": "^4.17.20", + "minimist": "^1.2.3", "request": "^2.88.0", + "set-value": "^2.0.1", "source-map": "^0.7.3", "tslib": "^1.9.3", "winston": "^2.3.0", - "yargs": "^13.2.2" + "yargs": "^13.2.2", + "yargs-parser": "^13.1.2" }, "dependencies": { "@ts-common/json-parser": { @@ -60,6 +67,12 @@ "@ts-common/string-map": "^0.3.0", "tslib": "^1.9.3" } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true } } }, @@ -93,21 +106,21 @@ } }, "@azure/rest-api-specs-scripts": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@azure/rest-api-specs-scripts/-/rest-api-specs-scripts-0.10.2.tgz", - "integrity": "sha512-g7W4eSvbn2q5wOF0FCj2lZ2yXuASfmIsZoib8ms4LXfixnA8CL2uW4XiVUvx2KzdW1RCCdjgh5n+LfCywLe4jw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@azure/rest-api-specs-scripts/-/rest-api-specs-scripts-0.14.0.tgz", + "integrity": "sha512-5V2KidA4lEx2ARpEw3fCJ04sQJfUfSM28pOVbTqVy3RvOhVHnG4LUfw/CgzCz1OzmxBuwt2hFJWORHxAxKgLSw==", "dev": true, "requires": { "@azure/avocado": "^0.4.1", "@azure/oad": "^0.8.1", - "@azure/swagger-validation-common": "^0.0.2", + "@azure/swagger-validation-common": "^0.1.2", "@octokit/rest": "^16.42.0", "@ts-common/string-map": "^0.3.0", "commonmark": "0.27.0", "fs-extra": "^7.0.1", "glob": "^7.1.3", "js-yaml": "^3.13.1", - "oav": "^0.21.6", + "oav": "^0.22.9", "request": "^2.88.0" }, "dependencies": { @@ -131,14 +144,14 @@ }, "dependencies": { "commonmark": { - "version": "0.29.1", - "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.29.1.tgz", - "integrity": "sha512-DafPdNYFXoEhsSiR4O+dJ45UJBfDL4cBTks4B+agKiaWt7qjG0bIhg5xuCE0RqU71ikJcBIf4/sRHh9vYQVF8Q==", + "version": "0.29.3", + "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.29.3.tgz", + "integrity": "sha512-fvt/NdOFKaL2gyhltSy6BC4LxbbxbnPxBMl923ittqO/JBM0wQHaoYZliE4tp26cRxX/ZZtRsJlZzQrVdUkXAA==", "dev": true, "requires": { - "entities": "~1.1.1", + "entities": "~2.0", "mdurl": "~1.0.1", - "minimist": "~1.2.0", + "minimist": ">=1.2.2", "string.prototype.repeat": "^0.2.0" } } @@ -154,14 +167,340 @@ "mdurl": "~ 1.0.1", "minimist": "~ 1.2.0", "string.prototype.repeat": "^0.2.0" + }, + "dependencies": { + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", + "dev": true + } } + }, + "entities": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", + "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", + "dev": true } } }, "@azure/swagger-validation-common": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@azure/swagger-validation-common/-/swagger-validation-common-0.0.2.tgz", - "integrity": "sha512-/OTgP3USqq2Cko6vzDgmODpqGjk9eTANYMBMXtgsTgh9RtR6b3HZdQTPe5dqkqes/YoIBW8IarJ0B0HucAv1+A==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@azure/swagger-validation-common/-/swagger-validation-common-0.1.2.tgz", + "integrity": "sha512-QjmSpAliTzc77WTCnm3+zS2qVGv5U9/2h2y1ICZKQp5+0JSMcy3dPbS9WiKKkpsGQ2b1BJbDugJqKVg6a+8AeA==", + "dev": true + }, + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/core": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz", + "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helpers": "^7.12.5", + "@babel/parser": "^7.12.10", + "@babel/template": "^7.12.7", + "@babel/traverse": "^7.12.10", + "@babel/types": "^7.12.10", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz", + "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==", + "dev": true, + "requires": { + "@babel/types": "^7.12.11", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz", + "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.12.10", + "@babel/template": "^7.12.7", + "@babel/types": "^7.12.11" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", + "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", + "dev": true, + "requires": { + "@babel/types": "^7.12.10" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", + "dev": true, + "requires": { + "@babel/types": "^7.12.7" + } + }, + "@babel/helper-module-imports": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5" + } + }, + "@babel/helper-module-transforms": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "lodash": "^4.17.19" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz", + "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==", + "dev": true, + "requires": { + "@babel/types": "^7.12.10" + } + }, + "@babel/helper-replace-supers": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz", + "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.12.7", + "@babel/helper-optimise-call-expression": "^7.12.10", + "@babel/traverse": "^7.12.10", + "@babel/types": "^7.12.11" + } + }, + "@babel/helper-simple-access": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", + "dev": true, + "requires": { + "@babel/types": "^7.12.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz", + "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==", + "dev": true, + "requires": { + "@babel/types": "^7.12.11" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", + "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz", + "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==", + "dev": true + }, + "@babel/template": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", + "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7" + } + }, + "@babel/traverse": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz", + "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.10", + "@babel/types": "^7.12.10", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } + } + }, + "@babel/types": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz", + "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "@dabh/diagnostics": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz", + "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==", + "dev": true, + "requires": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", "dev": true }, "@microsoft.azure/autorest-extension-base": { @@ -190,36 +529,45 @@ "dev": true }, "@octokit/auth-token": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz", - "integrity": "sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz", + "integrity": "sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==", "dev": true, "requires": { - "@octokit/types": "^4.0.1" + "@octokit/types": "^6.0.0" } }, "@octokit/endpoint": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.2.tgz", - "integrity": "sha512-xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz", + "integrity": "sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==", "dev": true, "requires": { - "@octokit/types": "^4.0.1", - "is-plain-object": "^3.0.0", - "universal-user-agent": "^5.0.0" + "@octokit/types": "^6.0.0", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" }, "dependencies": { - "universal-user-agent": { + "is-plain-object": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", - "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", - "dev": true, - "requires": { - "os-name": "^3.1.0" - } + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true + }, + "universal-user-agent": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", + "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", + "dev": true } } }, + "@octokit/openapi-types": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.0.tgz", + "integrity": "sha512-J4bfM7lf8oZvEAdpS71oTvC1ofKxfEZgU5vKVwzZKi4QPiL82udjpseJwxPid9Pu2FNmyRQOX4iEj6W1iOSnPw==", + "dev": true + }, "@octokit/plugin-paginate-rest": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz", @@ -241,9 +589,9 @@ } }, "@octokit/plugin-request-log": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz", - "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz", + "integrity": "sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==", "dev": true }, "@octokit/plugin-rest-endpoint-methods": { @@ -268,40 +616,43 @@ } }, "@octokit/request": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.4.tgz", - "integrity": "sha512-vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ==", + "version": "5.4.12", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz", + "integrity": "sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==", "dev": true, "requires": { "@octokit/endpoint": "^6.0.1", "@octokit/request-error": "^2.0.0", - "@octokit/types": "^4.0.1", + "@octokit/types": "^6.0.3", "deprecation": "^2.0.0", - "is-plain-object": "^3.0.0", - "node-fetch": "^2.3.0", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.1", "once": "^1.4.0", - "universal-user-agent": "^5.0.0" + "universal-user-agent": "^6.0.0" }, "dependencies": { "@octokit/request-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz", - "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz", + "integrity": "sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==", "dev": true, "requires": { - "@octokit/types": "^4.0.1", + "@octokit/types": "^6.0.0", "deprecation": "^2.0.0", "once": "^1.4.0" } }, - "universal-user-agent": { + "is-plain-object": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", - "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", - "dev": true, - "requires": { - "os-name": "^3.1.0" - } + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true + }, + "universal-user-agent": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", + "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", + "dev": true } } }, @@ -328,9 +679,9 @@ } }, "@octokit/rest": { - "version": "16.43.1", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz", - "integrity": "sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==", + "version": "16.43.2", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz", + "integrity": "sha512-ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==", "dev": true, "requires": { "@octokit/auth-token": "^2.4.0", @@ -352,11 +703,12 @@ } }, "@octokit/types": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.4.tgz", - "integrity": "sha512-W+aHUBA6pEZ8OC1fgfFW1/jrgtkaMVBhNr7jhhBErvbWQY4Ii9Hlf3LAurwcy5XXjz8EYluiCZjHhnQO4GSfNg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.1.1.tgz", + "integrity": "sha512-btm3D6S7VkRrgyYF31etUtVY/eQ1KzrNRqhFt25KSe2mKlXuLXJilglRC6eDA2P6ou94BUnk/Kz5MPEolXgoiw==", "dev": true, "requires": { + "@octokit/openapi-types": "^2.0.0", "@types/node": ">= 8" } }, @@ -502,19 +854,12 @@ "integrity": "sha512-7koSjp08QxKoS1/+3T15+kD7+vqOUvZRHvM8PutF3Xsk5aAEkdlIGRsHJ3/XsC3izoqTwBdRW/vH7rzCKkIicA==", "dev": true }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { - "@types/events": "*", "@types/minimatch": "*", "@types/node": "*" } @@ -571,9 +916,9 @@ "dev": true }, "abab": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", - "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", "dev": true }, "abbrev": { @@ -599,9 +944,9 @@ }, "dependencies": { "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true } } @@ -612,10 +957,20 @@ "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", "dev": true }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -652,6 +1007,21 @@ "color-convert": "^1.9.0" } }, + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "requires": { + "default-require-extensions": "^3.0.0" + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "dev": true + }, "arg": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz", @@ -785,9 +1155,9 @@ "dev": true }, "aws4": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", - "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "balanced-match": { @@ -848,12 +1218,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, @@ -898,23 +1262,6 @@ "snapdragon-node": "^2.0.1", "split-string": "^3.0.2", "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "browser-process-hrtime": { @@ -956,14 +1303,18 @@ "to-object-path": "^0.3.0", "union-value": "^1.0.0", "unset-value": "^1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } + } + }, + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "requires": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" } }, "call-me-maybe": { @@ -1032,15 +1383,15 @@ "requires": { "is-descriptor": "^0.1.0" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, "cliui": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", @@ -1061,23 +1412,6 @@ "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", "shallow-clone": "^3.0.0" - }, - "dependencies": { - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "code-point-at": { @@ -1122,21 +1456,15 @@ "dev": true }, "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", + "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", "dev": true, "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, - "colornames": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=", - "dev": true - }, "colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -1177,6 +1505,12 @@ "json-parser": "^1.0.0" } }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, "commonmark": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.29.0.tgz", @@ -1215,6 +1549,15 @@ "xdg-basedir": "^4.0.0" } }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, "cookiejar": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", @@ -1228,9 +1571,9 @@ "dev": true }, "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", "dev": true }, "core-util-is": { @@ -1665,6 +2008,15 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "dev": true, + "requires": { + "strip-bom": "^4.0.0" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -1712,12 +2064,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, @@ -1733,17 +2079,6 @@ "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", "dev": true }, - "diagnostics": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", - "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", - "dev": true, - "requires": { - "colorspace": "1.1.x", - "enabled": "1.0.x", - "kuler": "1.0.x" - } - }, "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", @@ -1784,9 +2119,9 @@ "dev": true }, "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", "dev": true }, "ecc-jsbn": { @@ -1806,13 +2141,10 @@ "dev": true }, "enabled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", - "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", - "dev": true, - "requires": { - "env-variable": "0.0.x" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", + "dev": true }, "end-of-stream": { "version": "1.4.1", @@ -1829,29 +2161,6 @@ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true }, - "env-variable": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", - "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==", - "dev": true - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - } - } - }, "es-abstract": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", @@ -1877,6 +2186,12 @@ "is-symbol": "^1.0.2" } }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1884,9 +2199,9 @@ "dev": true }, "escodegen": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", - "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "dev": true, "requires": { "esprima": "^4.0.1", @@ -1971,15 +2286,6 @@ "is-descriptor": "^0.1.0" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -1995,39 +2301,12 @@ "dev": true }, "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } + "is-extendable": "^0.1.0" } }, "extglob": { @@ -2055,15 +2334,6 @@ "is-descriptor": "^1.0.0" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -2114,9 +2384,9 @@ "dev": true }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "fast-glob": { @@ -2152,9 +2422,9 @@ "dev": true }, "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz", + "integrity": "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==", "dev": true }, "fill-range": { @@ -2167,16 +2437,33 @@ "is-number": "^3.0.0", "repeat-string": "^1.6.1", "to-regex-range": "^2.1.0" + } + }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" }, "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "semver": "^6.0.0" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -2206,6 +2493,12 @@ } } }, + "fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", + "dev": true + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2218,6 +2511,59 @@ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", "dev": true }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -2256,6 +2602,12 @@ "map-cache": "^0.2.2" } }, + "fromentries": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", + "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", + "dev": true + }, "front-matter": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-3.0.2.tgz", @@ -2294,12 +2646,24 @@ "integrity": "sha512-qa/2k1YSyh6TGVtIMtmwv1tXfq7lkhR8pMtOExfZGuwyaqplMhUxyO/Wrw9fV+37B38WE6egpjSMcwyzlNOoHA==", "dev": true }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, "get-stdin": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", @@ -2371,6 +2735,12 @@ "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", "dev": true }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, "globby": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz", @@ -2444,12 +2814,12 @@ "dev": true }, "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "^6.5.5", + "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, @@ -2483,14 +2853,6 @@ "get-value": "^2.0.6", "has-values": "^1.0.0", "isobject": "^3.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "has-values": { @@ -2514,18 +2876,30 @@ } } }, + "hasha": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", + "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", + "dev": true, + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + } + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", - "dev": true - }, "html-encoding-sniffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", @@ -2535,6 +2909,12 @@ "whatwg-encoding": "^1.0.1" } }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", @@ -2567,6 +2947,12 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -2583,12 +2969,6 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -2726,12 +3106,12 @@ "dev": true }, "is-plain-object": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz", - "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "^4.0.0" + "isobject": "^3.0.1" } }, "is-regex": { @@ -2764,12 +3144,6 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -2789,9 +3163,9 @@ "dev": true }, "isobject": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", - "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, "isstream": { @@ -2860,12 +3234,6 @@ "path-is-absolute": "^1.0.0" } }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, "source-map": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", @@ -2878,6 +3246,165 @@ } } }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "dev": true, + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, "iterable-to-stream": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/iterable-to-stream/-/iterable-to-stream-1.0.1.tgz", @@ -2885,9 +3412,15 @@ "dev": true }, "js-base64": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", - "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", + "dev": true + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, "js-xxhash": { @@ -2946,6 +3479,12 @@ "xml-name-validator": "^3.0.0" } }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, "json-parser": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/json-parser/-/json-parser-1.1.5.tgz", @@ -2964,9 +3503,9 @@ } }, "json-pointer": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.0.tgz", - "integrity": "sha1-jlAFUKaqxUZKRzN32leqbMIoKNc=", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.1.tgz", + "integrity": "sha512-3OvjqKdCBvH41DLpV4iSt6v2XhZXV1bPB4OROuknvUXI7ZQNofieCPkmE26stEJ9zdQuvIxDHCuYhfgxFAAs+Q==", "dev": true, "requires": { "foreach": "^2.0.4" @@ -2995,13 +3534,13 @@ "dev": true }, "json-schema-faker": { - "version": "0.5.0-rcv.24", - "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.24.tgz", - "integrity": "sha512-qwuRwv7dnUdqdwuifb6kJAVUKm0mzi4h/mzvMwDKxyWUzjxFCdVH/g9IfKxvc4M7rvAavr8pcx9uO1PNIIWE0g==", + "version": "0.5.0-rcv.32", + "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.32.tgz", + "integrity": "sha512-buGuuOhzxrf9FWGFybiGNiflGODIC5doU0r23+3MAOyjMR9/KsKolHANSbQnM4N+mmw/dbv9byT3oKZ1wp8v2A==", "dev": true, "requires": { "json-schema-ref-parser": "^6.1.0", - "jsonpath-plus": "^2.0.0", + "jsonpath-plus": "^3.0.0", "randexp": "^0.5.3" } }, @@ -3028,6 +3567,15 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -3057,9 +3605,9 @@ } }, "jsonpath-plus": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-2.0.0.tgz", - "integrity": "sha512-ksXaz9+3SIZ5BMxgr7MQueYcR515VRZPuoDhIymUd1JcF6BnVaYJS7k4NJni4EHhvJaOIGGiPqT8+ifsGp6mBw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-3.0.0.tgz", + "integrity": "sha512-WQwgWEBgn+SJU1tlDa/GiY5/ngRpa9yrSj8n4BYPHcwoxTDaMEaYCHMOn42hIHHDd3CrUoRr3+HpsK0hCKoxzA==", "dev": true }, "jsonschema": { @@ -3093,22 +3641,10 @@ "dev": true }, "kuler": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", - "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", - "dev": true, - "requires": { - "colornames": "^1.1.1" - } - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", + "dev": true }, "left-pad": { "version": "1.3.0", @@ -3127,32 +3663,11 @@ } }, "linq": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/linq/-/linq-3.2.2.tgz", - "integrity": "sha512-AtVkCFwg7dizILt88ent7Bng1OLAnKMWBOLo9Kh7ZPFK8OcfYGi2FEzmr66QJtV7uBYZVf19AbVs0B14rIUi+w==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/linq/-/linq-3.2.3.tgz", + "integrity": "sha512-OI48ncDVi29Hc4g5+hPd58AkI8YtLUFkZWWvvyC+w1+j8PsDi28tLZnbv3+8PvxSiJUEQDihkQjrIrPkFzEFqQ==", "dev": true }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -3169,6 +3684,12 @@ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -3209,14 +3730,14 @@ } }, "logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz", + "integrity": "sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==", "dev": true, "requires": { "colors": "^1.2.1", "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", + "fecha": "^4.2.0", "ms": "^2.1.1", "triple-beam": "^1.3.0" }, @@ -3230,9 +3751,9 @@ } }, "macos-release": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz", - "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz", + "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==", "dev": true }, "make-dir": { @@ -3306,9 +3827,9 @@ } }, "merge2": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", - "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, "methods": { @@ -3336,6 +3857,27 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "mime": { @@ -3398,21 +3940,6 @@ "requires": { "is-plain-object": "^2.0.4" } - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, @@ -3642,9 +4169,9 @@ } }, "moment": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", - "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", "dev": true }, "ms": { @@ -3686,6 +4213,27 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "native-promise-only": { @@ -3695,9 +4243,9 @@ "dev": true }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "nice-try": { @@ -3728,6 +4276,15 @@ "integrity": "sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ==", "dev": true }, + "node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "requires": { + "process-on-spawn": "^1.0.0" + } + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -3737,18 +4294,6 @@ "abbrev": "1" } }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -3770,6 +4315,204 @@ "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, + "nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "requires": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -3777,9 +4520,9 @@ "dev": true }, "oav": { - "version": "0.21.6", - "resolved": "https://registry.npmjs.org/oav/-/oav-0.21.6.tgz", - "integrity": "sha512-zPLaeYuQh1aJND/e2BBLMXAy1qKvHVPido6byoC4K2wsM3MdIFrK0QePBMUXA9gZjNb6HO5oaRuM5uCEeFaxjg==", + "version": "0.22.9", + "resolved": "https://registry.npmjs.org/oav/-/oav-0.22.9.tgz", + "integrity": "sha512-HaeA+nduM5tSx++TjPB15vlZrku5x/8dQPSrK1qOtjkc9gpVfIWAAxV+n0vyLMHeKXKNrD+BdYfhxMhHI/P+MQ==", "dev": true, "requires": { "@azure/openapi-markdown": "^0.9.2", @@ -3796,7 +4539,6 @@ "commonmark": "^0.29.0", "glob": "^5.0.15", "globby": "^9.2.0", - "handlebars": "^4.7.1", "js-yaml": "^3.13.1", "json-pointer": "^0.6.0", "json-refs": "^3.0.13", @@ -3811,8 +4553,8 @@ "uuid": "^3.3.2", "vscode-jsonrpc": "^3.6.2", "winston": "^3.2.1", - "yargs": "^6.6.0", - "yasway": "^1.9.3", + "yargs": "^15.4.1", + "yasway": "^1.10.5", "yuml2svg": "^4.2.1", "z-schema": "^4.2.2" }, @@ -3885,20 +4627,26 @@ } }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "lodash": "^4.17.14" + "color-convert": "^2.0.1" } }, + "async": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", + "dev": true + }, "async-retry": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", @@ -3908,21 +4656,46 @@ "retry": "0.12.0" } }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "form-data": { @@ -3936,12 +4709,6 @@ "mime-types": "^2.1.12" } }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, "glob": { "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", @@ -3956,14 +4723,41 @@ } }, "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "p-locate": "^4.1.0" } }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -3975,99 +4769,81 @@ "util-deprecate": "^1.0.1" } }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^5.0.0" } }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, "winston": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", - "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz", + "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==", "dev": true, "requires": { - "async": "^2.6.1", - "diagnostics": "^1.1.1", - "is-stream": "^1.1.0", - "logform": "^2.1.1", - "one-time": "0.0.4", - "readable-stream": "^3.1.1", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.1.0", + "is-stream": "^2.0.0", + "logform": "^2.2.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", "stack-trace": "0.0.x", "triple-beam": "^1.3.0", - "winston-transport": "^4.3.0" + "winston-transport": "^4.4.0" } }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^4.2.0" + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" } }, "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -4116,14 +4892,6 @@ "dev": true, "requires": { "isobject": "^3.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "object.assign": { @@ -4155,14 +4923,6 @@ "dev": true, "requires": { "isobject": "^3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "octokit-pagination-methods": { @@ -4181,10 +4941,13 @@ } }, "one-time": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "dev": true, + "requires": { + "fn.name": "1.x.x" + } }, "ono": { "version": "4.0.11", @@ -4220,15 +4983,6 @@ "word-wrap": "~1.2.3" } }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "^1.0.0" - } - }, "os-name": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz", @@ -4275,19 +5029,31 @@ "p-limit": "^2.0.0" } }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", "dev": true, "requires": { - "error-ex": "^1.2.0" + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" } }, "parse5": { @@ -4336,12 +5102,6 @@ "superagent": "^3.8.3" } }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, "path-to-regexp": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", @@ -4394,19 +5154,49 @@ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "pinkie": "^2.0.0" + "find-up": "^4.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + } } }, "pn": { @@ -4439,6 +5229,15 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "dev": true, + "requires": { + "fromentries": "^1.2.0" + } + }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -4485,67 +5284,6 @@ } } }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - }, - "dependencies": { - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - } - } - }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -4569,6 +5307,36 @@ "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "dev": true, + "requires": { + "es6-error": "^4.0.1" } }, "repeat-element": { @@ -4631,21 +5399,21 @@ } }, "request-promise-core": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", - "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", "dev": true, "requires": { - "lodash": "^4.17.15" + "lodash": "^4.17.19" } }, "request-promise-native": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", - "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", "dev": true, "requires": { - "request-promise-core": "1.1.3", + "request-promise-core": "1.1.4", "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" } @@ -4663,13 +5431,16 @@ "dev": true }, "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true }, "resolve-url": { "version": "0.2.1", @@ -4689,6 +5460,15 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -4738,32 +5518,6 @@ "is-extendable": "^0.1.1", "is-plain-object": "^2.0.3", "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "shallow-clone": { @@ -4845,15 +5599,6 @@ "is-descriptor": "^0.1.0" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -4916,12 +5661,6 @@ "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, @@ -4988,38 +5727,31 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "dependencies": { + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } } }, - "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", - "dev": true - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -5027,6 +5759,27 @@ "dev": true, "requires": { "extend-shallow": "^3.0.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "sprintf-js": { @@ -5130,13 +5883,10 @@ } }, "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true }, "strip-eof": { "version": "1.0.0", @@ -5232,6 +5982,17 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, "text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", @@ -5244,6 +6005,12 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -5274,6 +6041,27 @@ "extend-shallow": "^3.0.2", "regex-not": "^1.0.2", "safe-regex": "^1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "to-regex-range": { @@ -5368,6 +6156,12 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -5384,23 +6178,11 @@ "dev": true }, "uglify-js": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz", - "integrity": "sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.2.tgz", + "integrity": "sha512-rWYleAvfJPjduYCt+ELvzybNah/zIkRteGXIBO8X0lteRZPGladF61hFi8tU7qKTsF7u6DUQCtT9k00VlFOgkg==", "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.3" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "optional": true - } - } + "optional": true }, "underscore": { "version": "1.7.0", @@ -5481,19 +6263,13 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { "punycode": "^2.1.0" @@ -5523,16 +6299,6 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "validator": { "version": "10.11.0", "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", @@ -5661,18 +6427,18 @@ } }, "windows-release": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz", - "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz", + "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==", "dev": true, "requires": { "execa": "^1.0.0" } }, "winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz", + "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==", "dev": true, "requires": { "async": "~1.0.0", @@ -5684,12 +6450,12 @@ } }, "winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz", + "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==", "dev": true, "requires": { - "readable-stream": "^2.3.6", + "readable-stream": "^2.3.7", "triple-beam": "^1.2.0" } }, @@ -5954,9 +6720,9 @@ } }, "yasway": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/yasway/-/yasway-1.9.3.tgz", - "integrity": "sha512-yXyP2XFcUljK1/mbQ0lOS815+CtCQr/yjKc9NGNjAbz9sabMACwQtYV66nC4T93P6K83uGxP5QKcmXWC15eVPA==", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/yasway/-/yasway-1.10.5.tgz", + "integrity": "sha512-JZ2i8zFaeJkGlsoK0u6x7XC4GN4ftr/I/WJJbzMO+w35JrxHaJ926/fM+Q+vLzMXU+4eoIYeqqUiXdTfrC+d/w==", "dev": true, "requires": { "@ts-common/json": "^0.3.0", @@ -5969,8 +6735,9 @@ "js-yaml": "^3.13.1", "json-refs": "^3.0.13", "json-schema-faker": "^0.5.0-rc16", - "lodash": "^4.17.11", + "lodash": "^4.17.20", "native-promise-only": "^0.8.1", + "nyc": "^15.0.1", "path-to-regexp": "^1.7.0", "swagger-methods": "^1.0.8", "swagger-schema-official": "2.0.0-bab6bed", @@ -5978,13 +6745,19 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true } } }, diff --git a/package.json b/package.json index 1a58a6b4c14d..3fab156c0ffa 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "@azure/avocado": "^0.6.3", - "@azure/rest-api-specs-scripts": "^0.10.2", + "@azure/rest-api-specs-scripts": "^0.14.0", "@ts-common/commonmark-to-markdown": "^1.2.0", "@ts-common/fs": "0.2.0", "@ts-common/iterator": "^0.3.6", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 86cc680427fc..e7942bbdfe01 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -34,6 +34,47 @@ } }, "paths": { + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully listed the available operations.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + }, + "description": "" + } + }, + "x-ms-examples": { + "Lists all of the available REST API operations": { + "$ref": "./examples/operationsList.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { "put": { "tags": [ @@ -41,7 +82,6 @@ ], "summary": "Creates a batch inference deployment.", "operationId": "BatchDeployments_CreateOrUpdate", - "x-ms-long-running-operation": true, "x-ms-examples": { "Create or update BatchDeployment": { "$ref": "./examples/createOrUpdateBatchDeployment.json" @@ -111,7 +151,7 @@ "summary": "Gets a batch inference deployment by id.", "operationId": "BatchDeployments_Get", "x-ms-examples": { - "Create or update BatchDeployment": { + "Get BatchDeployment": { "$ref": "./examples/getBatchDeployment.json" } }, @@ -207,6 +247,299 @@ } } }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs/{jobId}": { + "patch": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Updates a batch job inference deployment.", + "operationId": "BatchJobsDeployment_Update", + "x-ms-examples": { + "Update BatchJobDeployment": { + "$ref": "./examples/updateBatchJobDeployment.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job deployment definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "get": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Gets a batch inference job deployment by id.", + "operationId": "BatchJobsDeployments_Get", + "x-ms-examples": { + "Get BatchJobDeployment": { + "$ref": "./examples/getBatchJobDeployment.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Delete Batch Inference job deployment.", + "operationId": "BatchJobsDeployments_Delete", + "x-ms-examples": { + "Delete BatchJobDeployment": { + "$ref": "./examples/deleteBatchJobDeployment.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success" + }, + "204": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs": { + "post": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Creates a batch job inference deployment.", + "operationId": "BatchJobsDeployment_Create", + "x-ms-examples": { + "Create BatchJobDeployment": { + "$ref": "./examples/createBatchJobDeployment.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job deployment definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "get": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Lists Batch inference job deployments in the workspace.", + "operationId": "BatchJobsDeployments_List", + "x-ms-examples": { + "Get BatchDeployments": { + "$ref": "./examples/getBatchJobDeployments.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { "get": { "tags": [ @@ -555,6 +888,14 @@ "type": "string", "required": true, "x-ms-parameter-location": "method" + }, + "BatchJobIdParameter": { + "name": "jobId", + "description": "Identifier of the Azure Machine Learning Batch Inference job.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" } }, "definitions": { @@ -977,6 +1318,201 @@ "$ref": "#/definitions/BatchOutputConfiguration" } } + }, + "InteractionEndpoints": { + "description": "Interaction endpoints", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/InteractionEndpoint" + } + }, + "InteractionEndpoint": { + "description": "Interaction endpoint", + "properties": { + "jobEndpoint": { + "$ref": "#/definitions/JobEndpoint" + }, + "link": { + "type": "string" + } + } + }, + "JobOutput": { + "description": "Output of a job.", + "type": "object", + "properties": { + "datastoreId": { + "description": "Datastore Identifier", + "type": "string" + }, + "path": { + "description": "Path inside the datastore", + "type": "string" + } + } + }, + "JobEndpoint": { + "description": "Job endpoint.", + "enum": [ + "Tracking", + "Studio", + "Grafana", + "Tensorboard" + ], + "type": "string" + }, + "JobStatus": { + "description": "The status of a job.", + "enum": [ + "NotStarted", + "Starting", + "Provisioning", + "Preparing", + "Queued", + "Running", + "Finalizing", + "CancelRequested", + "Completed", + "Failed", + "Canceled", + "NotResponding" + ], + "type": "string" + }, + "BatchJob": { + "description": "Batch job inference settings.", + "type": "object", + "properties": { + "scaleSettings": { + "$ref": "#/definitions/DeploymentScaleSettings" + }, + "datasetId": { + "description": "Identifier for input dataset.", + "type": "string" + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "properties": { + "description": "Property dictionary. Properties can be added, but not removed or altered.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "errorThreshold": { + "format": "int32", + "description": "Error threshold, if the error count for the entire input goes above this value,\r\nthe batch inference will be aborted. Range is [-1, int.MaxValue]\r\n-1 value indicates, ignore all failures during batch inference\r\nFor FileDataset count of file failures\r\nFor TabularDataset, this is the count of record failures", + "type": "integer" + }, + "partitioningScheme": { + "$ref": "#/definitions/BatchPartitioningScheme" + }, + "output": { + "$ref": "#/definitions/JobOutput" + }, + "status": { + "$ref": "#/definitions/JobStatus" + }, + "interactionEndpoints": { + "$ref": "#/definitions/InteractionEndpoints" + }, + "description": { + "description": "Datastore Identifier", + "type": "string" + } + } + }, + "BatchJobResource": { + "description": "Azure Resource Manager resource Envelope", + "allOf": [ + { + "$ref": "machineLearningServices.json#/definitions/Resource" + } + ], + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The resource URL of the entity (not URL encoded).", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the resource entity.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The resource provider and type.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/BatchJob" + } + } + }, + "BatchJobResourcePaginatedResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BatchJobResource" + } + }, + "nextLink": { + "type": "string" + } + } + }, + "Operation": { + "description": "REST API operation", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "The object that represents the operation.", + "properties": { + "provider": { + "description": "Service provider: Microsoft.ResourceProvider", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed: Profile, endpoint, etc.", + "type": "string" + }, + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string" + } + } + } + } + }, + "OperationListResult": { + "description": "Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "List of Resource Provider operations supported by the Resource Provider resource provider." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json new file mode 100644 index 000000000000..cb2e9e8d752c --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "deploymentId": "testBatchDeployment", + "properties": { + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "partitioningScheme": { + "miniBatchSize": 20 + }, + "errorThreshold": 5, + "datasetId": "string", + "properties": { + "description": "string" + } + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", + "name": "testBatchJobDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobDeployment.json new file mode 100644 index 000000000000..b62f8b8cd426 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobDeployment.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "jobId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json new file mode 100644 index 000000000000..d962e899db86 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchJobDeployment", + "jobId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", + "name": "testBatchJobDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json new file mode 100644 index 000000000000..9dd5f444c239 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json @@ -0,0 +1,63 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchJobDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment1", + "name": "testBatchJobDeployment1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment2", + "name": "testBatchJobDeployment2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + ], + "nextLink": "nextLink" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json new file mode 100644 index 000000000000..b94e4f9d5b31 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "api-version": "2020-09-01-preview", + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.MachineLearningServices/operations/read", + "display": { + "provider": "Microsoft MachineLearningServices", + "resource": "Available Operations", + "operation": "Get Available Operations", + "description": "Get available operations of Microsoft MachineLearningServices." + } + } + ], + "nextLink": "https://management.azure.com/nextLinkUrl" + } + } + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json new file mode 100644 index 000000000000..94700e991e99 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "deploymentId": "testBatchDeployment", + "jobId": "testBatchJobDeployment", + "properties": { + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "partitioningScheme": { + "miniBatchSize": 20 + }, + "errorThreshold": 5, + "datasetId": "string", + "properties": {} + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", + "name": "testBatchJobDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": {}, + } + } + } + } +} From 00c71ffbbae7b68e2ad4885301a3acf0563880e8 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 00:21:06 -0800 Subject: [PATCH 11/20] Batch job endpoints --- .../2020-09-01-preview/batchInference.json | 280 +++++++++++++++++- .../examples/createBatchJobEndpoint.json | 52 ++++ .../examples/deleteBatchJobEndpoint.json | 15 + .../examples/getBatchJobDeployment.json | 1 - .../examples/getBatchJobDeployments.json | 2 - .../examples/getBatchJobEndpoint.json | 35 +++ .../examples/getBatchJobEndpoints.json | 60 ++++ .../examples/updateBatchJobDeployment.json | 1 - .../examples/updateBatchJobEndpoint.json | 47 +++ 9 files changed, 488 insertions(+), 5 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index e7942bbdfe01..a45d077130cc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -492,7 +492,7 @@ "summary": "Lists Batch inference job deployments in the workspace.", "operationId": "BatchJobsDeployments_List", "x-ms-examples": { - "Get BatchDeployments": { + "Get BatchJobDeployments": { "$ref": "./examples/getBatchJobDeployments.json" } }, @@ -540,6 +540,284 @@ } } }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs/{jobId}": { + "patch": { + "tags": [ + "BatchJobEndpoint" + ], + "summary": "Updates a batch job inference endpoint.", + "operationId": "BatchJobsEndpoint_Update", + "x-ms-examples": { + "Update BatchJobEndpoint": { + "$ref": "./examples/updateBatchJobEndpoint.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "get": { + "tags": [ + "BatchJobEndpoint" + ], + "summary": "Gets a batch inference job endpoint by id.", + "operationId": "BatchJobsEndpoints_Get", + "x-ms-examples": { + "Get BatchJobEndpoint": { + "$ref": "./examples/getBatchJobEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "delete": { + "tags": [ + "BatchJobEndpoint" + ], + "summary": "Delete Batch Inference job endpoint.", + "operationId": "BatchJobsEndpoints_Delete", + "x-ms-examples": { + "Delete BatchJobEndpoint": { + "$ref": "./examples/deleteBatchJobEndpoint.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success" + }, + "204": { + "description": "Success" + } + } + } + }, + "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs": { + "post": { + "tags": [ + "BatchJobEndpoint" + ], + "summary": "Creates a batch job inference endpoint.", + "operationId": "BatchJobsEndpoint_Create", + "x-ms-examples": { + "Create BatchJobEndpoint": { + "$ref": "./examples/createBatchJobEndpoint.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job endpoint definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, + "get": { + "tags": [ + "BatchJobEndpoint" + ], + "summary": "Lists Batch inference job endpoints in the workspace.", + "operationId": "BatchJobsEndpoints_List", + "x-ms-examples": { + "Get BatchJobEndpoints": { + "$ref": "./examples/getBatchJobEndpoints.json" + } + }, + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResourcePaginatedResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { "get": { "tags": [ diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json new file mode 100644 index 000000000000..67bb2d61dfca --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "deploymentId": "testBatchDeployment", + "properties": { + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "partitioningScheme": { + "miniBatchSize": 20 + }, + "errorThreshold": 5, + "datasetId": "string", + "properties": { + "description": "string" + } + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob", + "name": "testBatchJob", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "location": "https://resourceLocationUrl", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobEndpoint.json new file mode 100644 index 000000000000..b62f8b8cd426 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/deleteBatchJobEndpoint.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "deploymentId": "testBatchDeployment", + "jobId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json index d962e899db86..3f9af739e056 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json @@ -14,7 +14,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", "name": "testBatchJobDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", - "location": "https://resourceLocationUrl", "properties": { "tags": {}, "scaleSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json index 9dd5f444c239..c5e881e48135 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json @@ -15,7 +15,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment1", "name": "testBatchJobDeployment1", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", - "location": "https://resourceLocationUrl", "properties": { "tags": {}, "scaleSettings": { @@ -37,7 +36,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment2", "name": "testBatchJobDeployment2", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", - "location": "https://resourceLocationUrl", "properties": { "tags": {}, "scaleSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json new file mode 100644 index 000000000000..daa95037d2f5 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "jobId": "testBatchDeployment", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob", + "name": "testBatchJob", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json new file mode 100644 index 000000000000..233d1b28bcad --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "endpointName": "testBatchEndpoint", + "api-version": "2020-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob1", + "name": "testBatchJob1", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob2", + "name": "testBatchJob2", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": { + "description": "string" + }, + } + } + ], + "nextLink": "nextLink" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json index 94700e991e99..e1e157671111 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json @@ -28,7 +28,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", "name": "testBatchJobDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", - "location": "https://resourceLocationUrl", "properties": { "tags": {}, "scaleSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json new file mode 100644 index 000000000000..8d2a430e703b --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "resourceGroup-1234", + "workspaceName": "testworkspace", + "api-version": "2020-09-01-preview", + "endpointName": "testEndpointName", + "jobId": "testBatchJob", + "properties": { + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "partitioningScheme": { + "miniBatchSize": 20 + }, + "errorThreshold": 5, + "datasetId": "string", + "properties": {} + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob", + "name": "testBatchJob", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "properties": { + "tags": {}, + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {}, + "status": "string", + "properties": {}, + } + } + } + } +} From 3d17a6945de56029c5c7396af071a96fa2a71fc4 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 00:33:11 -0800 Subject: [PATCH 12/20] fix CI errors --- .../examples/createBatchJobDeployment.json | 3 +-- .../examples/createBatchJobEndpoint.json | 3 +-- .../2020-09-01-preview/examples/getBatchJobDeployment.json | 3 +-- .../examples/getBatchJobDeployments.json | 6 ++---- .../2020-09-01-preview/examples/getBatchJobEndpoint.json | 3 +-- .../2020-09-01-preview/examples/getBatchJobEndpoints.json | 6 ++---- .../2020-09-01-preview/examples/operationsList.json | 7 +++---- .../examples/updateBatchJobDeployment.json | 3 +-- .../examples/updateBatchJobEndpoint.json | 3 +-- 9 files changed, 13 insertions(+), 24 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json index cb2e9e8d752c..97b01d63ee67 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json @@ -41,10 +41,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json index 67bb2d61dfca..97caf12342f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json @@ -41,10 +41,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json index 3f9af739e056..b69cdc5a6004 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json @@ -25,10 +25,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json index c5e881e48135..5948f83ed54f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json @@ -26,10 +26,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } }, { @@ -47,10 +46,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json index daa95037d2f5..9689d43c13aa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json @@ -24,10 +24,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json index 233d1b28bcad..b1dcfcb9767b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json @@ -25,10 +25,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } }, { @@ -46,10 +45,9 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", "properties": { "description": "string" - }, + } } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json index b94e4f9d5b31..7dec0610f679 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2020-09-01-preview", "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234", + "resourceGroupName": "resourceGroup-1234" }, "responses": { "200": { @@ -13,8 +13,7 @@ "display": { "provider": "Microsoft MachineLearningServices", "resource": "Available Operations", - "operation": "Get Available Operations", - "description": "Get available operations of Microsoft MachineLearningServices." + "operation": "Get Available Operations" } } ], @@ -22,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json index e1e157671111..693065295f9f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json @@ -39,8 +39,7 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", - "properties": {}, + "properties": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json index 8d2a430e703b..386ee437cbf7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json @@ -38,8 +38,7 @@ "miniBatchSize": 20 }, "output": {}, - "status": "string", - "properties": {}, + "properties": {} } } } From a22922b97b72220afae97d42967a9dcd7adc626f Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 00:42:14 -0800 Subject: [PATCH 13/20] add custom words --- custom-words.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index 2c42408cbe55..dd358e71abca 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -672,6 +672,7 @@ gluster glusterfs GOARCH GPUs +Grafana Grammarly GRANTACE granularities @@ -1642,6 +1643,7 @@ templated templatelink templeton temporarydisk +Tensorboard tensorflow TEPCO's teradata From ae5b54e2b025835720e0ae2024c19ea9aa0cc563 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 01:00:12 -0800 Subject: [PATCH 14/20] fix lintdiff error --- .../preview/2020-09-01-preview/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index 3c283424747c..1ffdd806ddf6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -1991,7 +1991,7 @@ }, "definitions": { "Operation": { - "description": "Azure Machine Learning workspace REST API operation", + "description": "REST API operation", "type": "object", "properties": { "name": { From 1968fa5d15b220dcab764bed99bb4265d7067278 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 01:20:24 -0800 Subject: [PATCH 15/20] revert operations in batchInference.json --- .../2020-09-01-preview/batchInference.json | 84 ------------------- .../examples/operationsList.json | 24 ------ 2 files changed, 108 deletions(-) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index a45d077130cc..e5050850560e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -34,47 +34,6 @@ } }, "paths": { - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/operations": { - "get": { - "tags": [ - "Operations" - ], - "operationId": "Operations_List", - "parameters": [ - { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" - } - ], - "responses": { - "200": { - "description": "Successfully listed the available operations.", - "schema": { - "$ref": "#/definitions/OperationListResult" - } - }, - "default": { - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - }, - "description": "" - } - }, - "x-ms-examples": { - "Lists all of the available REST API operations": { - "$ref": "./examples/operationsList.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { "put": { "tags": [ @@ -1748,49 +1707,6 @@ "type": "string" } } - }, - "Operation": { - "description": "REST API operation", - "type": "object", - "properties": { - "name": { - "description": "Operation name: {provider}/{resource}/{operation}", - "type": "string" - }, - "display": { - "description": "The object that represents the operation.", - "properties": { - "provider": { - "description": "Service provider: Microsoft.ResourceProvider", - "type": "string" - }, - "resource": { - "description": "Resource on which the operation is performed: Profile, endpoint, etc.", - "type": "string" - }, - "operation": { - "description": "Operation type: Read, write, delete, etc.", - "type": "string" - } - } - } - } - }, - "OperationListResult": { - "description": "Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results.", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "description": "List of Resource Provider operations supported by the Resource Provider resource provider." - }, - "nextLink": { - "type": "string", - "description": "URL to get the next set of operation list results if there are any." - } - } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json deleted file mode 100644 index 7dec0610f679..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/operationsList.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "api-version": "2020-09-01-preview", - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "resourceGroup-1234" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "Microsoft.MachineLearningServices/operations/read", - "display": { - "provider": "Microsoft MachineLearningServices", - "resource": "Available Operations", - "operation": "Get Available Operations" - } - } - ], - "nextLink": "https://management.azure.com/nextLinkUrl" - } - } - } -} From 8af24f205d1855f72f86d10c0945f7f703204b10 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 10:55:59 -0800 Subject: [PATCH 16/20] fix proxy resource --- .../2020-09-01-preview/batchInference.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index e5050850560e..660ddfb83988 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -1668,27 +1668,12 @@ "description": "Azure Resource Manager resource Envelope", "allOf": [ { - "$ref": "machineLearningServices.json#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "type": "object", "x-ms-azure-resource": true, "properties": { - "id": { - "description": "The resource URL of the entity (not URL encoded).", - "type": "string", - "readOnly": true - }, - "name": { - "description": "The name of the resource entity.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The resource provider and type.", - "type": "string", - "readOnly": true - }, "properties": { "$ref": "#/definitions/BatchJob" } From 7637c81d174a0ac7b0db4e44e06cfd9b7a4309f4 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 11:51:46 -0800 Subject: [PATCH 17/20] revert change in machinelearningservices.json --- .../preview/2020-09-01-preview/batchInference.json | 12 ++++++------ .../2020-09-01-preview/machineLearningServices.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 660ddfb83988..55c94c023097 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -1666,18 +1666,18 @@ }, "BatchJobResource": { "description": "Azure Resource Manager resource Envelope", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" - } - ], "type": "object", "x-ms-azure-resource": true, "properties": { "properties": { "$ref": "#/definitions/BatchJob" } - } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ] }, "BatchJobResourcePaginatedResult": { "type": "object", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index 1ffdd806ddf6..3c283424747c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -1991,7 +1991,7 @@ }, "definitions": { "Operation": { - "description": "REST API operation", + "description": "Azure Machine Learning workspace REST API operation", "type": "object", "properties": { "name": { From cbe55b68edb232eee5cca96797c6631fbd9c1b63 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 13:09:16 -0800 Subject: [PATCH 18/20] remove tags/props and fix url --- .../2020-09-01-preview/batchInference.json | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 55c94c023097..d56996f45baf 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -34,7 +34,7 @@ } }, "paths": { - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}": { "put": { "tags": [ "BatchDeployment" @@ -206,7 +206,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs/{jobId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs/{jobId}": { "patch": { "tags": [ "BatchJobDeployment" @@ -381,7 +381,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs": { "post": { "tags": [ "BatchJobDeployment" @@ -499,7 +499,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs/{jobId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs/{jobId}": { "patch": { "tags": [ "BatchJobEndpoint" @@ -665,7 +665,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs": { "post": { "tags": [ "BatchJobEndpoint" @@ -777,7 +777,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments": { "get": { "tags": [ "BatchDeployment" @@ -830,7 +830,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}": { "put": { "tags": [ "BatchEndpoint" @@ -994,7 +994,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints": { "get": { "tags": [ "BatchEndpoint" @@ -1050,7 +1050,7 @@ } } }, - "/mferp/managementfrontend/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/listkeys": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/listkeys": { "post": { "tags": [ "BatchEndpoint" @@ -1627,20 +1627,6 @@ "description": "Identifier for input dataset.", "type": "string" }, - "tags": { - "description": "Contains resource tags defined as key/value pairs.", - "type": "object", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "description": "Property dictionary. Properties can be added, but not removed or altered.", - "type": "object", - "additionalProperties": { - "type": "string" - } - }, "errorThreshold": { "format": "int32", "description": "Error threshold, if the error count for the entire input goes above this value,\r\nthe batch inference will be aborted. Range is [-1, int.MaxValue]\r\n-1 value indicates, ignore all failures during batch inference\r\nFor FileDataset count of file failures\r\nFor TabularDataset, this is the count of record failures", From 663474cd4c2a08e0b8a0d3aaaa153f3abe50e5db Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 13:25:57 -0800 Subject: [PATCH 19/20] Fix PR feedback --- .../2020-09-01-preview/batchInference.json | 212 ++++++++++-------- ... => createOrUpdateBatchJobDeployment.json} | 32 ++- ...on => createOrUpdateBatchJobEndpoint.json} | 32 ++- .../examples/getBatchJobDeployment.json | 6 +- .../examples/getBatchJobDeployments.json | 12 +- .../examples/getBatchJobEndpoint.json | 6 +- .../examples/getBatchJobEndpoints.json | 12 +- .../examples/updateBatchJobDeployment.json | 8 +- .../examples/updateBatchJobEndpoint.json | 8 +- 9 files changed, 167 insertions(+), 161 deletions(-) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/{createBatchJobDeployment.json => createOrUpdateBatchJobDeployment.json} (62%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/{createBatchJobEndpoint.json => createOrUpdateBatchJobEndpoint.json} (63%) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index d56996f45baf..3c48b098f1ca 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -207,6 +207,77 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs/{jobId}": { + "put": { + "tags": [ + "BatchJobDeployment" + ], + "summary": "Creates a batch job inference deployment.", + "operationId": "BatchJobsDeployment_CreateOrUpdate", + "x-ms-examples": { + "Create or update BatchJobDeployment": { + "$ref": "./examples/createOrUpdateBatchJobDeployment.json" + } + }, + "consumes": [ + "application/json" + ], + "produces": [ + "text/plain", + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/BatchJobIdParameter" + }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job deployment definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + ], + "responses": { + "default": { + "description": "Error", + "schema": { + "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" + } + }, + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } + } + } + }, "patch": { "tags": [ "BatchJobDeployment" @@ -382,20 +453,17 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/deployments/{deploymentId}/jobs": { - "post": { + "get": { "tags": [ "BatchJobDeployment" ], - "summary": "Creates a batch job inference deployment.", - "operationId": "BatchJobsDeployment_Create", + "summary": "Lists Batch inference job deployments in the workspace.", + "operationId": "BatchJobsDeployments_List", "x-ms-examples": { - "Create BatchJobDeployment": { - "$ref": "./examples/createBatchJobDeployment.json" + "Get BatchJobDeployments": { + "$ref": "./examples/getBatchJobDeployments.json" } }, - "consumes": [ - "application/json" - ], "produces": [ "text/plain", "application/json", @@ -405,6 +473,9 @@ { "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "#/parameters/EndpointDeploymentIdParameter" + }, { "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" }, @@ -416,17 +487,6 @@ }, { "$ref": "#/parameters/EndpointNameParameter" - }, - { - "$ref": "#/parameters/EndpointDeploymentIdParameter" - }, - { - "in": "body", - "name": "body", - "description": "Batch inference job deployment definition object.", - "schema": { - "$ref": "#/definitions/BatchJobResource" - } } ], "responses": { @@ -436,25 +496,33 @@ "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" } }, - "201": { - "description": "Created", + "200": { + "description": "Success", "schema": { - "$ref": "#/definitions/BatchJobResource" + "$ref": "#/definitions/BatchJobResourcePaginatedResult" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } - }, - "get": { + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs/{jobId}": { + "put": { "tags": [ - "BatchJobDeployment" + "BatchJobEndpoint" ], - "summary": "Lists Batch inference job deployments in the workspace.", - "operationId": "BatchJobsDeployments_List", + "summary": "Creates a batch job inference endpoint.", + "operationId": "BatchJobsEndpoint_CreateOrUpdate", "x-ms-examples": { - "Get BatchJobDeployments": { - "$ref": "./examples/getBatchJobDeployments.json" + "Create or Update BatchJobEndpoint": { + "$ref": "./examples/createOrUpdateBatchJobEndpoint.json" } }, + "consumes": [ + "application/json" + ], "produces": [ "text/plain", "application/json", @@ -462,10 +530,10 @@ ], "parameters": [ { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/BatchJobIdParameter" }, { - "$ref": "#/parameters/EndpointDeploymentIdParameter" + "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" }, { "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" @@ -478,6 +546,14 @@ }, { "$ref": "#/parameters/EndpointNameParameter" + }, + { + "in": "body", + "name": "body", + "description": "Batch inference job endpoint definition object.", + "schema": { + "$ref": "#/definitions/BatchJobResource" + } } ], "responses": { @@ -490,16 +566,17 @@ "200": { "description": "Success", "schema": { - "$ref": "#/definitions/BatchJobResourcePaginatedResult" + "$ref": "#/definitions/BatchJobResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/BatchJobResource" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs/{jobId}": { + }, "patch": { "tags": [ "BatchJobEndpoint" @@ -666,65 +743,6 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}/jobs": { - "post": { - "tags": [ - "BatchJobEndpoint" - ], - "summary": "Creates a batch job inference endpoint.", - "operationId": "BatchJobsEndpoint_Create", - "x-ms-examples": { - "Create BatchJobEndpoint": { - "$ref": "./examples/createBatchJobEndpoint.json" - } - }, - "consumes": [ - "application/json" - ], - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "parameters": [ - { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" - }, - { - "$ref": "#/parameters/EndpointNameParameter" - }, - { - "in": "body", - "name": "body", - "description": "Batch inference job endpoint definition object.", - "schema": { - "$ref": "#/definitions/BatchJobResource" - } - } - ], - "responses": { - "default": { - "description": "Error", - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/BatchJobResource" - } - } - } - }, "get": { "tags": [ "BatchJobEndpoint" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobDeployment.json similarity index 62% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobDeployment.json index 97b01d63ee67..eed21ef2c7d7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobDeployment.json @@ -6,9 +6,9 @@ "api-version": "2020-09-01-preview", "endpointName": "testEndpointName", "deploymentId": "testBatchDeployment", + "jobId": "testBatchJobDeployment", "properties": { "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -16,22 +16,35 @@ "miniBatchSize": 20 }, "errorThreshold": 5, - "datasetId": "string", - "properties": { - "description": "string" - } + "datasetId": "string" } } }, "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", + "name": "testBatchJobDeployment", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {} + } + } + }, "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/deployments/testBatchDeployment/jobs/testBatchJobDeployment", "name": "testBatchJobDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", - "location": "https://resourceLocationUrl", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -40,10 +53,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobEndpoint.json similarity index 63% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobEndpoint.json index 97caf12342f4..3539ee1d3f45 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/createOrUpdateBatchJobEndpoint.json @@ -6,9 +6,9 @@ "api-version": "2020-09-01-preview", "endpointName": "testEndpointName", "deploymentId": "testBatchDeployment", + "jobId": "testBatchJob", "properties": { "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -16,22 +16,35 @@ "miniBatchSize": 20 }, "errorThreshold": 5, - "datasetId": "string", - "properties": { - "description": "string" - } + "datasetId": "string" } } }, "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob", + "name": "testBatchJob", + "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", + "properties": { + "scaleSettings": { + "nodeCount": 1 + }, + "errorThreshold": 5, + "partitioningScheme": { + "partitioningKey": null, + "miniBatchSize": 20 + }, + "output": {} + } + } + }, "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace/batchEndpoints/testEndpointName/jobs/testBatchJob", "name": "testBatchJob", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", - "location": "https://resourceLocationUrl", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -40,10 +53,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json index b69cdc5a6004..2eadd4ebc8ef 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployment.json @@ -15,7 +15,6 @@ "name": "testBatchJobDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -24,10 +23,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json index 5948f83ed54f..256fc4f95beb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobDeployments.json @@ -16,7 +16,6 @@ "name": "testBatchJobDeployment1", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -25,10 +24,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } }, { @@ -36,7 +32,6 @@ "name": "testBatchJobDeployment2", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -45,10 +40,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json index 9689d43c13aa..e7ed84ad2fdb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoint.json @@ -14,7 +14,6 @@ "name": "testBatchJob", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -23,10 +22,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json index b1dcfcb9767b..2bb8fb76c178 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getBatchJobEndpoints.json @@ -15,7 +15,6 @@ "name": "testBatchJob1", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -24,10 +23,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } }, { @@ -35,7 +31,6 @@ "name": "testBatchJob2", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -44,10 +39,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": { - "description": "string" - } + "output": {} } } ], diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json index 693065295f9f..a0fcc5f0380e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobDeployment.json @@ -9,7 +9,6 @@ "jobId": "testBatchJobDeployment", "properties": { "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -17,8 +16,7 @@ "miniBatchSize": 20 }, "errorThreshold": 5, - "datasetId": "string", - "properties": {} + "datasetId": "string" } } }, @@ -29,7 +27,6 @@ "name": "testBatchJobDeployment", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/deployments/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -38,8 +35,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": {} + "output": {} } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json index 386ee437cbf7..053afcc6352f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/updateBatchJobEndpoint.json @@ -8,7 +8,6 @@ "jobId": "testBatchJob", "properties": { "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -16,8 +15,7 @@ "miniBatchSize": 20 }, "errorThreshold": 5, - "datasetId": "string", - "properties": {} + "datasetId": "string" } } }, @@ -28,7 +26,6 @@ "name": "testBatchJob", "type": "Microsoft.MachineLearningServices/workspaces/batchEndpoints/jobs", "properties": { - "tags": {}, "scaleSettings": { "nodeCount": 1 }, @@ -37,8 +34,7 @@ "partitioningKey": null, "miniBatchSize": 20 }, - "output": {}, - "properties": {} + "output": {} } } } From d6d9f28c37fd98423443cdabfcf9232bb3cfbff3 Mon Sep 17 00:00:00 2001 From: Puviyarasan Pandian Date: Thu, 17 Dec 2020 14:25:05 -0800 Subject: [PATCH 20/20] Fix more lint errors --- .../2020-09-01-preview/batchInference.json | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json index 3c48b098f1ca..88944d734199 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/batchInference.json @@ -1155,18 +1155,23 @@ }, "definitions": { "BatchDeploymentResource": { - "description": "Azure Resource Manager resource Envelope", "required": [ "properties" ], - "allOf": [ - { - "$ref": "machineLearningServices.json#/definitions/Resource" - } - ], "type": "object", - "x-ms-azure-resource": true, "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "location": { + "type": "string" + }, + "kind": { + "type": "string" + }, "id": { "description": "The resource URL of the entity (not URL encoded).", "type": "string", @@ -1185,18 +1190,12 @@ "properties": { "$ref": "#/definitions/BatchDeployment" }, - "location": { - "description": "Specifies the location of the resource.", - "type": "string" - }, - "tags": { - "description": "Contains resource tags defined as key/value pairs.", - "type": "object", - "additionalProperties": { - "type": "string" - } + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } - } + }, + "x-ms-azure-resource": true, + "additionalProperties": false }, "BatchDeploymentResourcePaginatedResult": { "type": "object", @@ -1216,18 +1215,23 @@ } }, "BatchEndpointResource": { - "description": "Azure Resource Manager resource Envelope", "required": [ "properties" ], - "allOf": [ - { - "$ref": "machineLearningServices.json#/definitions/Resource" - } - ], "type": "object", - "x-ms-azure-resource": true, "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "location": { + "type": "string" + }, + "kind": { + "type": "string" + }, "id": { "description": "The resource URL of the entity (not URL encoded).", "type": "string", @@ -1246,18 +1250,12 @@ "properties": { "$ref": "#/definitions/BatchEndpoint" }, - "location": { - "description": "Specifies the location of the resource.", - "type": "string" - }, - "tags": { - "description": "Contains resource tags defined as key/value pairs.", - "type": "object", - "additionalProperties": { - "type": "string" - } + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } - } + }, + "x-ms-azure-resource": true, + "additionalProperties": false }, "BatchEndpointResourcePaginatedResult": { "type": "object", @@ -1669,12 +1667,14 @@ } }, "BatchJobResource": { - "description": "Azure Resource Manager resource Envelope", "type": "object", "x-ms-azure-resource": true, "properties": { "properties": { "$ref": "#/definitions/BatchJob" + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } }, "allOf": [