Skip to content

Commit

Permalink
Fix minor issues for AFDX public preview (Azure#12798)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@ShirleyJ27 @mkarmark
2 people authored and mkarmark committed Jul 20, 2021
1 parent 45b37b0 commit f18d042
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 43 deletions.
121 changes: 93 additions & 28 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2165,15 +2165,6 @@
"required": true,
"type": "string"
},
{
"name": "ruleSet",
"in": "body",
"description": "RuleSet properties",
"required": true,
"schema": {
"$ref": "#/definitions/RuleSet"
}
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
Expand Down Expand Up @@ -3355,6 +3346,7 @@
"name": "metrics",
"type": "array",
"required": true,
"collectionFormat": "multi",
"in": "query",
"items": {
"type": "string",
Expand All @@ -3365,7 +3357,11 @@
"originRequestTraffic",
"originRequestBandwidth",
"totalLatency"
]
],
"x-ms-enum": {
"name": "LogMetric",
"modelAsString": true
}
}
},
{
Expand All @@ -3391,13 +3387,18 @@
"PT5M",
"PT1H",
"P1D"
]
],
"x-ms-enum": {
"name": "LogMetricsGranularity",
"modelAsString": true
}
},
{
"name": "groupBy",
"in": "query",
"type": "array",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
Expand All @@ -3406,13 +3407,18 @@
"cacheStatus",
"country",
"customDomain"
]
],
"x-ms-enum": {
"name": "LogMetricsGroupBy",
"modelAsString": true
}
}
},
{
"name": "continents",
"type": "array",
"in": "query",
"collectionFormat": "multi",
"required": false,
"items": {
"type": "string"
Expand All @@ -3422,6 +3428,7 @@
"name": "countryOrRegions",
"type": "array",
"in": "query",
"collectionFormat": "multi",
"required": false,
"items": {
"type": "string"
Expand All @@ -3430,7 +3437,8 @@
{
"name": "customDomains",
"type": "array",
"required": false,
"required": true,
"collectionFormat": "multi",
"in": "query",
"items": {
"type": "string"
Expand All @@ -3439,7 +3447,8 @@
{
"name": "protocols",
"type": "array",
"required": false,
"required": true,
"collectionFormat": "multi",
"in": "query",
"items": {
"type": "string"
Expand Down Expand Up @@ -3496,6 +3505,7 @@
"type": "array",
"in": "query",
"required": true,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
Expand All @@ -3504,23 +3514,33 @@
"browser",
"userAgent",
"countryOrRegion"
]
],
"x-ms-enum": {
"name": "LogRanking",
"modelAsString": true
}
}
},
{
"name": "metrics",
"type": "array",
"in": "query",
"required": true,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"clientRequestCount",
"clientRequestTraffic",
"clientRequestBandwidth",
"originRequestTraffic",
"originRequestBandwidth"
]
"hitCount",
"missCount",
"userErrorCount",
"errorCount"
],
"x-ms-enum": {
"name": "LogRankingMetric",
"modelAsString": true
}
}
},
{
Expand Down Expand Up @@ -3549,6 +3569,7 @@
"type": "array",
"in": "query",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string"
}
Expand Down Expand Up @@ -3696,11 +3717,16 @@
"type": "array",
"in": "query",
"required": true,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"clientRequestCount"
]
],
"x-ms-enum": {
"name": "WafMetric",
"modelAsString": true
}
}
},
{
Expand All @@ -3726,48 +3752,67 @@
"PT5M",
"PT1H",
"P1D"
]
],
"x-ms-enum": {
"name": "WafGranularity",
"modelAsString": true
}
},
{
"name": "actions",
"type": "array",
"in": "query",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"allow",
"block",
"log",
"redirect"
]
],
"x-ms-enum": {
"name": "WafAction",
"modelAsString": true
}
}
},
{
"name": "groupBy",
"in": "query",
"type": "array",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"httpStatusCode",
"customDomain"
]
],
"x-ms-enum": {
"name": "WafRankingGroupBy",
"modelAsString": true
}
}
},
{
"name": "ruleTypes",
"type": "array",
"in": "query",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"managed",
"custom",
"bot"
]
],
"x-ms-enum": {
"name": "WafRuleType",
"modelAsString": true
}
}
}
],
Expand Down Expand Up @@ -3821,11 +3866,16 @@
"type": "array",
"in": "query",
"required": true,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"clientRequestCount"
]
],
"x-ms-enum": {
"name": "WafMetric",
"modelAsString": true
}
}
},
{
Expand Down Expand Up @@ -3854,6 +3904,7 @@
"type": "array",
"in": "query",
"required": true,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
Expand All @@ -3865,36 +3916,50 @@
"url",
"country",
"ruleType"
]
],
"x-ms-enum": {
"name": "WafRankingType",
"modelAsString": true
}
}
},
{
"name": "actions",
"type": "array",
"in": "query",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"allow",
"block",
"log",
"redirect"
]
],
"x-ms-enum": {
"name": "WafAction",
"modelAsString": true
}
}
},
{
"name": "ruleTypes",
"type": "array",
"in": "query",
"required": false,
"collectionFormat": "multi",
"items": {
"type": "string",
"enum": [
"managed",
"custom",
"bot"
]
],
"x-ms-enum": {
"name": "WafRuleType",
"modelAsString": true
}
}
}
],
Expand Down
15 changes: 5 additions & 10 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/cdn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5445,6 +5445,10 @@
"description": "Resource type.",
"readOnly": true,
"type": "string"
},
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
},
"x-ms-azure-resource": true
Expand Down Expand Up @@ -5518,10 +5522,6 @@
"update"
],
"description": "Resource tags."
},
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
},
"required": [
Expand All @@ -5535,12 +5535,7 @@
"$ref": "#/definitions/Resource"
}
],
"properties": {
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
}
"properties": {}
},
"QueryStringCachingBehavior": {
"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.",
Expand Down
9 changes: 8 additions & 1 deletion ...manager/Microsoft.Cdn/stable/2020-09-01/examples/LogAnalytics_GetLogAnalyticsMetrics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
"granularity": "PT5M",
"groupBy": "protocol",
"dateTimeBegin": "2020-11-04T04:30:00.000Z",
"dateTimeEnd": "2020-11-04T05:00:00.000Z"
"dateTimeEnd": "2020-11-04T05:00:00.000Z",
"customDomains": [
"customdomain1.azurecdn.net",
"customdomain2.azurecdn.net"
],
"protocols": [
"https"
]
},
"responses": {
"200": {
Expand Down
5 changes: 1 addition & 4 deletions ...cation/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"subscriptionId": "subid",
"resourceGroupName": "RG",
"profileName": "profile1",
"ruleSetName": "ruleSet1",
"ruleSet": {
"properties": {}
}
"ruleSetName": "ruleSet1"
},
"responses": {
"200": {
Expand Down

0 comments on commit f18d042

Please sign in to comment.