Skip to content

Commit 7d69475

Browse files
ShirleyJ27Shirley Jiang
ShirleyJ27
and
Shirley Jiang
authored
Fix minor issues for AFDX public preview (#12798)
* move systemdata to the end * update * revert unwanted change * ruleset & loganalytics changes * "collectionFormat": "multi" * fix model valiation * fix validation errors * Update readme.python.md * take 2 * take 3 * remove the lenient-model-deduplication fix as it didnt help Co-authored-by: Shirley Jiang <xujia@microsoft.com>
1 parent 996bbc4 commit 7d69475

File tree

4 files changed

+107
-43
lines changed

4 files changed

+107
-43
lines changed

‎specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json‎

Lines changed: 93 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,15 +2165,6 @@
21652165
"required": true,
21662166
"type": "string"
21672167
},
2168-
{
2169-
"name": "ruleSet",
2170-
"in": "body",
2171-
"description": "RuleSet properties",
2172-
"required": true,
2173-
"schema": {
2174-
"$ref": "#/definitions/RuleSet"
2175-
}
2176-
},
21772168
{
21782169
"$ref": "#/parameters/subscriptionIdParameter"
21792170
},
@@ -3355,6 +3346,7 @@
33553346
"name": "metrics",
33563347
"type": "array",
33573348
"required": true,
3349+
"collectionFormat": "multi",
33583350
"in": "query",
33593351
"items": {
33603352
"type": "string",
@@ -3365,7 +3357,11 @@
33653357
"originRequestTraffic",
33663358
"originRequestBandwidth",
33673359
"totalLatency"
3368-
]
3360+
],
3361+
"x-ms-enum": {
3362+
"name": "LogMetric",
3363+
"modelAsString": true
3364+
}
33693365
}
33703366
},
33713367
{
@@ -3391,13 +3387,18 @@
33913387
"PT5M",
33923388
"PT1H",
33933389
"P1D"
3394-
]
3390+
],
3391+
"x-ms-enum": {
3392+
"name": "LogMetricsGranularity",
3393+
"modelAsString": true
3394+
}
33953395
},
33963396
{
33973397
"name": "groupBy",
33983398
"in": "query",
33993399
"type": "array",
34003400
"required": false,
3401+
"collectionFormat": "multi",
34013402
"items": {
34023403
"type": "string",
34033404
"enum": [
@@ -3406,13 +3407,18 @@
34063407
"cacheStatus",
34073408
"country",
34083409
"customDomain"
3409-
]
3410+
],
3411+
"x-ms-enum": {
3412+
"name": "LogMetricsGroupBy",
3413+
"modelAsString": true
3414+
}
34103415
}
34113416
},
34123417
{
34133418
"name": "continents",
34143419
"type": "array",
34153420
"in": "query",
3421+
"collectionFormat": "multi",
34163422
"required": false,
34173423
"items": {
34183424
"type": "string"
@@ -3422,6 +3428,7 @@
34223428
"name": "countryOrRegions",
34233429
"type": "array",
34243430
"in": "query",
3431+
"collectionFormat": "multi",
34253432
"required": false,
34263433
"items": {
34273434
"type": "string"
@@ -3430,7 +3437,8 @@
34303437
{
34313438
"name": "customDomains",
34323439
"type": "array",
3433-
"required": false,
3440+
"required": true,
3441+
"collectionFormat": "multi",
34343442
"in": "query",
34353443
"items": {
34363444
"type": "string"
@@ -3439,7 +3447,8 @@
34393447
{
34403448
"name": "protocols",
34413449
"type": "array",
3442-
"required": false,
3450+
"required": true,
3451+
"collectionFormat": "multi",
34433452
"in": "query",
34443453
"items": {
34453454
"type": "string"
@@ -3496,6 +3505,7 @@
34963505
"type": "array",
34973506
"in": "query",
34983507
"required": true,
3508+
"collectionFormat": "multi",
34993509
"items": {
35003510
"type": "string",
35013511
"enum": [
@@ -3504,23 +3514,33 @@
35043514
"browser",
35053515
"userAgent",
35063516
"countryOrRegion"
3507-
]
3517+
],
3518+
"x-ms-enum": {
3519+
"name": "LogRanking",
3520+
"modelAsString": true
3521+
}
35083522
}
35093523
},
35103524
{
35113525
"name": "metrics",
35123526
"type": "array",
35133527
"in": "query",
35143528
"required": true,
3529+
"collectionFormat": "multi",
35153530
"items": {
35163531
"type": "string",
35173532
"enum": [
35183533
"clientRequestCount",
35193534
"clientRequestTraffic",
3520-
"clientRequestBandwidth",
3521-
"originRequestTraffic",
3522-
"originRequestBandwidth"
3523-
]
3535+
"hitCount",
3536+
"missCount",
3537+
"userErrorCount",
3538+
"errorCount"
3539+
],
3540+
"x-ms-enum": {
3541+
"name": "LogRankingMetric",
3542+
"modelAsString": true
3543+
}
35243544
}
35253545
},
35263546
{
@@ -3549,6 +3569,7 @@
35493569
"type": "array",
35503570
"in": "query",
35513571
"required": false,
3572+
"collectionFormat": "multi",
35523573
"items": {
35533574
"type": "string"
35543575
}
@@ -3696,11 +3717,16 @@
36963717
"type": "array",
36973718
"in": "query",
36983719
"required": true,
3720+
"collectionFormat": "multi",
36993721
"items": {
37003722
"type": "string",
37013723
"enum": [
37023724
"clientRequestCount"
3703-
]
3725+
],
3726+
"x-ms-enum": {
3727+
"name": "WafMetric",
3728+
"modelAsString": true
3729+
}
37043730
}
37053731
},
37063732
{
@@ -3726,48 +3752,67 @@
37263752
"PT5M",
37273753
"PT1H",
37283754
"P1D"
3729-
]
3755+
],
3756+
"x-ms-enum": {
3757+
"name": "WafGranularity",
3758+
"modelAsString": true
3759+
}
37303760
},
37313761
{
37323762
"name": "actions",
37333763
"type": "array",
37343764
"in": "query",
37353765
"required": false,
3766+
"collectionFormat": "multi",
37363767
"items": {
37373768
"type": "string",
37383769
"enum": [
37393770
"allow",
37403771
"block",
37413772
"log",
37423773
"redirect"
3743-
]
3774+
],
3775+
"x-ms-enum": {
3776+
"name": "WafAction",
3777+
"modelAsString": true
3778+
}
37443779
}
37453780
},
37463781
{
37473782
"name": "groupBy",
37483783
"in": "query",
37493784
"type": "array",
37503785
"required": false,
3786+
"collectionFormat": "multi",
37513787
"items": {
37523788
"type": "string",
37533789
"enum": [
37543790
"httpStatusCode",
37553791
"customDomain"
3756-
]
3792+
],
3793+
"x-ms-enum": {
3794+
"name": "WafRankingGroupBy",
3795+
"modelAsString": true
3796+
}
37573797
}
37583798
},
37593799
{
37603800
"name": "ruleTypes",
37613801
"type": "array",
37623802
"in": "query",
37633803
"required": false,
3804+
"collectionFormat": "multi",
37643805
"items": {
37653806
"type": "string",
37663807
"enum": [
37673808
"managed",
37683809
"custom",
37693810
"bot"
3770-
]
3811+
],
3812+
"x-ms-enum": {
3813+
"name": "WafRuleType",
3814+
"modelAsString": true
3815+
}
37713816
}
37723817
}
37733818
],
@@ -3821,11 +3866,16 @@
38213866
"type": "array",
38223867
"in": "query",
38233868
"required": true,
3869+
"collectionFormat": "multi",
38243870
"items": {
38253871
"type": "string",
38263872
"enum": [
38273873
"clientRequestCount"
3828-
]
3874+
],
3875+
"x-ms-enum": {
3876+
"name": "WafMetric",
3877+
"modelAsString": true
3878+
}
38293879
}
38303880
},
38313881
{
@@ -3854,6 +3904,7 @@
38543904
"type": "array",
38553905
"in": "query",
38563906
"required": true,
3907+
"collectionFormat": "multi",
38573908
"items": {
38583909
"type": "string",
38593910
"enum": [
@@ -3865,36 +3916,50 @@
38653916
"url",
38663917
"country",
38673918
"ruleType"
3868-
]
3919+
],
3920+
"x-ms-enum": {
3921+
"name": "WafRankingType",
3922+
"modelAsString": true
3923+
}
38693924
}
38703925
},
38713926
{
38723927
"name": "actions",
38733928
"type": "array",
38743929
"in": "query",
38753930
"required": false,
3931+
"collectionFormat": "multi",
38763932
"items": {
38773933
"type": "string",
38783934
"enum": [
38793935
"allow",
38803936
"block",
38813937
"log",
38823938
"redirect"
3883-
]
3939+
],
3940+
"x-ms-enum": {
3941+
"name": "WafAction",
3942+
"modelAsString": true
3943+
}
38843944
}
38853945
},
38863946
{
38873947
"name": "ruleTypes",
38883948
"type": "array",
38893949
"in": "query",
38903950
"required": false,
3951+
"collectionFormat": "multi",
38913952
"items": {
38923953
"type": "string",
38933954
"enum": [
38943955
"managed",
38953956
"custom",
38963957
"bot"
3897-
]
3958+
],
3959+
"x-ms-enum": {
3960+
"name": "WafRuleType",
3961+
"modelAsString": true
3962+
}
38983963
}
38993964
}
39003965
],

