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

Adding new Virtual Cluster APIs #20469

Merged
merged 7 commits into from
Sep 3, 2022
Merged

Adding new Virtual Cluster APIs #20469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1410d0a
adding new VC VNext APIs
jtoroman Aug 30, 2022
a6ceb66
fixing examples
jtoroman Aug 30, 2022
45ef2d4
fixing examples2
jtoroman Aug 30, 2022
0781dbe
doing this to kick of validation that's stuck
jtoroman Aug 30, 2022
181c38c
doing this to kick of validation that's stuck
jtoroman Aug 30, 2022
1f358f1
removing not neede file
jtoroman Aug 30, 2022
3dccf78
Merge branch 'dev-sql-Microsoft.Sql-2022-05-01-preview' into vcVnextC…
toki95 Aug 31, 2022
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
81 changes: 41 additions & 40 deletions ...cation/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/VirtualClusters.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions ...ples/UpdateManagedInstanceDnsServers.json → ...mples/UpdateVirtualClusterDnsServers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "sqlcrudtest-7398",
"virtualClusterName": "sqlcrudtest-4645",
"virtualClusterName": "VirtualCluster2b9a846b-2e37-43ef-a8e9-f2c6d645c1d7",
"api-version": "2022-05-01-preview"
},
"responses": {
"202": {},
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.Sql/virtualClusters/test-virtualcluster/updateManagedInstanceDnsServers",
"properties": {
"status": "Succeeded"
}
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/virtualClusters/VirtualCluster2b9a846b-2e37-43ef-a8e9-f2c6d645c1d7/updateManagedInstanceDnsServers"
}
}
}
Expand Down
22 changes: 12 additions & 10 deletions ...resource-manager/Microsoft.Sql/preview/2022-05-01-preview/examples/VirtualClusterGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@
"parameters": {
"subscriptionId": "20d7082a-0fc7-4468-82bd-542694d5042b",
"resourceGroupName": "testrg",
"virtualClusterName": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"virtualClusterName": "vc-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"api-version": "2022-05-01-preview"
},
"responses": {
"200": {
"body": {
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"family": "Gen4",
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest",
"version": "2.0",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance1",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance2"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/mi"
]
},
"location": "onebox",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"name": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"location": "japaneast",
"tags": {
"key": "value"
},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"name": "vc-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"type": "Microsoft.Sql/virtualClusters"
}
}
Expand Down
44 changes: 26 additions & 18 deletions ...esource-manager/Microsoft.Sql/preview/2022-05-01-preview/examples/VirtualClusterList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,40 @@
"value": [
{
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"family": "Gen4",
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest",
"version": "1.0",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance1",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance2"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl"
]
},
"location": "onebox",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"name": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"location": "japaneast",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/VirtualClustercltest",
"name": "VirtualClustercltest",
"type": "Microsoft.Sql/virtualClusters"
},
{
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/subnet2",
"family": "Gen5",
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest2",
"version": "2.0",
"childResources": []
},
"location": "japaneast",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc2",
"name": "vc2",
"type": "Microsoft.Sql/virtualClusters"
},
{
"properties": {
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest",
"version": "2.0",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance3",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance4"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/mi"
]
},
"location": "onebox",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet2-14b795bd-9c8f-46ec-adb8-2b8eff56ac16",
"name": "vc-subnet1-14b795bd-9c8f-46ec-adb8-2b8eff56ac16",
"location": "japaneast",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc1",
"name": "vc1",
"type": "Microsoft.Sql/virtualClusters"
}
]
Expand Down
47 changes: 29 additions & 18 deletions .../Microsoft.Sql/preview/2022-05-01-preview/examples/VirtualClusterListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,43 @@
"value": [
{
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"family": "Gen4",
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest",
"version": "1.0",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance1",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance2"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"/subscriptions/65dc2520-d3b9-4d11-b638-f3c41f962550/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl"
]
},
"location": "onebox",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"name": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"location": "japaneast",
"id": "/subscriptions/65dc2520-d3b9-4d11-b638-f3c41f962550/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/VirtualClustercltest",
"name": "VirtualClustercltest",
"type": "Microsoft.Sql/virtualClusters"
},
{
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/subnet2",
"family": "Gen4",
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest2",
"version": "2.0",
"childResources": []
},
"location": "japaneast",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc2",
"name": "vc2",
"type": "Microsoft.Sql/virtualClusters"
},
{
"properties": {
"subnetId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/cltest",
"version": "2.0",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance3",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance4"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
"/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/mi"
]
},
"location": "japaneast",
"tags": {
"tkey": "tvalue3"
},
"location": "onebox",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet2-14b795bd-9c8f-46ec-adb8-2b8eff56ac16",
"name": "vc-subnet1-14b795bd-9c8f-46ec-adb8-2b8eff56ac16",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc1",
"name": "vc1",
"type": "Microsoft.Sql/virtualClusters"
}
]
Expand Down
16 changes: 6 additions & 10 deletions ...ource-manager/Microsoft.Sql/preview/2022-05-01-preview/examples/VirtualClusterUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,19 @@
"virtualClusterName": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"api-version": "2022-05-01-preview",
"parameters": {
"properties": {
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"tags": {
"tkey": "tvalue1"
}
}
},
"responses": {
"200": {
"body": {
"properties": {
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"childResources": [
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance1",
"/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance2"
],
"maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/resourceGroups/Federation/providers/Microsoft.Maintenance/maintenanceConfigurations/MiPolicy1"
"properties": {},
"tags": {
"tkey": "tvalue3"
},
"location": "onebox",
"location": "japaneast",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/virtualClusters/vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"name": "vc-subnet1-f769ed71-b3ad-491a-a9d5-26eeceaa6be2",
"type": "Microsoft.Sql/virtualClusters"
Expand Down
2 changes: 1 addition & 1 deletion specification/sql/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,6 @@ input-file:
- ./Microsoft.Sql/preview/2020-11-01-preview/SyncMembers.json
- ./Microsoft.Sql/preview/2020-11-01-preview/TdeCertificates.json
- ./Microsoft.Sql/preview/2020-11-01-preview/TimeZones.json
- ./Microsoft.Sql/preview/2020-11-01-preview/VirtualClusters.json
- ./Microsoft.Sql/preview/2020-11-01-preview/VirtualNetworkRules.json
- ./Microsoft.Sql/preview/2020-11-01-preview/WorkloadClassifiers.json
- ./Microsoft.Sql/preview/2020-11-01-preview/WorkloadGroups.json
Expand Down Expand Up @@ -562,6 +561,7 @@ input-file:
- ./Microsoft.Sql/preview/2022-02-01-preview/ManagedInstanceAdvancedThreatProtectionSettings.json
- ./Microsoft.Sql/preview/2022-05-01-preview/ManagedDatabaseMoveOperations.json
- ./Microsoft.Sql/preview/2022-05-01-preview/ManagedInstanceDtcs.json
- ./Microsoft.Sql/preview/2022-05-01-preview/VirtualClusters.json


# Needed when there is more than one input file
Expand Down