From 7cf7add97ddda5d87b1b6fbe2e575d86688ae11e Mon Sep 17 00:00:00 2001 From: Aleksandar Boljanac Date: Mon, 19 Apr 2021 17:22:13 -0700 Subject: [PATCH 01/12] Add CreateOrUpdateSwiftVirtualNetworkConnectionWithCheck, and site-level virtualNetworkSubnetId field --- .../stable/2020-12-01/WebApps.json | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index ce920f99fb9f..cf7ea981e400 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -5955,6 +5955,55 @@ } } } + }, + "put": { + "tags": [ + "WebApps" + ], + "summary": "Integrates this Web App with a Virtual Network. This requires that 1) \"swiftSupported\" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not\r\nin use by another App Service Plan other than the one this App is in.", + "description": "Description for Integrates this Web App with a Virtual Network. This requires that 1) \"swiftSupported\" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not\nin use by another App Service Plan other than the one this App is in.", + "operationId": "WebApps_CreateOrUpdateSwiftVirtualNetworkConnectionWithCheck", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the app.", + "required": true, + "type": "string" + }, + { + "name": "connectionEnvelope", + "in": "body", + "description": "Properties of the Virtual Network connection. See example.", + "required": true, + "schema": { + "$ref": "#/definitions/SwiftVirtualNetwork" + } + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SwiftVirtualNetwork" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + } }, "delete": { "tags": [ From 75b8ea7312ad1d8b10f82329a4f0c3426da21723 Mon Sep 17 00:00:00 2001 From: Aleksandar Boljanac Date: Mon, 19 Apr 2021 17:23:41 -0700 Subject: [PATCH 02/12] Add site-level virtualNetworkSubnetId field --- .../Microsoft.Web/stable/2020-12-01/WebApps.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index cf7ea981e400..87ee96f32276 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -25211,6 +25211,10 @@ "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" + }, + "virtualNetworkSubnetId": { + "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", + "type": "string" } }, "x-ms-client-flatten": true From 8a1420b0c2f95958aeee44eac47b5a781f835aa4 Mon Sep 17 00:00:00 2001 From: Aleksandar Boljanac Date: Mon, 19 Apr 2021 17:24:56 -0700 Subject: [PATCH 03/12] Tabs vs spaces --- .../Microsoft.Web/stable/2020-12-01/WebApps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 87ee96f32276..0fd594e7cd9b 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -5956,7 +5956,7 @@ } } }, - "put": { + "put": { "tags": [ "WebApps" ], From 89c30d45c5d5373a9c1fb8cc921dff202fd39f27 Mon Sep 17 00:00:00 2001 From: Aleksandar Boljanac Date: Mon, 19 Apr 2021 18:00:48 -0700 Subject: [PATCH 04/12] Removing the new property since it's technically a 'breaking change' --- .../Microsoft.Web/stable/2020-12-01/WebApps.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 0fd594e7cd9b..65a80cb066c0 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -25211,10 +25211,6 @@ "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" - }, - "virtualNetworkSubnetId": { - "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", - "type": "string" } }, "x-ms-client-flatten": true From 9047108339626f1ea4f76a11882d6f6b6cb91d87 Mon Sep 17 00:00:00 2001 From: Naveed Aziz Date: Thu, 22 Apr 2021 15:54:03 -0700 Subject: [PATCH 05/12] Add changes needed for correct .NET SDK generation issues. Reference PR: https://github.com/Azure/azure-sdk-for-net/pull/20300 --- .../2020-12-01/AppServiceEnvironments.json | 12 +- .../stable/2020-12-01/AppServicePlans.json | 24 +- .../stable/2020-12-01/Certificates.json | 42 ++- .../stable/2020-12-01/CommonDefinitions.json | 48 +-- .../stable/2020-12-01/Provider.json | 24 +- .../stable/2020-12-01/Recommendations.json | 60 ++-- .../stable/2020-12-01/StaticSites.json | 49 ++- .../stable/2020-12-01/WebApps.json | 305 +++++++++++++----- 8 files changed, 354 insertions(+), 210 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json index 8500f1972931..6db780e3526b 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json @@ -1676,18 +1676,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json index cfe28d0e7182..4828e0d32f81 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json @@ -741,6 +741,12 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$skipToken", "in": "query", @@ -759,12 +765,6 @@ "in": "query", "description": "List page size. If specified, results are paged.", "type": "string" - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -847,18 +847,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2').", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json index 5a9779fd3480..2f2b6b0b03e2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json @@ -24,18 +24,18 @@ "description": "Description for Get all certificates for a subscription.", "operationId": "Certificates_List", "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only information specified in the filter (using OData syntax). For example: $filter=KeyVaultId eq 'KeyVaultId'", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -319,6 +319,13 @@ "properties": { "description": "Certificate resource specific properties", "properties": { + "password": { + "description": "Certificate password.", + "type": "string", + "x-ms-mutability": [ + "create" + ] + }, "friendlyName": { "description": "Friendly name of the certificate.", "type": "string", @@ -368,14 +375,6 @@ "type": "string", "readOnly": true }, - "password": { - "description": "Certificate password.", - "type": "string", - "x-ms-secret": true, - "x-ms-mutability": [ - "create" - ] - }, "thumbprint": { "description": "Certificate thumbprint.", "type": "string", @@ -482,6 +481,13 @@ "properties": { "description": "CertificatePatchResource resource specific properties", "properties": { + "password": { + "description": "Certificate password.", + "type": "string", + "x-ms-mutability": [ + "create" + ] + }, "friendlyName": { "description": "Friendly name of the certificate.", "type": "string", @@ -531,14 +537,6 @@ "type": "string", "readOnly": true }, - "password": { - "description": "Certificate password.", - "type": "string", - "x-ms-secret": true, - "x-ms-mutability": [ - "create" - ] - }, "thumbprint": { "description": "Certificate thumbprint.", "type": "string", diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index dd7207cdab9a..ec202fa61e09 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -414,13 +414,6 @@ "$ref": "#/definitions/StatusCodesBasedTrigger" } }, - "statusCodesRange": { - "description": "A rule based on status codes ranges.", - "type": "array", - "items": { - "$ref": "#/definitions/StatusCodesRangeBasedTrigger" - } - }, "slowRequests": { "$ref": "#/definitions/SlowRequestsBasedTrigger", "description": "A rule based on request execution time." @@ -431,6 +424,13 @@ "items": { "$ref": "#/definitions/SlowRequestsBasedTrigger" } + }, + "statusCodesRange": { + "description": "A rule based on status codes ranges.", + "type": "array", + "items": { + "$ref": "#/definitions/StatusCodesRangeBasedTrigger" + } } } }, @@ -2326,10 +2326,6 @@ "description": "Status of the last deployment slot swap operation.", "readOnly": true }, - "keyVaultReferenceIdentity": { - "description": "Identity to use for Key Vault Reference authentication.", - "type": "string" - }, "httpsOnly": { "description": "HttpsOnly: configures a web site to accept only https requests. Issues redirect for\nhttp requests", "type": "boolean" @@ -2359,6 +2355,14 @@ "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" + }, + "virtualNetworkSubnetId": { + "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", + "type": "string" + }, + "keyVaultReferenceIdentity": { + "description": "Identity to use for Key Vault Reference authentication.", + "type": "string" } }, "x-ms-client-flatten": true @@ -2454,13 +2458,6 @@ "$ref": "#/definitions/NameValuePair" } }, - "azureStorageAccounts": { - "description": "List of Azure Storage Accounts.", - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/AzureStorageInfoValue" - } - }, "connectionStrings": { "description": "Connection strings.", "type": "array", @@ -2740,6 +2737,13 @@ "maximum": 20, "minimum": 0, "type": "integer" + }, + "azureStorageAccounts": { + "description": "List of Azure Storage Accounts.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/AzureStorageInfoValue" + } } } }, @@ -2972,10 +2976,6 @@ "description": "Win32 error code.", "type": "integer" }, - "path": { - "description": "Request Path", - "type": "string" - }, "count": { "format": "int32", "description": "Request Count.", @@ -2984,6 +2984,10 @@ "timeInterval": { "description": "Time interval.", "type": "string" + }, + "path": { + "description": "Request Path", + "type": "string" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json index a59e69a008a0..39b5010afd30 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json @@ -777,6 +777,18 @@ "description": "true if this supports Application Insights; otherwise, false.", "type": "boolean" }, + "isPreview": { + "description": "true if this stack is in Preview, otherwise false.", + "type": "boolean" + }, + "isDeprecated": { + "description": "true if this stack has been deprecated, otherwise false.", + "type": "boolean" + }, + "isHidden": { + "description": "true if this stack should be hidden for new customers on portal, otherwise false.", + "type": "boolean" + }, "appSettingsDictionary": { "description": "\n \n\n Example: All the function apps need AppSetting: \"FUNCTIONS_WORKER_RUNTIME\" to be set stack name", "type": "object", @@ -790,18 +802,6 @@ "additionalProperties": { "type": "object" } - }, - "isPreview": { - "description": "true if this stack is in Preview, otherwise false.", - "type": "boolean" - }, - "isDeprecated": { - "description": "true if this stack has been deprecated, otherwise false.", - "type": "boolean" - }, - "isHidden": { - "description": "true if this stack should be hidden for new customers on portal, otherwise false.", - "type": "boolean" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Recommendations.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Recommendations.json index 9980d291dfa0..bd8e67948d50 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Recommendations.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Recommendations.json @@ -30,18 +30,18 @@ "description": "Specify true to return only the most critical recommendations. The default is false, which returns all recommendations.", "type": "boolean" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -153,18 +153,18 @@ "description": "Specify false to return all recommendations. The default is true, which returns only expired recommendations.", "type": "boolean" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -211,18 +211,18 @@ "description": "Specify true to return only the most critical recommendations. The default is false, which returns all recommendations.", "type": "boolean" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -472,18 +472,18 @@ "description": "Specify false to return all recommendations. The default is true, which returns only expired recommendations.", "type": "boolean" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -530,18 +530,18 @@ "description": "Specify true to return only the most critical recommendations. The default is false, which returns all recommendations.", "type": "boolean" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json index cac9881f20f3..50efaf1507db 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json @@ -2826,11 +2826,6 @@ "description": "The target branch in the repository.", "type": "string" }, - "provider": { - "description": "The provider that submitted the last deployment to the primary environment of the static site.", - "type": "string", - "readOnly": true - }, "customDomains": { "description": "The custom domains associated with this static site.", "type": "array", @@ -2847,10 +2842,6 @@ "$ref": "#/definitions/StaticSiteBuildProperties", "description": "Build properties to configure on the repository." }, - "templateProperties": { - "$ref": "#/definitions/StaticSiteTemplateOptions", - "description": "Template options for generating a new repository." - }, "privateEndpointConnections": { "description": "Private endpoint connections", "type": "array", @@ -2859,6 +2850,26 @@ }, "readOnly": true }, + "stagingEnvironmentPolicy": { + "description": "State indicating whether staging environments are allowed or not allowed for a static web app.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "StagingEnvironmentPolicy", + "modelAsString": false + } + }, + "allowConfigFileUpdates": { + "description": "false if config file is locked for this static web app; otherwise, true.", + "type": "boolean" + }, + "templateProperties": { + "$ref": "#/definitions/StaticSiteTemplateOptions", + "description": "Template options for generating a new repository." + }, "contentDistributionEndpoint": { "description": "The content distribution endpoint for the static site.", "type": "string", @@ -2866,8 +2877,7 @@ }, "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", - "type": "string", - "readOnly": true + "type": "string" }, "userProvidedFunctionApps": { "description": "User provided function apps registered with the static site", @@ -2877,21 +2887,10 @@ }, "readOnly": true }, - "stagingEnvironmentPolicy": { - "description": "State indicating whether staging environments are allowed or not allowed for a static web app.", - "enum": [ - "Enabled", - "Disabled" - ], + "provider": { + "description": "The provider that submitted the last deployment to the primary environment of the static site.", "type": "string", - "x-ms-enum": { - "name": "StagingEnvironmentPolicy", - "modelAsString": false - } - }, - "allowConfigFileUpdates": { - "description": "false if config file is locked for this static web app; otherwise, true.", - "type": "boolean" + "readOnly": true } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 65a80cb066c0..95f744977b83 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -6594,18 +6594,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -15512,18 +15512,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -18682,18 +18682,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -20347,18 +20347,18 @@ "required": true, "type": "string" }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, { "name": "$filter", "in": "query", "description": "Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.", "type": "string", "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" } ], "responses": { @@ -21025,6 +21025,7 @@ } }, "AppRegistration": { + "description": "The configuration settings of the app registration for providers that have app ids and app secrets", "type": "object", "allOf": [ { @@ -21036,9 +21037,11 @@ "description": "AppRegistration resource specific properties", "properties": { "appId": { + "description": "The App ID of the app used for login.", "type": "string" }, "appSecretSettingName": { + "description": "The app setting name that contains the app secret.", "type": "string" } }, @@ -21047,6 +21050,7 @@ } }, "Apple": { + "description": "The configuration settings of the Apple provider.", "type": "object", "allOf": [ { @@ -21058,13 +21062,16 @@ "description": "Apple resource specific properties", "properties": { "enabled": { + "description": "false if the Apple provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/AppleRegistration" + "$ref": "#/definitions/AppleRegistration", + "description": "The configuration settings of the Apple registration." }, "login": { - "$ref": "#/definitions/LoginScopes" + "$ref": "#/definitions/LoginScopes", + "description": "The configuration settings of the login flow." } }, "x-ms-client-flatten": true @@ -21072,6 +21079,7 @@ } }, "AppleRegistration": { + "description": "The configuration settings of the registration for the Apple provider", "type": "object", "allOf": [ { @@ -21083,9 +21091,11 @@ "description": "AppleRegistration resource specific properties", "properties": { "clientId": { + "description": "The Client ID of the app used for login.", "type": "string" }, "clientSecretSettingName": { + "description": "The app setting name that contains the client secret.", "type": "string" } }, @@ -21112,6 +21122,7 @@ } }, "AuthPlatform": { + "description": "The configuration settings of the platform of App Service Authentication/Authorization.", "type": "object", "allOf": [ { @@ -21123,12 +21134,15 @@ "description": "AuthPlatform resource specific properties", "properties": { "enabled": { + "description": "true if the Authentication / Authorization feature is enabled for the current app; otherwise, false.", "type": "boolean" }, "runtimeVersion": { + "description": "The RuntimeVersion of the Authentication / Authorization feature in use for the current app.\nThe setting in this value can control the behavior of certain features in the Authentication / Authorization module.", "type": "string" }, "configFilePath": { + "description": "The path of the config file containing auth settings if they come from a file.\nIf the path is relative, base will the site's root directory.", "type": "string" } }, @@ -21137,6 +21151,7 @@ } }, "AzureActiveDirectory": { + "description": "The configuration settings of the Azure Active directory provider.", "type": "object", "allOf": [ { @@ -21148,18 +21163,23 @@ "description": "AzureActiveDirectory resource specific properties", "properties": { "enabled": { + "description": "false if the Azure Active Directory provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/AzureActiveDirectoryRegistration" + "$ref": "#/definitions/AzureActiveDirectoryRegistration", + "description": "The configuration settings of the Azure Active Directory app registration." }, "login": { - "$ref": "#/definitions/AzureActiveDirectoryLogin" + "$ref": "#/definitions/AzureActiveDirectoryLogin", + "description": "The configuration settings of the Azure Active Directory login flow." }, "validation": { - "$ref": "#/definitions/AzureActiveDirectoryValidation" + "$ref": "#/definitions/AzureActiveDirectoryValidation", + "description": "The configuration settings of the Azure Active Directory token validation flow." }, "isAutoProvisioned": { + "description": "Gets a value indicating whether the Azure AD configuration was auto-provisioned using 1st party tooling.\nThis is an internal flag primarily intended to support the Azure Management Portal. Users should not\nread or write to this property.", "type": "boolean" } }, @@ -21168,6 +21188,7 @@ } }, "AzureActiveDirectoryLogin": { + "description": "The configuration settings of the Azure Active Directory login flow.", "type": "object", "allOf": [ { @@ -21182,6 +21203,7 @@ "type": "boolean" }, "loginParameters": { + "description": "Login parameters to send to the OpenID Connect authorization endpoint when\na user logs in. Each parameter must be in the form \"key=value\".", "type": "array", "items": { "type": "string" @@ -21193,6 +21215,7 @@ } }, "AzureActiveDirectoryRegistration": { + "description": "The configuration settings of the Azure Active Directory app registration.", "type": "object", "allOf": [ { @@ -21204,15 +21227,19 @@ "description": "AzureActiveDirectoryRegistration resource specific properties", "properties": { "openIdIssuer": { + "description": "The OpenID Connect Issuer URI that represents the entity which issues access tokens for this application.\nWhen using Azure Active Directory, this value is the URI of the directory tenant, e.g. https://login.microsoftonline.com/v2.0/{tenant-guid}/.\nThis URI is a case-sensitive identifier for the token issuer.\nMore information on OpenID Connect Discovery: http://openid.net/specs/openid-connect-discovery-1_0.html", "type": "string" }, "clientId": { + "description": "The Client ID of this relying party application, known as the client_id.\nThis setting is required for enabling OpenID Connection authentication with Azure Active Directory or \nother 3rd party OpenID Connect providers.\nMore information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html", "type": "string" }, "clientSecretSettingName": { + "description": "The app setting name that contains the client secret of the relying party application.", "type": "string" }, "clientSecretCertificateThumbprint": { + "description": "An alternative to the client secret, that is the thumbprint of a certificate used for signing purposes. This property acts as\na replacement for the Client Secret. It is also optional.", "type": "string" } }, @@ -21221,6 +21248,7 @@ } }, "AzureActiveDirectoryValidation": { + "description": "The configuration settings of the Azure Active Directory token validation flow.", "type": "object", "allOf": [ { @@ -21232,9 +21260,11 @@ "description": "AzureActiveDirectoryValidation resource specific properties", "properties": { "jwtClaimChecks": { - "$ref": "#/definitions/JwtClaimChecks" + "$ref": "#/definitions/JwtClaimChecks", + "description": "The configuration settings of the checks that should be made while validating the JWT Claims." }, "allowedAudiences": { + "description": "The list of audiences that can make successful authentication/authorization requests.", "type": "array", "items": { "type": "string" @@ -21295,6 +21325,7 @@ } }, "AzureStaticWebApps": { + "description": "The configuration settings of the Azure Static Web Apps provider.", "type": "object", "allOf": [ { @@ -21306,10 +21337,12 @@ "description": "AzureStaticWebApps resource specific properties", "properties": { "enabled": { + "description": "false if the Azure Static Web Apps provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/AzureStaticWebAppsRegistration" + "$ref": "#/definitions/AzureStaticWebAppsRegistration", + "description": "The configuration settings of the Azure Static Web Apps registration." } }, "x-ms-client-flatten": true @@ -21317,6 +21350,7 @@ } }, "AzureStaticWebAppsRegistration": { + "description": "The configuration settings of the registration for the Azure Static Web Apps provider", "type": "object", "allOf": [ { @@ -21328,6 +21362,7 @@ "description": "AzureStaticWebAppsRegistration resource specific properties", "properties": { "clientId": { + "description": "The Client ID of the app used for login.", "type": "string" } }, @@ -21613,6 +21648,7 @@ } }, "BlobStorageTokenStore": { + "description": "The configuration settings of the storage of the tokens if blob storage is used.", "type": "object", "allOf": [ { @@ -21624,6 +21660,7 @@ "description": "BlobStorageTokenStore resource specific properties", "properties": { "sasUrlSettingName": { + "description": "The name of the app setting containing the SAS URL of the blob storage containing the tokens.", "type": "string" } }, @@ -21632,6 +21669,7 @@ } }, "ClientRegistration": { + "description": "The configuration settings of the app registration for providers that have client ids and client secrets", "type": "object", "allOf": [ { @@ -21643,9 +21681,11 @@ "description": "ClientRegistration resource specific properties", "properties": { "clientId": { + "description": "The Client ID of the app used for login.", "type": "string" }, "clientSecretSettingName": { + "description": "The app setting name that contains the client secret.", "type": "string" } }, @@ -21953,6 +21993,7 @@ } }, "CookieExpiration": { + "description": "The configuration settings of the session cookie's expiration.", "type": "object", "allOf": [ { @@ -21964,6 +22005,7 @@ "description": "CookieExpiration resource specific properties", "properties": { "convention": { + "description": "The convention used when determining the session cookie's expiration.", "enum": [ "FixedTime", "IdentityProviderDerived" @@ -21975,6 +22017,7 @@ } }, "timeToExpiration": { + "description": "The time after the request is made when the session cookie should expire.", "type": "string" } }, @@ -22168,6 +22211,7 @@ } }, "CustomOpenIdConnectProvider": { + "description": "The configuration settings of the custom Open ID Connect provider.", "type": "object", "allOf": [ { @@ -22179,13 +22223,16 @@ "description": "CustomOpenIdConnectProvider resource specific properties", "properties": { "enabled": { + "description": "false if the custom Open ID provider provider should not be enabled; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/OpenIdConnectRegistration" + "$ref": "#/definitions/OpenIdConnectRegistration", + "description": "The configuration settings of the app registration for the custom Open ID Connect provider." }, "login": { - "$ref": "#/definitions/OpenIdConnectLogin" + "$ref": "#/definitions/OpenIdConnectLogin", + "description": "The configuration settings of the login flow of the custom Open ID Connect provider." } }, "x-ms-client-flatten": true @@ -22347,6 +22394,7 @@ } }, "Facebook": { + "description": "The configuration settings of the Facebook provider.", "type": "object", "allOf": [ { @@ -22358,16 +22406,20 @@ "description": "Facebook resource specific properties", "properties": { "enabled": { + "description": "false if the Facebook provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/AppRegistration" + "$ref": "#/definitions/AppRegistration", + "description": "The configuration settings of the app registration for the Facebook provider." }, "graphApiVersion": { + "description": "The version of the Facebook api to be used while logging in.", "type": "string" }, "login": { - "$ref": "#/definitions/LoginScopes" + "$ref": "#/definitions/LoginScopes", + "description": "The configuration settings of the login flow." } }, "x-ms-client-flatten": true @@ -22419,6 +22471,7 @@ } }, "FileSystemTokenStore": { + "description": "The configuration settings of the storage of the tokens if a file system is used.", "type": "object", "allOf": [ { @@ -22430,6 +22483,7 @@ "description": "FileSystemTokenStore resource specific properties", "properties": { "directory": { + "description": "The directory in which the tokens will be stored.", "type": "string" } }, @@ -22438,6 +22492,7 @@ } }, "ForwardProxy": { + "description": "The configuration settings of a forward proxy used to make the requests.", "type": "object", "allOf": [ { @@ -22449,6 +22504,7 @@ "description": "ForwardProxy resource specific properties", "properties": { "convention": { + "description": "The convention used to determine the url of the request made.", "enum": [ "NoProxy", "Standard", @@ -22461,9 +22517,11 @@ } }, "customHostHeaderName": { + "description": "The name of the header containing the host of the request.", "type": "string" }, "customProtoHeaderName": { + "description": "The name of the header containing the scheme of the request.", "type": "string" } }, @@ -22579,6 +22637,7 @@ } }, "GitHub": { + "description": "The configuration settings of the GitHub provider.", "type": "object", "allOf": [ { @@ -22590,13 +22649,16 @@ "description": "GitHub resource specific properties", "properties": { "enabled": { + "description": "false if the GitHub provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/ClientRegistration" + "$ref": "#/definitions/ClientRegistration", + "description": "The configuration settings of the app registration for the GitHub provider." }, "login": { - "$ref": "#/definitions/LoginScopes" + "$ref": "#/definitions/LoginScopes", + "description": "The configuration settings of the login flow." } }, "x-ms-client-flatten": true @@ -22663,6 +22725,7 @@ } }, "GlobalValidation": { + "description": "The configuration settings that determines the validation flow of users using App Service Authentication/Authorization.", "type": "object", "allOf": [ { @@ -22674,9 +22737,11 @@ "description": "GlobalValidation resource specific properties", "properties": { "requireAuthentication": { + "description": "true if the authentication flow is required any request is made; otherwise, false.", "type": "boolean" }, "unauthenticatedClientAction": { + "description": "The action to take when an unauthenticated client attempts to access the app.", "enum": [ "RedirectToLoginPage", "AllowAnonymous", @@ -22690,9 +22755,11 @@ } }, "redirectToProvider": { + "description": "The default authentication provider to use when multiple providers are configured.\nThis setting is only needed if multiple providers are configured and the unauthenticated client\naction is set to \"RedirectToLoginPage\".", "type": "string" }, "excludedPaths": { + "description": "The paths for which unauthenticated flow would not be redirected to the login page.", "type": "array", "items": { "type": "string" @@ -22704,6 +22771,7 @@ } }, "Google": { + "description": "The configuration settings of the Google provider.", "type": "object", "allOf": [ { @@ -22715,16 +22783,20 @@ "description": "Google resource specific properties", "properties": { "enabled": { + "description": "false if the Google provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/ClientRegistration" + "$ref": "#/definitions/ClientRegistration", + "description": "The configuration settings of the app registration for the Google provider." }, "login": { - "$ref": "#/definitions/LoginScopes" + "$ref": "#/definitions/LoginScopes", + "description": "The configuration settings of the login flow." }, "validation": { - "$ref": "#/definitions/AllowedAudiencesValidation" + "$ref": "#/definitions/AllowedAudiencesValidation", + "description": "The configuration settings of the Azure Active Directory token validation flow." } }, "x-ms-client-flatten": true @@ -22910,6 +22982,7 @@ } }, "HttpSettings": { + "description": "The configuration settings of the HTTP requests for authentication and authorization requests made against App Service Authentication/Authorization.", "type": "object", "allOf": [ { @@ -22921,13 +22994,16 @@ "description": "HttpSettings resource specific properties", "properties": { "requireHttps": { + "description": "false if the authentication/authorization responses not having the HTTPS scheme are permissible; otherwise, true.", "type": "boolean" }, "routes": { - "$ref": "#/definitions/HttpSettingsRoutes" + "$ref": "#/definitions/HttpSettingsRoutes", + "description": "The configuration settings of the paths HTTP requests." }, "forwardProxy": { - "$ref": "#/definitions/ForwardProxy" + "$ref": "#/definitions/ForwardProxy", + "description": "The configuration settings of a forward proxy used to make the requests." } }, "x-ms-client-flatten": true @@ -22935,6 +23011,7 @@ } }, "HttpSettingsRoutes": { + "description": "The configuration settings of the paths HTTP requests.", "type": "object", "allOf": [ { @@ -22946,6 +23023,7 @@ "description": "HttpSettingsRoutes resource specific properties", "properties": { "apiPrefix": { + "description": "The prefix that should precede all the authentication/authorization paths.", "type": "string" } }, @@ -22954,6 +23032,7 @@ } }, "IdentityProviders": { + "description": "The configuration settings of each of the identity providers used to configure App Service Authentication/Authorization.", "type": "object", "allOf": [ { @@ -22965,34 +23044,43 @@ "description": "IdentityProviders resource specific properties", "properties": { "azureActiveDirectory": { - "$ref": "#/definitions/AzureActiveDirectory" + "$ref": "#/definitions/AzureActiveDirectory", + "description": "The configuration settings of the Azure Active directory provider." }, "facebook": { - "$ref": "#/definitions/Facebook" + "$ref": "#/definitions/Facebook", + "description": "The configuration settings of the Facebook provider." }, "gitHub": { - "$ref": "#/definitions/GitHub" + "$ref": "#/definitions/GitHub", + "description": "The configuration settings of the GitHub provider." }, "google": { - "$ref": "#/definitions/Google" - }, - "legacyMicrosoftAccount": { - "$ref": "#/definitions/LegacyMicrosoftAccount" + "$ref": "#/definitions/Google", + "description": "The configuration settings of the Google provider." }, "twitter": { - "$ref": "#/definitions/Twitter" - }, - "apple": { - "$ref": "#/definitions/Apple" - }, - "azureStaticWebApps": { - "$ref": "#/definitions/AzureStaticWebApps" + "$ref": "#/definitions/Twitter", + "description": "The configuration settings of the Twitter provider." }, "customOpenIdConnectProviders": { + "description": "The map of the name of the alias of each custom Open ID Connect provider to the\nconfiguration settings of the custom Open ID Connect provider.", "type": "object", "additionalProperties": { "$ref": "#/definitions/CustomOpenIdConnectProvider" } + }, + "legacyMicrosoftAccount": { + "$ref": "#/definitions/LegacyMicrosoftAccount", + "description": "The configuration settings of the legacy Microsoft Account provider." + }, + "apple": { + "$ref": "#/definitions/Apple", + "description": "The configuration settings of the Apple provider." + }, + "azureStaticWebApps": { + "$ref": "#/definitions/AzureStaticWebApps", + "description": "The configuration settings of the Azure Static Web Apps provider." } }, "x-ms-client-flatten": true @@ -23000,6 +23088,7 @@ } }, "JwtClaimChecks": { + "description": "The configuration settings of the checks that should be made while validating the JWT Claims.", "type": "object", "allOf": [ { @@ -23011,12 +23100,14 @@ "description": "JwtClaimChecks resource specific properties", "properties": { "allowedGroups": { + "description": "The list of the allowed groups.", "type": "array", "items": { "type": "string" } }, "allowedClientApplications": { + "description": "The list of the allowed client applications.", "type": "array", "items": { "type": "string" @@ -23042,6 +23133,7 @@ } }, "LegacyMicrosoftAccount": { + "description": "The configuration settings of the legacy Microsoft Account provider.", "type": "object", "allOf": [ { @@ -23053,16 +23145,20 @@ "description": "LegacyMicrosoftAccount resource specific properties", "properties": { "enabled": { + "description": "false if the legacy Microsoft Account provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/ClientRegistration" + "$ref": "#/definitions/ClientRegistration", + "description": "The configuration settings of the app registration for the legacy Microsoft Account provider." }, "login": { - "$ref": "#/definitions/LoginScopes" + "$ref": "#/definitions/LoginScopes", + "description": "The configuration settings of the login flow." }, "validation": { - "$ref": "#/definitions/AllowedAudiencesValidation" + "$ref": "#/definitions/AllowedAudiencesValidation", + "description": "The configuration settings of the legacy Microsoft Account provider token validation flow." } }, "x-ms-client-flatten": true @@ -23070,6 +23166,7 @@ } }, "Login": { + "description": "The configuration settings of the login flow of users using App Service Authentication/Authorization.", "type": "object", "allOf": [ { @@ -23081,25 +23178,31 @@ "description": "Login resource specific properties", "properties": { "routes": { - "$ref": "#/definitions/LoginRoutes" + "$ref": "#/definitions/LoginRoutes", + "description": "The routes that specify the endpoints used for login and logout requests." }, "tokenStore": { - "$ref": "#/definitions/TokenStore" + "$ref": "#/definitions/TokenStore", + "description": "The configuration settings of the token store." }, "preserveUrlFragmentsForLogins": { + "description": "true if the fragments from the request are preserved after the login request is made; otherwise, false.", "type": "boolean" }, "allowedExternalRedirectUrls": { + "description": "External URLs that can be redirected to as part of logging in or logging out of the app. Note that the query string part of the URL is ignored.\nThis is an advanced setting typically only needed by Windows Store application backends.\nNote that URLs within the current domain are always implicitly allowed.", "type": "array", "items": { "type": "string" } }, "cookieExpiration": { - "$ref": "#/definitions/CookieExpiration" + "$ref": "#/definitions/CookieExpiration", + "description": "The configuration settings of the session cookie's expiration." }, "nonce": { - "$ref": "#/definitions/Nonce" + "$ref": "#/definitions/Nonce", + "description": "The configuration settings of the nonce used in the login flow." } }, "x-ms-client-flatten": true @@ -23107,6 +23210,7 @@ } }, "LoginRoutes": { + "description": "The routes that specify the endpoints used for login and logout requests.", "type": "object", "allOf": [ { @@ -23118,6 +23222,7 @@ "description": "LoginRoutes resource specific properties", "properties": { "logoutEndpoint": { + "description": "The endpoint at which a logout request should be made.", "type": "string" } }, @@ -23126,6 +23231,7 @@ } }, "LoginScopes": { + "description": "The configuration settings of the login flow, including the scopes that should be requested.", "type": "object", "allOf": [ { @@ -23137,6 +23243,7 @@ "description": "LoginScopes resource specific properties", "properties": { "scopes": { + "description": "A list of the scopes that should be requested while authenticating.", "type": "array", "items": { "type": "string" @@ -23462,6 +23569,7 @@ } }, "Nonce": { + "description": "The configuration settings of the nonce used in the login flow.", "type": "object", "allOf": [ { @@ -23473,9 +23581,11 @@ "description": "Nonce resource specific properties", "properties": { "validateNonce": { + "description": "false if the nonce should not be validated while completing the login flow; otherwise, true.", "type": "boolean" }, "nonceExpirationInterval": { + "description": "The time after the request is made when the nonce should expire.", "type": "string" } }, @@ -23484,6 +23594,7 @@ } }, "OpenIdConnectClientCredential": { + "description": "The authentication client credentials of the custom Open ID Connect provider.", "type": "object", "allOf": [ { @@ -23495,6 +23606,7 @@ "description": "OpenIdConnectClientCredential resource specific properties", "properties": { "method": { + "description": "The method that should be used to authenticate the user.", "enum": [ "ClientSecretPost" ], @@ -23505,6 +23617,7 @@ } }, "clientSecretSettingName": { + "description": "The app setting that contains the client secret for the custom Open ID Connect provider.", "type": "string" } }, @@ -23513,6 +23626,7 @@ } }, "OpenIdConnectConfig": { + "description": "The configuration settings of the endpoints used for the custom Open ID Connect provider.", "type": "object", "allOf": [ { @@ -23524,18 +23638,23 @@ "description": "OpenIdConnectConfig resource specific properties", "properties": { "authorizationEndpoint": { + "description": "The endpoint to be used to make an authorization request.", "type": "string" }, "tokenEndpoint": { + "description": "The endpoint to be used to request a token.", "type": "string" }, "issuer": { + "description": "The endpoint that issues the token.", "type": "string" }, "certificationUri": { + "description": "The endpoint that provides the keys necessary to validate the token.", "type": "string" }, "wellKnownOpenIdConfiguration": { + "description": "The endpoint that contains all the configuration endpoints for the provider.", "type": "string" } }, @@ -23544,6 +23663,7 @@ } }, "OpenIdConnectLogin": { + "description": "The configuration settings of the login flow of the custom Open ID Connect provider.", "type": "object", "allOf": [ { @@ -23555,9 +23675,11 @@ "description": "OpenIdConnectLogin resource specific properties", "properties": { "nameClaimType": { + "description": "The name of the claim that contains the users name.", "type": "string" }, "scopes": { + "description": "A list of the scopes that should be requested while authenticating.", "type": "array", "items": { "type": "string" @@ -23569,6 +23691,7 @@ } }, "OpenIdConnectRegistration": { + "description": "The configuration settings of the app registration for the custom Open ID Connect provider.", "type": "object", "allOf": [ { @@ -23580,13 +23703,16 @@ "description": "OpenIdConnectRegistration resource specific properties", "properties": { "clientId": { + "description": "The client id of the custom Open ID Connect provider.", "type": "string" }, "clientCredential": { - "$ref": "#/definitions/OpenIdConnectClientCredential" + "$ref": "#/definitions/OpenIdConnectClientCredential", + "description": "The authentication credentials of the custom Open ID Connect provider." }, "openIdConnectConfiguration": { - "$ref": "#/definitions/OpenIdConnectConfig" + "$ref": "#/definitions/OpenIdConnectConfig", + "description": "The configuration settings of the endpoints used for the custom Open ID Connect provider." } }, "x-ms-client-flatten": true @@ -24416,10 +24542,6 @@ "description": "The RuntimeVersion of the Authentication / Authorization feature in use for the current app.\nThe setting in this value can control the behavior of certain features in the Authentication / Authorization module.", "type": "string" }, - "configVersion": { - "description": "The ConfigVersion of the Authentication / Authorization feature in use for the current app.\nThe setting in this value can control the behavior of the control plane for Authentication / Authorization.", - "type": "string" - }, "unauthenticatedClientAction": { "description": "The action to take when an unauthenticated client attempts to access the app.", "enum": [ @@ -24601,6 +24723,10 @@ "authFilePath": { "description": "The path of the config file containing auth settings.\nIf the path is relative, base will the site's root directory.", "type": "string" + }, + "configVersion": { + "description": "The ConfigVersion of the Authentication / Authorization feature in use for the current app.\nThe setting in this value can control the behavior of the control plane for Authentication / Authorization.", + "type": "string" } }, "x-ms-client-flatten": true @@ -24608,6 +24734,7 @@ } }, "SiteAuthSettingsV2": { + "description": "Configuration settings for the Azure App Service Authentication / Authorization V2 feature.", "type": "object", "allOf": [ { @@ -24619,19 +24746,24 @@ "description": "SiteAuthSettingsV2 resource specific properties", "properties": { "platform": { - "$ref": "#/definitions/AuthPlatform" + "$ref": "#/definitions/AuthPlatform", + "description": "The configuration settings of the platform of App Service Authentication/Authorization." }, "globalValidation": { - "$ref": "#/definitions/GlobalValidation" + "$ref": "#/definitions/GlobalValidation", + "description": "The configuration settings that determines the validation flow of users using App Service Authentication/Authorization." }, "identityProviders": { - "$ref": "#/definitions/IdentityProviders" + "$ref": "#/definitions/IdentityProviders", + "description": "The configuration settings of each of the identity providers used to configure App Service Authentication/Authorization." }, "login": { - "$ref": "#/definitions/Login" + "$ref": "#/definitions/Login", + "description": "The configuration settings of the login flow of users using App Service Authentication/Authorization." }, "httpSettings": { - "$ref": "#/definitions/HttpSettings" + "$ref": "#/definitions/HttpSettings", + "description": "The configuration settings of the HTTP requests for authentication and authorization requests made against App Service Authentication/Authorization." } }, "x-ms-client-flatten": true @@ -25178,10 +25310,6 @@ "description": "Status of the last deployment slot swap operation.", "readOnly": true }, - "keyVaultReferenceIdentity": { - "description": "Identity to use for Key Vault Reference authentication.", - "type": "string" - }, "httpsOnly": { "description": "HttpsOnly: configures a web site to accept only https requests. Issues redirect for\nhttp requests", "type": "boolean" @@ -25211,6 +25339,10 @@ "storageAccountRequired": { "description": "Checks if Customer provided storage account is required", "type": "boolean" + }, + "keyVaultReferenceIdentity": { + "description": "Identity to use for Key Vault Reference authentication.", + "type": "string" } }, "x-ms-client-flatten": true @@ -25616,6 +25748,7 @@ } }, "TokenStore": { + "description": "The configuration settings of the token store.", "type": "object", "allOf": [ { @@ -25627,17 +25760,21 @@ "description": "TokenStore resource specific properties", "properties": { "enabled": { + "description": "true to durably store platform-specific security tokens that are obtained during login flows; otherwise, false.\n The default is false.", "type": "boolean" }, "tokenRefreshExtensionHours": { "format": "double", + "description": "The number of hours after session token expiration that a session token can be used to\ncall the token refresh API. The default is 72 hours.", "type": "number" }, "fileSystem": { - "$ref": "#/definitions/FileSystemTokenStore" + "$ref": "#/definitions/FileSystemTokenStore", + "description": "The configuration settings of the storage of the tokens if a file system is used." }, "azureBlobStorage": { - "$ref": "#/definitions/BlobStorageTokenStore" + "$ref": "#/definitions/BlobStorageTokenStore", + "description": "The configuration settings of the storage of the tokens if blob storage is used." } }, "x-ms-client-flatten": true @@ -25851,6 +25988,7 @@ } }, "Twitter": { + "description": "The configuration settings of the Twitter provider.", "type": "object", "allOf": [ { @@ -25862,10 +26000,12 @@ "description": "Twitter resource specific properties", "properties": { "enabled": { + "description": "false if the Twitter provider should not be enabled despite the set registration; otherwise, true.", "type": "boolean" }, "registration": { - "$ref": "#/definitions/TwitterRegistration" + "$ref": "#/definitions/TwitterRegistration", + "description": "The configuration settings of the app registration for the Twitter provider." } }, "x-ms-client-flatten": true @@ -25873,6 +26013,7 @@ } }, "TwitterRegistration": { + "description": "The configuration settings of the app registration for the Twitter provider.", "type": "object", "allOf": [ { @@ -25884,9 +26025,11 @@ "description": "TwitterRegistration resource specific properties", "properties": { "consumerKey": { + "description": "The OAuth 1.0a consumer key of the Twitter application used for sign-in.\nThis setting is required for enabling Twitter Sign-In.\nTwitter Sign-In documentation: https://dev.twitter.com/web/sign-in", "type": "string" }, "consumerSecretSettingName": { + "description": "The app setting name that contains the OAuth 1.0a consumer secret of the Twitter\napplication used for sign-in.", "type": "string" } }, From 78c55ac630b4acd378ad75d9f930d001ff64b5c4 Mon Sep 17 00:00:00 2001 From: naveedaz Date: Thu, 22 Apr 2021 17:14:36 -0700 Subject: [PATCH 06/12] Fix prettier issue. --- .../Microsoft.Web/stable/2020-12-01/WebApps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 95f744977b83..60eb44de3ef4 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -23057,7 +23057,7 @@ }, "google": { "$ref": "#/definitions/Google", - "description": "The configuration settings of the Google provider." + "description": "The configuration settings of the Google provider." }, "twitter": { "$ref": "#/definitions/Twitter", From 7ccb253872ef28e54a6e0d1541655d1b2ad4c983 Mon Sep 17 00:00:00 2001 From: naveedaz Date: Thu, 22 Apr 2021 17:34:55 -0700 Subject: [PATCH 07/12] Remove breaking changes other than property order changes --- .../Microsoft.Web/stable/2020-12-01/CommonDefinitions.json | 4 ---- .../Microsoft.Web/stable/2020-12-01/StaticSites.json | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index ec202fa61e09..5c474b5a717d 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -2356,10 +2356,6 @@ "description": "Checks if Customer provided storage account is required", "type": "boolean" }, - "virtualNetworkSubnetId": { - "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", - "type": "string" - }, "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", "type": "string" diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json index 50efaf1507db..a2e03d9fb3ae 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json @@ -2877,7 +2877,8 @@ }, "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", - "type": "string" + "type": "string", + "readOnly": true }, "userProvidedFunctionApps": { "description": "User provided function apps registered with the static site", From f3ccb633050649834493e63aa00f4b2c76278bbc Mon Sep 17 00:00:00 2001 From: naveedaz Date: Fri, 23 Apr 2021 10:07:55 -0700 Subject: [PATCH 08/12] Make it pretty again --- .../Microsoft.Web/stable/2020-12-01/StaticSites.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json index a2e03d9fb3ae..16601019c0cd 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/StaticSites.json @@ -2878,7 +2878,7 @@ "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", "type": "string", - "readOnly": true + "readOnly": true }, "userProvidedFunctionApps": { "description": "User provided function apps registered with the static site", From 2b38c63722a282431131dec43b8be0a6a4f552b4 Mon Sep 17 00:00:00 2001 From: naveedaz Date: Wed, 28 Apr 2021 13:21:28 -0700 Subject: [PATCH 09/12] Added new properties SiteConfig.PublicNetworkAccess and Site.virtualNetworkSubnetId to enable azure policy --- .../Microsoft.Web/stable/2020-12-01/CommonDefinitions.json | 4 ++++ .../Microsoft.Web/stable/2020-12-01/WebApps.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index 5c474b5a717d..212a7814beb3 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -2740,6 +2740,10 @@ "additionalProperties": { "$ref": "#/definitions/AzureStorageInfoValue" } + }, + "publicNetworkAccess": { + "description": "Property to allow or block all public trafic.", + "type": "string" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 60eb44de3ef4..90ad0a795f07 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -25343,6 +25343,10 @@ "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", "type": "string" + }, + "virtualNetworkSubnetId": { + "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", + "type": "string" } }, "x-ms-client-flatten": true From 3e3daa4ebedfdba2aeac1f2a54da5329ab9ab948 Mon Sep 17 00:00:00 2001 From: naveedaz Date: Wed, 28 Apr 2021 13:39:45 -0700 Subject: [PATCH 10/12] Fix prettier and spellcheck issue --- .../Microsoft.Web/stable/2020-12-01/CommonDefinitions.json | 2 +- .../Microsoft.Web/stable/2020-12-01/WebApps.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index 212a7814beb3..7c2ae16928a7 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -2741,7 +2741,7 @@ "$ref": "#/definitions/AzureStorageInfoValue" } }, - "publicNetworkAccess": { + "publicNetworkAccess": { "description": "Property to allow or block all public trafic.", "type": "string" } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json index 90ad0a795f07..4ae53342ef41 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/WebApps.json @@ -25344,7 +25344,7 @@ "description": "Identity to use for Key Vault Reference authentication.", "type": "string" }, - "virtualNetworkSubnetId": { + "virtualNetworkSubnetId": { "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", "type": "string" } From 103446f85b14c55235f44bf4855b381c47635aea Mon Sep 17 00:00:00 2001 From: naveedaz Date: Wed, 28 Apr 2021 13:45:24 -0700 Subject: [PATCH 11/12] Fix spellcheck issue --- .../Microsoft.Web/stable/2020-12-01/CommonDefinitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index 7c2ae16928a7..1b5d01d1b37a 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -2742,7 +2742,7 @@ } }, "publicNetworkAccess": { - "description": "Property to allow or block all public trafic.", + "description": "Property to allow or block all public traffic.", "type": "string" } } From 37768c191de4a04eb0c7b7285b8780928e794b94 Mon Sep 17 00:00:00 2001 From: naveedaz Date: Wed, 28 Apr 2021 16:06:46 -0700 Subject: [PATCH 12/12] Add virtualNetworkSubnetId prperty to Site objec tmodel --- .../Microsoft.Web/stable/2020-12-01/CommonDefinitions.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json index 1b5d01d1b37a..443d8ee10e2e 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json @@ -2359,6 +2359,10 @@ "keyVaultReferenceIdentity": { "description": "Identity to use for Key Vault Reference authentication.", "type": "string" + }, + "virtualNetworkSubnetId": { + "description": "Azure Resource Manager ID of the Virtual network and subnet to be joined by Regional VNET Integration.\nThis must be of the form /subscriptions/{subscriptionName}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}", + "type": "string" } }, "x-ms-client-flatten": true