‎specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/cdn.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5445,6 +5445,10 @@
54455445
"description": "Resource type.",
54465446
"readOnly": true,
54475447
"type": "string"
5448+
},
5449+
"systemData": {
5450+
"$ref": "#/definitions/SystemData",
5451+
"readOnly": true
54485452
}
54495453
},
54505454
"x-ms-azure-resource": true
@@ -5518,10 +5522,6 @@
55185522
"update"
55195523
],
55205524
"description": "Resource tags."
5521-
},
5522-
"systemData": {
5523-
"$ref": "#/definitions/SystemData",
5524-
"readOnly": true
55255525
}
55265526
},
55275527
"required": [
@@ -5535,12 +5535,7 @@
55355535
"$ref": "#/definitions/Resource"
55365536
}
55375537
],
5538-
"properties": {
5539-
"systemData": {
5540-
"$ref": "#/definitions/SystemData",
5541-
"readOnly": true
5542-
}
5543-
}
5538+
"properties": {}
55445539
},
55455540
"QueryStringCachingBehavior": {
55465541
"description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.",

‎specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/LogAnalytics_GetLogAnalyticsMetrics.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@
88
"granularity": "PT5M",
99
"groupBy": "protocol",
1010
"dateTimeBegin": "2020-11-04T04:30:00.000Z",
11-
"dateTimeEnd": "2020-11-04T05:00:00.000Z"
11+
"dateTimeEnd": "2020-11-04T05:00:00.000Z",
12+
"customDomains": [
13+
"customdomain1.azurecdn.net",
14+
"customdomain2.azurecdn.net"
15+
],
16+
"protocols": [
17+
"https"
18+
]
1219
},
1320
"responses": {
1421
"200": {

‎specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
"subscriptionId": "subid",
55
"resourceGroupName": "RG",
66
"profileName": "profile1",
7-
"ruleSetName": "ruleSet1",
8-
"ruleSet": {
9-
"properties": {}
10-
}
7+
"ruleSetName": "ruleSet1"
118
},
129
"responses": {
1310
"200": {

0 commit comments

Comments
 (0)