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.

Sign up for GitHub

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

Re-add a previously erroneously removed PUT API for /networkConfig/VirtualNetwork #14018

Merged
merged 12 commits into from
May 1, 2021
Merged

Re-add a previously erroneously removed PUT API for /networkConfig/VirtualNetwork #14018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7cf7add
Add CreateOrUpdateSwiftVirtualNetworkConnectionWithCheck, and site-le…
aleksbol Apr 20, 2021
75b8ea7
Add site-level virtualNetworkSubnetId field
aleksbol Apr 20, 2021
8a1420b
Tabs vs spaces
aleksbol Apr 20, 2021
89c30d4
Removing the new property since it's technically a 'breaking change'
aleksbol Apr 20, 2021
9047108
Add changes needed for correct .NET SDK generation issues. Reference …
naveedaz Apr 22, 2021
78c55ac
Fix prettier issue.
naveedaz Apr 23, 2021
7ccb253
Remove breaking changes other than property order changes
naveedaz Apr 23, 2021
f3ccb63
Make it pretty again
naveedaz Apr 23, 2021
2b38c63
Added new properties SiteConfig.PublicNetworkAccess and Site.virtualN…
naveedaz Apr 28, 2021
3e3daa4
Fix prettier and spellcheck issue
naveedaz Apr 28, 2021
103446f
Fix spellcheck issue
naveedaz Apr 28, 2021
37768c1
Add virtualNetworkSubnetId prperty to Site objec tmodel
naveedaz Apr 28, 2021
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
12 changes: 6 additions & 6 deletions ...fication/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
24 changes: 12 additions & 12 deletions specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,12 @@
"required": true,
"type": "string"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
},
{
"name": "$skipToken",
"in": "query",
Expand All @@ -759,12 +765,6 @@
"in": "query",
"description": "List page size. If specified, results are paged.",
"type": "string"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -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": {
Expand Down
42 changes: 20 additions & 22 deletions specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
52 changes: 30 additions & 22 deletions specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -431,6 +424,13 @@
"items": {
"$ref": "#/definitions/SlowRequestsBasedTrigger"
}
},
"statusCodesRange": {
"description": "A rule based on status codes ranges.",
"type": "array",
"items": {
"$ref": "#/definitions/StatusCodesRangeBasedTrigger"
}
}
}
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2359,6 +2355,14 @@
"storageAccountRequired": {
"description": "Checks if Customer provided storage account is required",
"type": "boolean"
},
"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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -2740,6 +2737,17 @@
"maximum": 20,
"minimum": 0,
"type": "integer"
},
"azureStorageAccounts": {
"description": "List of Azure Storage Accounts.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/AzureStorageInfoValue"
}
},
"publicNetworkAccess": {
"description": "Property to allow or block all public traffic.",
"type": "string"
}
}
},
Expand Down Expand Up @@ -2972,10 +2980,6 @@
"description": "Win32 error code.",
"type": "integer"
},
"path": {
"description": "Request Path",
"type": "string"
},
"count": {
"format": "int32",
"description": "Request Count.",
Expand All @@ -2984,6 +2988,10 @@
"timeInterval": {
"description": "Time interval.",
"type": "string"
},
"path": {
"description": "Request Path",
"type": "string"
}
}
},
Expand Down
24 changes: 12 additions & 12 deletions specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,18 @@
"description": "<code>true</code> if this supports Application Insights; otherwise, <code>false</code>.",
"type": "boolean"
},
"isPreview": {
"description": "<code>true</code> if this stack is in Preview, otherwise <code>false</code>.",
"type": "boolean"
},
"isDeprecated": {
"description": "<code>true</code> if this stack has been deprecated, otherwise <code>false</code>.",
"type": "boolean"
},
"isHidden": {
"description": "<code>true</code> if this stack should be hidden for new customers on portal, otherwise <code>false</code>.",
"type": "boolean"
},
"appSettingsDictionary": {
"description": "<appSettings>\n <appSetting name=\"FUNCTIONS_WORKER_RUNTIME\" value=\"dotnet\" />\n</appSettings>\n Example: All the function apps need AppSetting: \"FUNCTIONS_WORKER_RUNTIME\" to be set stack name",
"type": "object",
Expand All @@ -790,18 +802,6 @@
"additionalProperties": {
"type": "object"
}
},
"isPreview": {
"description": "<code>true</code> if this stack is in Preview, otherwise <code>false</code>.",
"type": "boolean"
},
"isDeprecated": {
"description": "<code>true</code> if this stack has been deprecated, otherwise <code>false</code>.",
"type": "boolean"
},
"isHidden": {
"description": "<code>true</code> if this stack should be hidden for new customers on portal, otherwise <code>false</code>.",
"type": "boolean"
}
}
},
Expand Down
Loading