Re-add a previously erroneously removed PUT API for /networkConfig/Vi…

…rtualNetwork (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 <[email protected]>
dabenhamMic · May 4, 2021 · 48056da · 48056da
1 parent 0ac8243
commit 48056da
Show file tree

Hide file tree

Showing 8 changed files with 410 additions and 208 deletions.
diff --git a/...fication/web/resource-manager/Microsoft.Web/stable/2020-12-01/AppServiceEnvironments.json b/...fication/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
@@ -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
@@ -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
@@ -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"
+            },
+            "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
@@ -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,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"
         }
       }
     },
@@ -2972,10 +2980,6 @@
           "description": "Win32 error code.",
           "type": "integer"
         },
-        "path": {
-          "description": "Request Path",
-          "type": "string"
-        },
         "count": {
           "format": "int32",
           "description": "Request Count.",
@@ -2984,6 +2988,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
@@ -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",
@@ -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"
         }
       }
     },