From dc743305eb62f7c7c93f86713f8f0128461dccb9 Mon Sep 17 00:00:00 2001 From: Filiz Topatan Date: Thu, 6 Feb 2020 19:23:31 -0800 Subject: [PATCH 1/3] Update swagger for missing properties --- .../stable/2019-10-01/resources.json | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 1a52af27dd7f..c2c6fd0559f6 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -4603,6 +4603,34 @@ "onErrorDeployment": { "$ref": "#/definitions/OnErrorDeploymentExtended", "description": "The deployment on error behavior." + }, + "templateHash": { + "readOnly": true, + "type": "string", + "description": "The hash produced for the template." + }, + "outputResources": { + "readOnly": true, + "type": "array", + "description": "Array of provisioned resources.", + "items": { + "type": "object", + "description": "Details of provisioned resources." + } + }, + "validatedResources": { + "readOnly": true, + "type": "array", + "description": "Array of validated resources.", + "items": { + "type": "object", + "description": "Details of validated resources." + } + }, + "error": { + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", + "description": "The deployment error." } }, "description": "Deployment properties with additional details." @@ -4657,6 +4685,7 @@ "DeploymentValidateResult": { "properties": { "error": { + "readOnly": true, "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", "description": "The deployment validation error." }, @@ -5606,4 +5635,4 @@ "description": "The API version to use for this operation." } } -} +} \ No newline at end of file From 271eca27ada84fa86d87025593d492f9e9d1c13b Mon Sep 17 00:00:00 2001 From: Filiz Topatan Date: Thu, 6 Feb 2020 19:27:04 -0800 Subject: [PATCH 2/3] Revert "Update swagger for missing properties" This reverts commit dc743305eb62f7c7c93f86713f8f0128461dccb9. --- .../stable/2019-10-01/resources.json | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index c2c6fd0559f6..1a52af27dd7f 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -4603,34 +4603,6 @@ "onErrorDeployment": { "$ref": "#/definitions/OnErrorDeploymentExtended", "description": "The deployment on error behavior." - }, - "templateHash": { - "readOnly": true, - "type": "string", - "description": "The hash produced for the template." - }, - "outputResources": { - "readOnly": true, - "type": "array", - "description": "Array of provisioned resources.", - "items": { - "type": "object", - "description": "Details of provisioned resources." - } - }, - "validatedResources": { - "readOnly": true, - "type": "array", - "description": "Array of validated resources.", - "items": { - "type": "object", - "description": "Details of validated resources." - } - }, - "error": { - "readOnly": true, - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", - "description": "The deployment error." } }, "description": "Deployment properties with additional details." @@ -4685,7 +4657,6 @@ "DeploymentValidateResult": { "properties": { "error": { - "readOnly": true, "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", "description": "The deployment validation error." }, @@ -5635,4 +5606,4 @@ "description": "The API version to use for this operation." } } -} \ No newline at end of file +} From 9252cda061e6cf2df5f31c79257da867178a1a14 Mon Sep 17 00:00:00 2001 From: Filiz Topatan Date: Wed, 8 Apr 2020 14:48:38 -0700 Subject: [PATCH 3/3] Add provisioningOperation property to DeploymentOperation object --- .../stable/2019-10-01/resources.json | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 94982aa9570d..38d40fc7b844 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5282,6 +5282,69 @@ }, "DeploymentOperationProperties": { "properties": { + "provisioningOperation": { + "readOnly": true, + "type": "string", + "description": "The name of the current provisioning operation.", + "enum": [ + "NotSpecified", + "Create", + "Delete", + "Waiting", + "AzureAsyncOperationWaiting", + "ResourceCacheWaiting", + "Action", + "Read", + "EvaluateDeploymentOutput", + "DeploymentCleanup" + ], + "x-ms-enum": { + "name": "ProvisioningOperation", + "modelAsString": false, + "values": [ + { + "value": "NotSpecified", + "description": "The provisioning operation is not specified." + }, + { + "value": "Create", + "description": "The provisioning operation is create." + }, + { + "value": "Delete", + "description": "The provisioning operation is delete." + }, + { + "value": "Waiting", + "description": "The provisioning operation is waiting." + }, + { + "value": "AzureAsyncOperationWaiting", + "description": "The provisioning operation is waiting Azure async operation." + }, + { + "value": "ResourceCacheWaiting", + "description": "The provisioning operation is waiting for resource cache." + }, + { + "value": "Action", + "description": "The provisioning operation is action." + }, + { + "value": "Read", + "description": "The provisioning operation is read." + }, + { + "value": "EvaluateDeploymentOutput", + "description": "The provisioning operation is evaluate output." + }, + { + "value": "DeploymentCleanup", + "description": "The provisioning operation is cleanup. This operation is part of the 'complete' mode deployment." + } + ] + } + }, "provisioningState": { "readOnly": true, "type": "string",