Skip to content

Commit 48056da

Browse files
aleksbolnaveedaz
authored and
dabenhamMic
committed
Re-add a previously erroneously removed PUT API for /networkConfig/VirtualNetwork (Azure#14018)
* Add CreateOrUpdateSwiftVirtualNetworkConnectionWithCheck, and site-level virtualNetworkSubnetId field * Add site-level virtualNetworkSubnetId field * Tabs vs spaces * Removing the new property since it's technically a 'breaking change' * Add changes needed for correct .NET SDK generation issues. Reference PR: Azure/azure-sdk-for-net#20300 * Fix prettier issue. * Remove breaking changes other than property order changes * Make it pretty again * Added new properties SiteConfig.PublicNetworkAccess and Site.virtualNetworkSubnetId to enable azure policy * Fix prettier and spellcheck issue * Fix spellcheck issue * Add virtualNetworkSubnetId prperty to Site objec tmodel Co-authored-by: Naveed Aziz <naveeda@microsoft.com>
1 parent 0ac8243 commit 48056da

File tree

8 files changed

+410
-208
lines changed

8 files changed

+410
-208
lines changed

‎specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,18 +1676,18 @@
16761676
"required": true,
16771677
"type": "string"
16781678
},
1679+
{
1680+
"$ref": "#/parameters/subscriptionIdParameter"
1681+
},
1682+
{
1683+
"$ref": "#/parameters/apiVersionParameter"
1684+
},
16791685
{
16801686
"name": "$filter",
16811687
"in": "query",
16821688
"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]'.",
16831689
"type": "string",
16841690
"x-ms-skip-url-encoding": true
1685-
},
1686-
{
1687-
"$ref": "#/parameters/subscriptionIdParameter"
1688-
},
1689-
{
1690-
"$ref": "#/parameters/apiVersionParameter"
16911691
}
16921692
],
16931693
"responses": {

‎specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServicePlans.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,12 @@
741741
"required": true,
742742
"type": "string"
743743
},
744+
{
745+
"$ref": "#/parameters/subscriptionIdParameter"
746+
},
747+
{
748+
"$ref": "#/parameters/apiVersionParameter"
749+
},
744750
{
745751
"name": "$skipToken",
746752
"in": "query",
@@ -759,12 +765,6 @@
759765
"in": "query",
760766
"description": "List page size. If specified, results are paged.",
761767
"type": "string"
762-
},
763-
{
764-
"$ref": "#/parameters/subscriptionIdParameter"
765-
},
766-
{
767-
"$ref": "#/parameters/apiVersionParameter"
768768
}
769769
],
770770
"responses": {
@@ -847,18 +847,18 @@
847847
"required": true,
848848
"type": "string"
849849
},
850+
{
851+
"$ref": "#/parameters/subscriptionIdParameter"
852+
},
853+
{
854+
"$ref": "#/parameters/apiVersionParameter"
855+
},
850856
{
851857
"name": "$filter",
852858
"in": "query",
853859
"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').",
854860
"type": "string",
855861
"x-ms-skip-url-encoding": true
856-
},
857-
{
858-
"$ref": "#/parameters/subscriptionIdParameter"
859-
},
860-
{
861-
"$ref": "#/parameters/apiVersionParameter"
862862
}
863863
],
864864
"responses": {

‎specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Certificates.json‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
"description": "Description for Get all certificates for a subscription.",
2525
"operationId": "Certificates_List",
2626
"parameters": [
27+
{
28+
"$ref": "#/parameters/subscriptionIdParameter"
29+
},
30+
{
31+
"$ref": "#/parameters/apiVersionParameter"
32+
},
2733
{
2834
"name": "$filter",
2935
"in": "query",
3036
"description": "Return only information specified in the filter (using OData syntax). For example: $filter=KeyVaultId eq 'KeyVaultId'",
3137
"type": "string",
3238
"x-ms-skip-url-encoding": true
33-
},
34-
{
35-
"$ref": "#/parameters/subscriptionIdParameter"
36-
},
37-
{
38-
"$ref": "#/parameters/apiVersionParameter"
3939
}
4040
],
4141
"responses": {
@@ -319,6 +319,13 @@
319319
"properties": {
320320
"description": "Certificate resource specific properties",
321321
"properties": {
322+
"password": {
323+
"description": "Certificate password.",
324+
"type": "string",
325+
"x-ms-mutability": [
326+
"create"
327+
]
328+
},
322329
"friendlyName": {
323330
"description": "Friendly name of the certificate.",
324331
"type": "string",
@@ -368,14 +375,6 @@
368375
"type": "string",
369376
"readOnly": true
370377
},
371-
"password": {
372-
"description": "Certificate password.",
373-
"type": "string",
374-
"x-ms-secret": true,
375-
"x-ms-mutability": [
376-
"create"
377-
]
378-
},
379378
"thumbprint": {
380379
"description": "Certificate thumbprint.",
381380
"type": "string",
@@ -482,6 +481,13 @@
482481
"properties": {
483482
"description": "CertificatePatchResource resource specific properties",
484483
"properties": {
484+
"password": {
485+
"description": "Certificate password.",
486+
"type": "string",
487+
"x-ms-mutability": [
488+
"create"
489+
]
490+
},
485491
"friendlyName": {
486492
"description": "Friendly name of the certificate.",
487493
"type": "string",
@@ -531,14 +537,6 @@
531537
"type": "string",
532538
"readOnly": true
533539
},
534-
"password": {
535-
"description": "Certificate password.",
536-
"type": "string",
537-
"x-ms-secret": true,
538-
"x-ms-mutability": [
539-
"create"
540-
]
541-
},
542540
"thumbprint": {
543541
"description": "Certificate thumbprint.",
544542
"type": "string",

‎specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/CommonDefinitions.json‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -414,13 +414,6 @@
414414
"$ref": "#/definitions/StatusCodesBasedTrigger"
415415
}
416416
},
417-
"statusCodesRange": {
418-
"description": "A rule based on status codes ranges.",
419-
"type": "array",
420-
"items": {
421-
"$ref": "#/definitions/StatusCodesRangeBasedTrigger"
422-
}
423-
},
424417
"slowRequests": {
425418
"$ref": "#/definitions/SlowRequestsBasedTrigger",
426419
"description": "A rule based on request execution time."
@@ -431,6 +424,13 @@
431424
"items": {
432425
"$ref": "#/definitions/SlowRequestsBasedTrigger"
433426
}
427+
},
428+
"statusCodesRange": {
429+
"description": "A rule based on status codes ranges.",
430+
"type": "array",
431+
"items": {
432+
"$ref": "#/definitions/StatusCodesRangeBasedTrigger"
433+
}
434434
}
435435
}
436436
},
@@ -2326,10 +2326,6 @@
23262326
"description": "Status of the last deployment slot swap operation.",
23272327
"readOnly": true
23282328
},
2329-
"keyVaultReferenceIdentity": {
2330-
"description": "Identity to use for Key Vault Reference authentication.",
2331-
"type": "string"
2332-
},
23332329
"httpsOnly": {
23342330
"description": "HttpsOnly: configures a web site to accept only https requests. Issues redirect for\nhttp requests",
23352331
"type": "boolean"
@@ -2359,6 +2355,14 @@
23592355
"storageAccountRequired": {
23602356
"description": "Checks if Customer provided storage account is required",
23612357
"type": "boolean"
2358+
},
2359+
"keyVaultReferenceIdentity": {
2360+
"description": "Identity to use for Key Vault Reference authentication.",
2361+
"type": "string"
2362+
},
2363+
"virtualNetworkSubnetId": {
2364+
"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}",
2365+
"type": "string"
23622366
}
23632367
},
23642368
"x-ms-client-flatten": true
@@ -2454,13 +2458,6 @@
24542458
"$ref": "#/definitions/NameValuePair"
24552459
}
24562460
},
2457-
"azureStorageAccounts": {
2458-
"description": "List of Azure Storage Accounts.",
2459-
"type": "object",
2460-
"additionalProperties": {
2461-
"$ref": "#/definitions/AzureStorageInfoValue"
2462-
}
2463-
},
24642461
"connectionStrings": {
24652462
"description": "Connection strings.",
24662463
"type": "array",
@@ -2740,6 +2737,17 @@
27402737
"maximum": 20,
27412738
"minimum": 0,
27422739
"type": "integer"
2740+
},
2741+
"azureStorageAccounts": {
2742+
"description": "List of Azure Storage Accounts.",
2743+
"type": "object",
2744+
"additionalProperties": {
2745+
"$ref": "#/definitions/AzureStorageInfoValue"
2746+
}
2747+
},
2748+
"publicNetworkAccess": {
2749+
"description": "Property to allow or block all public traffic.",
2750+
"type": "string"
27432751
}
27442752
}
27452753
},
@@ -2972,10 +2980,6 @@
29722980
"description": "Win32 error code.",
29732981
"type": "integer"
29742982
},
2975-
"path": {
2976-
"description": "Request Path",
2977-
"type": "string"
2978-
},
29792983
"count": {
29802984
"format": "int32",
29812985
"description": "Request Count.",
@@ -2984,6 +2988,10 @@
29842988
"timeInterval": {
29852989
"description": "Time interval.",
29862990
"type": "string"
2991+
},
2992+
"path": {
2993+
"description": "Request Path",
2994+
"type": "string"
29872995
}
29882996
}
29892997
},

