Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor issues in policy exemptions #12636

Merged
merged 4 commits into from
Feb 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,6 @@
}
},
"parameters": [
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/PolicyExemption"
},
"description": "Parameters for the policy exemption."
},
{
"$ref": "#/parameters/ScopeParameter"
},
Expand All @@ -103,6 +94,15 @@
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/PolicyExemption"
},
"description": "Parameters for the policy exemption."
}
],
"responses": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -505,8 +519,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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -569,14 +569,23 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
"$ref": "#/definitions/CloudError"
}
}
}
}
}
},
"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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand All @@ -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": {
Expand Down
Loading