Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7c4eedd
Add existing policy json to make review easier
vivsriaus Aug 24, 2017
cdf4468
Add policy set definition APIs
vivsriaus Aug 24, 2017
e9d9720
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Aug 25, 2017
59a4fcc
Add examples for policySetDefinition APIs
vivsriaus Aug 25, 2017
ddd97a0
Add policySku to policy assignment
vivsriaus Aug 25, 2017
286e4a1
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Aug 25, 2017
6b13491
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Aug 28, 2017
ff2f6c8
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Aug 30, 2017
139ee8d
Address feedback
vivsriaus Aug 30, 2017
28b7136
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Sep 5, 2017
5721e81
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Sep 6, 2017
2274b1c
Address more feedback
vivsriaus Sep 6, 2017
b37a167
Add parameter example
vivsriaus Sep 6, 2017
290fd9b
Fix incorrect example in listPSDefinitions
vivsriaus Sep 6, 2017
ddd44e0
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Sep 7, 2017
0ceabfc
Remove policy definitions from latest api version
vivsriaus Sep 7, 2017
df1297f
Update policy definition and policy assignment for old api-version
vivsriaus Sep 7, 2017
ea7c1ed
Update readme.md to include multiple policy files for new policy api …
vivsriaus Sep 7, 2017
780cc26
Address more feedback
vivsriaus Sep 7, 2017
5bd98a3
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
vivsriaus Sep 11, 2017
f7776f4
Add example for 200
vivsriaus Sep 11, 2017
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
Prev Previous commit
Next Next commit
Add policySku to policy assignment
  • Loading branch information
vivsriaus committed Aug 25, 2017
commit ddd97a086c77664d73200aaf86d8213a6a2792b0
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
"description": "The name of the policy assignment."
}
},
"description": "The policy definition.",
"description": "The policy assignment.",
"x-ms-azure-resource": true
},
"PolicyAssignmentListResult": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
"description": "The name of the policy assignment."
}
},
"description": "The policy definition.",
"description": "The policy assignment.",
"x-ms-azure-resource": true
},
"PolicyAssignmentListResult": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
"description": "The name of the policy assignment."
}
},
"description": "The policy definition.",
"description": "The policy assignment.",
"x-ms-azure-resource": true
},
"PolicyAssignmentListResult": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,22 @@
},
"description": "The policy assignment properties."
},
"PolicySku": {
"properties": {
"name": {
"type": "string",
"description": "The name of the policy sku. Possible values are A0 and A1."
},
"tier": {
"type": "string",
"description": "The policy sku tier. Possible values are Free and Standard."
}
},
"required": [
"name"
],
"description": "The policy sku."
},
"PolicyAssignment": {
"properties": {
"properties": {
Expand All @@ -919,9 +935,13 @@
"name": {
"type": "string",
"description": "The name of the policy assignment."
},
"sku": {
"$ref": "#/definitions/PolicySku",
"description": "The policy sku."
}
},
"description": "The policy definition.",
"description": "The policy assignment.",
"x-ms-azure-resource": true
},
"PolicyAssignmentListResult": {
Expand Down