From f39cb659b728837c62256371403d769289bddec6 Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Tue, 20 Jul 2021 14:25:40 +0800 Subject: [PATCH 1/2] Change country to countryOrRegion to avoid political concern according to CELA --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 ++-- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 8b6bae973445..a21e50444a2e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -3405,7 +3405,7 @@ "httpStatusCode", "protocol", "cacheStatus", - "country", + "countryOrRegion", "customDomain" ], "x-ms-enum": { @@ -3914,7 +3914,7 @@ "userAgent", "clientIp", "url", - "country", + "countryOrRegion", "ruleType" ], "x-ms-enum": { diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json index 881048f2d377..aad27109d02a 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json @@ -4498,7 +4498,7 @@ "required": [ "relativePath", "action", - "countryCodes" + "countryOrRegionCodes" ], "properties": { "relativePath": { @@ -4517,8 +4517,8 @@ "modelAsString": false } }, - "countryCodes": { - "description": "Two letter country codes defining user country access in a geo filter, e.g. AU, MX, US.", + "countryOrRegionCodes": { + "description": "Two letter country or region codes defining user country/region access in a geo filter, e.g. AU, MX, US.", "type": "array", "items": { "type": "string" From f78f0edfff84e3924431189c5d1f9bdfaccdb091 Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Wed, 21 Jul 2021 09:51:19 +0800 Subject: [PATCH 2/2] Minor change to keep consistence --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json index aad27109d02a..c4c5afb5bafb 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json @@ -4518,7 +4518,7 @@ } }, "countryOrRegionCodes": { - "description": "Two letter country or region codes defining user country/region access in a geo filter, e.g. AU, MX, US.", + "description": "Two letter country or region codes defining user country or region access in a geo filter, e.g. AU, MX, US.", "type": "array", "items": { "type": "string"