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

Fix force delete query parameter #14254

Merged
merged 10 commits into from
May 19, 2021
Merged

Fix force delete query parameter #14254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a8dd2f3
remove name validation from client side
tjegbejimba Mar 17, 2021
d94dfb5
remove name check from deploymentScripts swagger
tjegbejimba Mar 17, 2021
0c797c2
remove name check from previous swagger versions
tjegbejimba Mar 18, 2021
ad763f1
remove pattern from resourcegroupname parameter
tjegbejimba Mar 18, 2021
1663192
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
tjegbejimba Apr 8, 2021
7fb53d4
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
tjegbejimba Apr 14, 2021
b7f7f3f
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
tjegbejimba Apr 28, 2021
86c45ba
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
tjegbejimba May 5, 2021
fe6ef33
Fix force deletion query parameter
tjegbejimba May 5, 2021
aadf5b7
add forceDeletionTypes to newer swagger
tjegbejimba May 10, 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
2 changes: 1 addition & 1 deletion .../Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion ...manager/Microsoft.Resources/stable/2020-06-01/examples/ForceDeleteVMsInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions ...ification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 16 additions & 0 deletions .../Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
16 changes: 16 additions & 0 deletions ...manager/Microsoft.Resources/stable/2021-01-01/examples/ForceDeleteVMsInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
15 changes: 15 additions & 0 deletions ...ification/resources/resource-manager/Microsoft.Resources/stable/2021-01-01/resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 16 additions & 0 deletions .../Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsAndVMSSInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
16 changes: 16 additions & 0 deletions ...manager/Microsoft.Resources/stable/2021-04-01/examples/ForceDeleteVMsInResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
15 changes: 15 additions & 0 deletions ...ification/resources/resource-manager/Microsoft.Resources/stable/2021-04-01/resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down