From 2a28a94c556f2fcf2f5ae9dd3900ef99a9fb684b Mon Sep 17 00:00:00 2001 From: Naveed Aziz Date: Thu, 17 Jan 2019 14:00:59 -0800 Subject: [PATCH] Merge changes from release microsoft.web ant79 (#5048) * Add initial set for changes for ANT79 (#4435) * Add initial set for changes for ANT79 * Fix ordering of swift VNET APIs * Add GeoRegion to DeletedSite Model (#4453) --- .../stable/2018-02-01/CommonDefinitions.json | 21 +++++++++++++++- .../stable/2018-02-01/Diagnostics.json | 24 +++++++++---------- .../stable/2018-02-01/Provider.json | 4 ++++ .../stable/2018-02-01/WebApps.json | 8 +++++-- 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json index 3e519c4514e1..cf91bc366803 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json @@ -686,6 +686,10 @@ "items": { "type": "string" } + }, + "supportCredentials": { + "description": "Gets or sets whether CORS requests with credentials are allowed. See \nhttps://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#Requests_with_credentials\nfor more details.", + "type": "boolean" } } }, @@ -2394,12 +2398,23 @@ "type": "integer" }, "ipSecurityRestrictions": { - "description": "IP security restrictions.", + "description": "IP security restrictions for main.", "type": "array", "items": { "$ref": "#/definitions/IpSecurityRestriction" } }, + "scmIpSecurityRestrictions": { + "description": "IP security restrictions for scm.", + "type": "array", + "items": { + "$ref": "#/definitions/IpSecurityRestriction" + } + }, + "scmIpSecurityRestrictionsUseMain": { + "description": "IP security restrictions for scm to use main.", + "type": "boolean" + }, "http20Enabled": { "description": "Http20Enabled: configures a web site to allow clients to connect over http2.0", "default": true, @@ -2929,6 +2944,10 @@ "dnsServers": { "description": "DNS servers to be used by this Virtual Network. This should be a comma-separated list of IP addresses.", "type": "string" + }, + "isSwift": { + "description": "Flag that is used to denote if this is VNET injection", + "type": "boolean" } }, "x-ms-client-flatten": true diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Diagnostics.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Diagnostics.json index 4be504604c9b..d0543f2bd1e8 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Diagnostics.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Diagnostics.json @@ -181,11 +181,11 @@ } }, "x-ms-examples": { - "Get App Detector Responses": { - "$ref": "./examples/Diagnostics_ListSiteDetectorResponses.json" - }, "Get App Slot Detector Responses": { "$ref": "./examples/Diagnostics_ListSiteDetectorResponsesSlot.json" + }, + "Get App Detector Responses": { + "$ref": "./examples/Diagnostics_ListSiteDetectorResponses.json" } }, "x-ms-pageable": { @@ -262,11 +262,11 @@ } }, "x-ms-examples": { - "Get App Detector Response": { - "$ref": "./examples/Diagnostics_GetSiteDetectorResponse.json" - }, "Get App Slot Detector Response": { "$ref": "./examples/Diagnostics_GetSiteDetectorResponseSlot.json" + }, + "Get App Detector Response": { + "$ref": "./examples/Diagnostics_GetSiteDetectorResponse.json" } } } @@ -786,11 +786,11 @@ } }, "x-ms-examples": { - "Get App Detector Responses": { - "$ref": "./examples/Diagnostics_ListSiteDetectorResponses.json" - }, "Get App Slot Detector Responses": { "$ref": "./examples/Diagnostics_ListSiteDetectorResponsesSlot.json" + }, + "Get App Detector Responses": { + "$ref": "./examples/Diagnostics_ListSiteDetectorResponses.json" } }, "x-ms-pageable": { @@ -874,11 +874,11 @@ } }, "x-ms-examples": { - "Get App Detector Response": { - "$ref": "./examples/Diagnostics_GetSiteDetectorResponse.json" - }, "Get App Slot Detector Response": { "$ref": "./examples/Diagnostics_GetSiteDetectorResponseSlot.json" + }, + "Get App Detector Response": { + "$ref": "./examples/Diagnostics_GetSiteDetectorResponse.json" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Provider.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Provider.json index 6316d9e4ae32..f85c31280bb5 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Provider.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/Provider.json @@ -218,6 +218,10 @@ "items": { "$ref": "#/definitions/StackMinorVersion" } + }, + "applicationInsights": { + "description": "true if this supports Application Insights; otherwise, false.", + "type": "boolean" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/WebApps.json index 1b450e2db1b3..579346f5b6b3 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/WebApps.json @@ -1632,7 +1632,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkConfig/virtualNetwork": { "get": { "tags": [ "WebApps" @@ -8723,7 +8723,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkConfig/virtualNetwork": { "get": { "tags": [ "WebApps" @@ -20264,6 +20264,10 @@ "description": "The Client Secret of this relying party application (in Azure Active Directory, this is also referred to as the Key).\nThis setting is optional. If no client secret is configured, the OpenID Connect implicit auth flow is used to authenticate end users.\nOtherwise, the OpenID Connect Authorization Code Flow is used to authenticate end users.\nMore information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html", "type": "string" }, + "clientSecretCertificateThumbprint": { + "description": "An alternative to the client secret, that is the thumbprint of a certifite used for signing purposes. This property acts as\na replacement for the Client Secret. It is also optional.", + "type": "string" + }, "issuer": { "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://sts.windows.net/{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"