Skip to content

Commit 16f5e3b

Browse files
pilorpilor
committed
Add evaluationDelay to policy rule schema
1 parent 26c6b6d commit 16f5e3b

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

‎schemas/2020-10-01/policyDefinition.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
2+
"id": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"title": "Policy Definition",
55
"description": "This schema defines Azure resource policy definition, please see https://azure.microsoft.com/documentation/articles/resource-manager-policy/ for more details.",
@@ -83,6 +83,9 @@
8383
"type": "string"
8484
}
8585
},
86+
"evaluationDelay": {
87+
"type": "string"
88+
},
8689
"existenceCondition": {
8790
"oneOf": [
8891
{ "$ref": "#/definitions/condition" },

‎tests/2020-10-01/policyDefinition.tests.json‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"tests": [
33
{
44
"name": "PolicyDefinition tests - valid minimal rule",
5-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
5+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
66
"json": {
77
"if": {
88
"field": "location",
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"name": "PolicyDefinition tests - valid complex rule",
18-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
18+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
1919
"json": {
2020
"if": {
2121
"not": {
@@ -58,7 +58,7 @@
5858
},
5959
{
6060
"name": "PolicyDefinition tests - valid complex field count condition",
61-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
61+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
6262
"json": {
6363
"if": {
6464
"allOf": [
@@ -95,7 +95,7 @@
9595
},
9696
{
9797
"name": "PolicyDefinition tests - valid value count conditions",
98-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
98+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
9999
"json": {
100100
"if": {
101101
"allOf": [
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"name": "PolicyDefinition tests - valid append details",
159-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
159+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
160160
"json": {
161161
"if": {
162162
"field": "tags",
@@ -179,7 +179,7 @@
179179
},
180180
{
181181
"name": "PolicyDefinition tests - minimal ifNotExists details",
182-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
182+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
183183
"json": {
184184
"if": {
185185
"field": "tags",
@@ -195,7 +195,7 @@
195195
},
196196
{
197197
"name": "PolicyDefinition tests - complex ifNotExists details",
198-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
198+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
199199
"json": {
200200
"if": {
201201
"field": "tags",
@@ -207,6 +207,7 @@
207207
"type": "Microsoft.Compute/virtualMachines/extensions",
208208
"resourceGroupName": "myRG",
209209
"name": "myResource",
210+
"evaluationDelay": "AfterProvisioning",
210211
"existenceCondition": {
211212
"not": {
212213
"field": "location",
@@ -235,7 +236,7 @@
235236
},
236237
{
237238
"name": "PolicyDefinition tests - invalid deployIfNotExists deployment template",
238-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
239+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
239240
"expectedErrors": [
240241
{
241242
"message": "Data does not match any schemas from \"oneOf\"",
@@ -277,7 +278,7 @@
277278
},
278279
{
279280
"name": "PolicyDefinition tests - complex deployIfNotExists deployment",
280-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
281+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
281282
"json": {
282283
"if": {
283284
"allOf": [
@@ -519,7 +520,7 @@
519520
},
520521
{
521522
"name": "PolicyDefinition tests - invalid ifNotExists existenceCondition",
522-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
523+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
523524
"expectedErrors": [
524525
{
525526
"message": "Data does not match any schemas from \"oneOf\"",
@@ -543,7 +544,7 @@
543544
},
544545
{
545546
"name": "PolicyDefinition tests - invalid ifNotExists existenceScope",
546-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
547+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
547548
"expectedErrors": [
548549
{
549550
"message": "Data does not match any schemas from \"oneOf\"",
@@ -566,7 +567,7 @@
566567
},
567568
{
568569
"name": "PolicyDefinition tests - invalid ifNotExists deploymentScope",
569-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
570+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
570571
"expectedErrors": [
571572
{
572573
"message": "Data does not match any schemas from \"oneOf\"",
@@ -589,7 +590,7 @@
589590
},
590591
{
591592
"name": "PolicyDefinition tests - missing append details",
592-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
593+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
593594
"expectedErrors": [
594595
{
595596
"message": "Data does not match any schemas from \"oneOf\"",
@@ -609,7 +610,7 @@
609610
},
610611
{
611612
"name": "PolicyDefinition tests - invalid effect",
612-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
613+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
613614
"expectedErrors": [
614615
{
615616
"message": "Data does not match any schemas from \"oneOf\"",
@@ -643,7 +644,7 @@
643644
},
644645
{
645646
"name": "PolicyDefinition tests - invalid field property",
646-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
647+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
647648
"expectedErrors": [
648649
{
649650
"message": "Data does not match any schemas from \"oneOf\"",
@@ -662,7 +663,7 @@
662663
},
663664
{
664665
"name": "PolicyDefinition tests - invalid operator",
665-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
666+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
666667
"expectedErrors": [
667668
{
668669
"message": "Data does not match any schemas from \"oneOf\"",
@@ -681,7 +682,7 @@
681682
},
682683
{
683684
"name": "PolicyDefinition tests - array for non-array operator",
684-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
685+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
685686
"expectedErrors": [
686687
{
687688
"message": "Data does not match any schemas from \"oneOf\"",
@@ -700,7 +701,7 @@
700701
},
701702
{
702703
"name": "PolicyDefinition tests - string for array operator",
703-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
704+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
704705
"json": {
705706
"if": {
706707
"field": "location",
@@ -713,7 +714,7 @@
713714
},
714715
{
715716
"name": "PolicyDefinition tests - minimal modify details",
716-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
717+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
717718
"json": {
718719
"if": {
719720
"field": "tags",
@@ -734,7 +735,7 @@
734735
},
735736
{
736737
"name": "PolicyDefinition tests - invalid modify details",
737-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
738+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
738739
"json": {
739740
"if": {
740741
"field": "tags",
@@ -791,7 +792,7 @@
791792
},
792793
{
793794
"name": "PolicyDefinition tests - complex modify details",
794-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
795+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
795796
"json": {
796797
"if": {
797798
"field": "tags",
@@ -817,7 +818,7 @@
817818
},
818819
{
819820
"name": "PolicyDefinition tests - valid manual details",
820-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
821+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
821822
"json": {
822823
"if": {
823824
"field": "type",
@@ -833,7 +834,7 @@
833834
},
834835
{
835836
"name": "PolicyDefinition tests - no manual details",
836-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
837+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
837838
"json": {
838839
"if": {
839840
"field": "type",
@@ -846,7 +847,7 @@
846847
},
847848
{
848849
"name": "PolicyDefinition tests - empty manual details",
849-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
850+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
850851
"json": {
851852
"if": {
852853
"field": "type",
@@ -860,7 +861,7 @@
860861
},
861862
{
862863
"name": "PolicyDefinition tests - parameterized manual details",
863-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
864+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
864865
"json": {
865866
"if": {
866867
"field": "type",
@@ -876,7 +877,7 @@
876877
},
877878
{
878879
"name": "PolicyDefinition tests - invalid manual details",
879-
"definition": "https://schema.management.azure.com/schemas/2020-09-01/policyDefinition.json#",
880+
"definition": "https://schema.management.azure.com/schemas/2020-10-01/policyDefinition.json#",
880881
"json": {
881882
"if": {
882883
"field": "type",

‎tools/tests.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ const schemasToSkip = [
122122
'2019-06-01/policyDefinition.json',
123123
'2019-09-01/policyDefinition.json',
124124
'2020-09-01/policyDefinition.json',
125+
'2020-10-01/policyDefinition.json',
125126
'2018-05-01/subscriptionDeploymentParameters.json',
126127
'2018-05-01/subscriptionDeploymentTemplate.json',
127128
'2019-04-01/deploymentParameters.json',

0 commit comments

Comments
 (0)