‎specification/web/resource-manager/Microsoft.Web/stable/2020-12-01/Provider.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,18 @@
777777
"description": "<code>true</code> if this supports Application Insights; otherwise, <code>false</code>.",
778778
"type": "boolean"
779779
},
780+
"isPreview": {
781+
"description": "<code>true</code> if this stack is in Preview, otherwise <code>false</code>.",
782+
"type": "boolean"
783+
},
784+
"isDeprecated": {
785+
"description": "<code>true</code> if this stack has been deprecated, otherwise <code>false</code>.",
786+
"type": "boolean"
787+
},
788+
"isHidden": {
789+
"description": "<code>true</code> if this stack should be hidden for new customers on portal, otherwise <code>false</code>.",
790+
"type": "boolean"
791+
},
780792
"appSettingsDictionary": {
781793
"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",
782794
"type": "object",
@@ -790,18 +802,6 @@
790802
"additionalProperties": {
791803
"type": "object"
792804
}
793-
},
794-
"isPreview": {
795-
"description": "<code>true</code> if this stack is in Preview, otherwise <code>false</code>.",
796-
"type": "boolean"
797-
},
798-
"isDeprecated": {
799-
"description": "<code>true</code> if this stack has been deprecated, otherwise <code>false</code>.",
800-
"type": "boolean"
801-
},
802-
"isHidden": {
803-
"description": "<code>true</code> if this stack should be hidden for new customers on portal, otherwise <code>false</code>.",
804-
"type": "boolean"
805805
}
806806
}
807807
},

0 commit comments

Comments
 (0)