From e91e138abc868ad415dd5bd9970dcd466928a647 Mon Sep 17 00:00:00 2001 From: Jian Song Date: Tue, 7 Jun 2022 11:12:59 -0700 Subject: [PATCH 1/3] add publicNetworkAccess property in site for swagger --- .../Microsoft.Web/stable/2022-03-01/CommonDefinitions.json | 4 ++++ .../Microsoft.Web/stable/2022-03-01/StaticSites.json | 4 ++++ .../Microsoft.Web/stable/2022-03-01/WebApps.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json index c2ac869d0a2c..c3d565fff0e2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json @@ -2960,6 +2960,10 @@ "readOnly": true, "example": "00000000-0000-0000-0000-000000000000" }, + "publicNetworkAccess": { + "description": "Property to allow or block all public traffic.", + "type": "string" + }, "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json index 0704506cc137..4a7adeec9686 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json @@ -3516,6 +3516,10 @@ "name": "EnterpriseGradeCdnStatus", "modelAsString": true } + }, + "publicNetworkAccess": { + "description": "State indicating whether public traffic are allowed or not for a static web app.", + "type": "string" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json index a691ccfff5a7..e62a44c29cd9 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json @@ -25494,6 +25494,10 @@ "readOnly": true, "example": "00000000-0000-0000-0000-000000000000" }, + "publicNetworkAccess": { + "description": "Property to allow or block all public traffic.", + "type": "string" + }, "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" From 64b32a6eabd4e95df86d9db057dc3c123d1bfe9c Mon Sep 17 00:00:00 2001 From: Jian Song Date: Tue, 7 Jun 2022 11:56:11 -0700 Subject: [PATCH 2/3] add suppression to fix Model Validation CI --- specification/web/resource-manager/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 3f94a29b233b..84a831168ea8 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -64,6 +64,12 @@ directive: - suppress: XMS_EXAMPLE_NOTFOUND_ERROR from: ResourceProvider.json reason: Model type is not owned by cert and domain team + - suppress: RESPONSE_STATUS_CODE_NOT_IN_SPEC + from: StaticSites.json + reason: Retroactive addition of missing examples out of scope at this time. + - suppress: RESPONSE_STATUS_CODE_NOT_IN_EXAMPLE + from: StaticSites.json + reason: Retroactive addition of missing examples out of scope at this time. ``` From f8d64fcf5f2ae5e88f20fa453c7dafc196688b48 Mon Sep 17 00:00:00 2001 From: Jian Song Date: Tue, 7 Jun 2022 17:32:24 -0700 Subject: [PATCH 3/3] Add allowed values in the description --- .../Microsoft.Web/stable/2022-03-01/CommonDefinitions.json | 2 +- .../Microsoft.Web/stable/2022-03-01/StaticSites.json | 2 +- .../Microsoft.Web/stable/2022-03-01/WebApps.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json index 8eb0c660535d..67ad7873982c 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/CommonDefinitions.json @@ -3002,7 +3002,7 @@ "example": "00000000-0000-0000-0000-000000000000" }, "publicNetworkAccess": { - "description": "Property to allow or block all public traffic.", + "description": "Property to allow or block all public traffic. Allowed Values: 'Enabled', 'Disabled' or an empty string.", "type": "string" }, "storageAccountRequired": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json index 4a7adeec9686..1c28ba5b1b68 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/StaticSites.json @@ -3518,7 +3518,7 @@ } }, "publicNetworkAccess": { - "description": "State indicating whether public traffic are allowed or not for a static web app.", + "description": "State indicating whether public traffic are allowed or not for a static web app. Allowed Values: 'Enabled', 'Disabled' or an empty string.", "type": "string" } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json index 51857cb9c48a..5604d5616258 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-03-01/WebApps.json @@ -25823,7 +25823,7 @@ "example": "00000000-0000-0000-0000-000000000000" }, "publicNetworkAccess": { - "description": "Property to allow or block all public traffic.", + "description": "Property to allow or block all public traffic. Allowed Values: 'Enabled', 'Disabled' or an empty string.", "type": "string" }, "storageAccountRequired": {