Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add initial set for changes for ANT79 #4435

Merged
merged 2 commits into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,10 @@
"items": {
"type": "string"
}
},
"supportCredentials": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these changes being made to an existing stable version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to stable released versions must be approved by ARM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are additive. We do not want to release a new API-version for small non-breaking changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, missed that. Since these are additive changes I would guess these are not breaking changes.

"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"
}
}
},
Expand Down Expand Up @@ -2389,12 +2393,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,
Expand Down Expand Up @@ -2924,6 +2939,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@
"items": {
"$ref": "#/definitions/StackMinorVersion"
}
},
"applicationInsights": {
"description": "<code>true</code> if this supports Application Insights; otherwise, <code>false</code>.",
"type": "boolean"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be beyond the scope of this PR, but this spec has a few operations that define 404 error status codes explicitly. AutoRest does not support these today (we have an experimental extension to handle this if you really need it). Please remove these error status codes (or apply the extension) and regenerate the SDKs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dsgouda Thanks for calling out the 404 status codes. I will talk to the feature owners to figure out if we should remove the status codes or use the experimental extension. We will change that as a new PR.
Please share the link to the extension, I could not find it on https://github.com/Azure/autorest/blob/master/docs/extensions/readme.md

Are you good with all the other changes? If so, please approve.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a brief explanation

"get": {
"tags": [
"WebApps"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -14923,6 +14923,58 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/snapshotsdr": {
"get": {
"tags": [
"WebApps"
],
"summary": "Returns all Snapshots to the user from DRSecondary endpoint.",
"description": "Returns all Snapshots to the user from DRSecondary endpoint.",
"operationId": "WebApps_ListSnapshotsFromDRSecondarySlot",
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
},
{
"name": "name",
"in": "path",
"description": "Website Name.",
"required": true,
"type": "string"
},
{
"name": "slot",
"in": "path",
"description": "Website Slot.",
"required": true,
"type": "string"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/SnapshotCollection"
}
},
"default": {
"description": "App Service error response.",
"schema": {
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web": {
"get": {
"tags": [
Expand Down Expand Up @@ -16573,6 +16625,51 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/snapshotsdr": {
"get": {
"tags": [
"WebApps"
],
"summary": "Returns all Snapshots to the user from DRSecondary endpoint.",
"description": "Returns all Snapshots to the user from DRSecondary endpoint.",
"operationId": "WebApps_ListSnapshotsFromDRSecondary",
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
},
{
"name": "name",
"in": "path",
"description": "Website Name.",
"required": true,
"type": "string"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/SnapshotCollection"
}
},
"default": {
"description": "App Service error response.",
"schema": {
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web": {
"get": {
"tags": [
Expand Down Expand Up @@ -18578,6 +18675,10 @@
"snapshotTime": {
"description": "Point in time to restore the deleted app from, formatted as a DateTime string. \nIf unspecified, default value is the time that the app was deleted.",
"type": "string"
},
"useDRSecondary": {
"description": "If true, the snapshot is retrieved from DRSecondary endpoint.",
"type": "boolean"
}
},
"x-ms-client-flatten": true
Expand Down Expand Up @@ -20163,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"
Expand Down Expand Up @@ -21068,6 +21173,10 @@
"ignoreConflictingHostNames": {
"description": "If true, custom hostname conflicts will be ignored when recovering to a target web app.\nThis setting is only necessary when RecoverConfiguration is enabled.",
"type": "boolean"
},
"useDRSecondary": {
"description": "If true, the snapshot is retrieved from DRSecondary endpoint.",
"type": "boolean"
}
},
"x-ms-client-flatten": true
Expand Down