From c45eb83a0c7ef8ce42da1b9b5f3daa88632e478b Mon Sep 17 00:00:00 2001 From: Robert Gao Date: Mon, 25 Jan 2021 22:48:18 -0800 Subject: [PATCH 1/4] Fix minor issues in policy exemptions --- .../2020-07-01-preview/policyExemptions.json | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json b/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json index 700a24a29b80..766625e99077 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json @@ -86,15 +86,6 @@ } }, "parameters": [ - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PolicyExemption" - }, - "description": "Parameters for the policy exemption." - }, { "$ref": "#/parameters/ScopeParameter" }, @@ -103,6 +94,15 @@ }, { "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/PolicyExemption" + }, + "description": "Parameters for the policy exemption." } ], "responses": { @@ -505,8 +505,7 @@ "in": "path", "required": true, "type": "string", - "description": "The ID of the target subscription.", - "x-ms-parameter-location": "method" + "description": "The ID of the target subscription." }, "ResourceGroupNameParameter": { "name": "resourceGroupName", From dc566ad1e4c76ad33fb381c3837e6dbefd2e1274 Mon Sep 17 00:00:00 2001 From: Robert Gao Date: Wed, 27 Jan 2021 07:17:49 -0800 Subject: [PATCH 2/4] Address some issues regarding SDK gen --- .../2020-07-01-preview/policyExemptions.json | 28 +++++++++++++----- .../stable/2020-03-01/policyAssignments.json | 29 ++++++++++++------- .../stable/2020-03-01/policyDefinitions.json | 29 ++++++++++++------- .../2020-03-01/policySetDefinitions.json | 29 ++++++++++++------- .../2020-09-01/dataPolicyManifests.json | 13 +++++++-- .../stable/2020-09-01/policyAssignments.json | 29 ++++++++++++------- .../stable/2020-09-01/policyDefinitions.json | 29 ++++++++++++------- .../2020-09-01/policySetDefinitions.json | 29 ++++++++++++------- .../resources/resource-manager/readme.md | 3 +- 9 files changed, 148 insertions(+), 70 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json b/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json index 766625e99077..b555e5537eb6 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json @@ -377,7 +377,11 @@ "definitions": { "CloudError": { "x-ms-external": true, - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse", + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, "description": "An error response from a policy operation." }, "PolicyExemptionProperties": { @@ -454,15 +458,25 @@ "type": "object", "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, + "id": { + "readOnly": true, + "type": "string", + "description": "The ID of the policy exemption." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the policy exemption." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource (Microsoft.Authorization/policyExemptions)." } }, "description": "The policy exemption.", - "x-ms-azure-resource": true, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" - } - ] + "x-ms-azure-resource": true }, "PolicyExemptionListResult": { "properties": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyAssignments.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyAssignments.json index 161bdf23c930..1c4b211d5f4b 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyAssignments.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyAssignments.json @@ -80,7 +80,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -142,7 +142,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -192,7 +192,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -245,7 +245,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -332,7 +332,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -379,7 +379,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -425,7 +425,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -474,7 +474,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -526,7 +526,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -569,7 +569,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -577,6 +577,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyAssignmentProperties": { "properties": { "displayName": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyDefinitions.json index aa94a30c117f..b5f7d7b29737 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policyDefinitions.json @@ -84,7 +84,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -126,7 +126,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -168,7 +168,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -209,7 +209,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -262,7 +262,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -304,7 +304,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -346,7 +346,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -389,7 +389,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -432,7 +432,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -478,7 +478,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -489,6 +489,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyDefinitionProperties": { "properties": { "policyType": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policySetDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policySetDefinitions.json index b7c215963300..5676e0b5335a 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policySetDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-03-01/policySetDefinitions.json @@ -90,7 +90,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -132,7 +132,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -174,7 +174,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -215,7 +215,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -258,7 +258,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -301,7 +301,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -366,7 +366,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -408,7 +408,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -450,7 +450,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -493,7 +493,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -504,6 +504,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicySetDefinitionProperties": { "properties": { "policyType": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json index 7055fef273e3..2e6c787d2834 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json @@ -69,7 +69,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -109,7 +109,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -120,6 +120,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "DataManifestCustomResourceFunctionDefinition": { "properties": { "name": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyAssignments.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyAssignments.json index 03e6fa3e7912..f28ad9d62305 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyAssignments.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyAssignments.json @@ -80,7 +80,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -145,7 +145,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -195,7 +195,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -248,7 +248,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -335,7 +335,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -382,7 +382,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -428,7 +428,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -477,7 +477,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -529,7 +529,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -572,7 +572,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -580,6 +580,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyAssignmentProperties": { "properties": { "displayName": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyDefinitions.json index 93ac0913144e..82ee6aac911b 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policyDefinitions.json @@ -84,7 +84,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -126,7 +126,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -168,7 +168,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -209,7 +209,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -262,7 +262,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -304,7 +304,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -346,7 +346,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -389,7 +389,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -432,7 +432,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -478,7 +478,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -489,6 +489,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicyDefinitionProperties": { "properties": { "policyType": { diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policySetDefinitions.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policySetDefinitions.json index 74a194cc7d10..4af4ba7facbd 100644 --- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policySetDefinitions.json +++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/policySetDefinitions.json @@ -90,7 +90,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -132,7 +132,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -174,7 +174,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -215,7 +215,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -258,7 +258,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -301,7 +301,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -366,7 +366,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -408,7 +408,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -450,7 +450,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -493,7 +493,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } }, @@ -504,6 +504,15 @@ } }, "definitions": { + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + } + }, + "description": "An error response from a policy operation." + }, "PolicySetDefinitionProperties": { "properties": { "policyType": { diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md index 732c571829c3..835ba0070520 100644 --- a/specification/resources/resource-manager/readme.md +++ b/specification/resources/resource-manager/readme.md @@ -37,7 +37,7 @@ tag: package-locks-2016-09 ``` ``` yaml $(package-policy) -tag: package-policy-2020-09 +tag: package-policy-2020-03 ``` ``` yaml $(package-resources) @@ -83,6 +83,7 @@ input-file: - Microsoft.Authorization/stable/2020-09-01/policyAssignments.json - Microsoft.Authorization/stable/2020-09-01/policyDefinitions.json - Microsoft.Authorization/stable/2020-09-01/policySetDefinitions.json +- Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json # Needed when there is more than one input file override-info: From 6bd5d43e6c08bde602b576e98662edab9b1352a7 Mon Sep 17 00:00:00 2001 From: Robert Gao Date: Wed, 27 Jan 2021 10:38:10 -0800 Subject: [PATCH 3/4] Addessed the comment --- specification/resources/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md index 835ba0070520..4739620a69db 100644 --- a/specification/resources/resource-manager/readme.md +++ b/specification/resources/resource-manager/readme.md @@ -37,7 +37,7 @@ tag: package-locks-2016-09 ``` ``` yaml $(package-policy) -tag: package-policy-2020-03 +tag: package-policy-2020-09 ``` ``` yaml $(package-resources) From 287d15fd770eb6cbff02a0679c0834fa10036a97 Mon Sep 17 00:00:00 2001 From: Robert Gao Date: Sat, 30 Jan 2021 23:13:19 -0800 Subject: [PATCH 4/4] Fixed go SDK generation error --- specification/resources/resource-manager/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/readme.go.md b/specification/resources/resource-manager/readme.go.md index 233aee938ec2..ea5ab26b6333 100644 --- a/specification/resources/resource-manager/readme.go.md +++ b/specification/resources/resource-manager/readme.go.md @@ -119,7 +119,7 @@ Please also specify `--go-sdk-folder=