Fix force delete query parameter (Azure#14254)

* remove name validation from client side * remove name check from deploymentScripts swagger * remove name check from previous swagger versions * remove pattern from resourcegroupname parameter * Fix force deletion query parameter * add forceDeletionTypes to newer swagger
mkarmark · Jul 20, 2021 · e491b24 · e491b24
1 parent 041a9ae
commit e491b24
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 4 deletions.
diff --git a/.../Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json b/.../Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
@@ -2,7 +2,7 @@
   "parameters": {
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "my-resource-group",
-    "forceDeletionResourceTypes": "Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets",
     "api-version": "2020-06-01"
   },
   "responses": {

diff --git a/...manager/Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsInResourceGroup.json b/...manager/Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsInResourceGroup.json
@@ -2,7 +2,7 @@
   "parameters": {
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "my-resource-group",
-    "forceDeletionResourceTypes": "Microsoft.Compute/virtualMachines",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines",
     "api-version": "2020-06-01"
   },
   "responses": {

diff --git a/...ification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json b/...ification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json
@@ -2479,11 +2479,11 @@
             "maxLength": 90
           },
           {
-            "name": "forceDeletionResourceTypes",
+            "name": "forceDeletionTypes",
             "in": "query",
             "required": false,
             "type": "string",
-            "description": "The resource types you want to force delete. Currently, only the following is supported: forceDeletionResourceTypes=Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"
+            "description": "The resource types you want to force delete. Currently, only the following is supported: forceDeletionTypes=Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"

diff --git a/.../Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json b/.../Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "my-resource-group",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets",
+    "api-version": "2020-06-01"
+  },
+  "responses": {
+    "202": {
+      "description": "Accepted"
+    },
+    "200": {
+      "description": "OK"
+    }
+  }
+}
diff --git a/...manager/Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsInResourceGroup.json b/...manager/Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsInResourceGroup.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "my-resource-group",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines",
+    "api-version": "2020-06-01"
+  },
+  "responses": {
+    "202": {
+      "description": "Accepted"
+    },
+    "200": {
+      "description": "OK"
+    }
+  }
+}
diff --git a/...ification/resources/resource-manager/Microsoft.Resources/stable/2021-01-01/resources.json b/...ification/resources/resource-manager/Microsoft.Resources/stable/2021-01-01/resources.json
@@ -2554,13 +2554,28 @@
             "minLength": 1,
             "maxLength": 90
           },
+          {
+            "name": "forceDeletionTypes",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The resource types you want to force delete. Currently, only the following is supported: forceDeletionTypes=Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"
+          },
           {
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
             "$ref": "#/parameters/SubscriptionIdParameter"
           }
         ],
+        "x-ms-examples": {
+          "Force delete all the Virtual Machines in a resource group": {
+            "$ref": "./examples/ForceDeleteVMsInResourceGroup.json"
+          },
+          "Force delete all the Virtual Machines and Virtual Machine Scale Sets in a resource group": {
+            "$ref": "./examples/ForceDeleteVMsAndVMSSInResourceGroup.json"
+          }
+        },
         "responses": {
           "200": {
             "description": "OK"

diff --git a/.../Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json b/.../Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "my-resource-group",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets",
+    "api-version": "2020-06-01"
+  },
+  "responses": {
+    "202": {
+      "description": "Accepted"
+    },
+    "200": {
+      "description": "OK"
+    }
+  }
+}
diff --git a/...manager/Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsInResourceGroup.json b/...manager/Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsInResourceGroup.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "my-resource-group",
+    "forceDeletionTypes": "Microsoft.Compute/virtualMachines",
+    "api-version": "2020-06-01"
+  },
+  "responses": {
+    "202": {
+      "description": "Accepted"
+    },
+    "200": {
+      "description": "OK"
+    }
+  }
+}
diff --git a/...ification/resources/resource-manager/Microsoft.Resources/stable/2021-04-01/resources.json b/...ification/resources/resource-manager/Microsoft.Resources/stable/2021-04-01/resources.json
@@ -2606,13 +2606,28 @@
             "minLength": 1,
             "maxLength": 90
           },
+          {
+            "name": "forceDeletionTypes",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The resource types you want to force delete. Currently, only the following is supported: forceDeletionTypes=Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"
+          },
           {
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
             "$ref": "#/parameters/SubscriptionIdParameter"
           }
         ],
+        "x-ms-examples": {
+          "Force delete all the Virtual Machines in a resource group": {
+            "$ref": "./examples/ForceDeleteVMsInResourceGroup.json"
+          },
+          "Force delete all the Virtual Machines and Virtual Machine Scale Sets in a resource group": {
+            "$ref": "./examples/ForceDeleteVMsAndVMSSInResourceGroup.json"
+          }
+        },
         "responses": {
           "200": {
             "description": "OK"