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

Jump to bottom

Identity/Key/external Admin API in Server and MI 2020-11-01-preview #13411

Merged
merged 1 commit into from
Mar 16, 2021
Merged

Identity/Key/external Admin API in Server and MI 2020-11-01-preview #13411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
247 changes: 207 additions & 40 deletions ...ation/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 51 additions & 9 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Servers.json
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 32 additions & 6 deletions ...e-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"properties": {
"administratorLogin": "dummylogin",
"administratorLoginPassword": "<administratorLoginPassword>",
"administratorLoginPassword": "PLACEHOLDER",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"vCores": 8,
"storageSizeInGB": 1024,
Expand All @@ -24,10 +24,18 @@
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
}
}
},
Expand All @@ -45,23 +53,32 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Creating",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
},
"location": "japaneast",
"tags": {
"tagKey1": "TagValue1"
},
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
Expand All @@ -79,17 +96,26 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Creating",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"timezoneId": "UTC",
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
},
"location": "japaneast",
"tags": {
Expand Down
6 changes: 4 additions & 2 deletions ...e-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceCreateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"properties": {
"administratorLogin": "dummylogin",
"administratorLoginPassword": "<administratorLoginPassword>",
"administratorLoginPassword": "PLACEHOLDER",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"vCores": 8,
"storageSizeInGB": 1024,
Expand All @@ -34,12 +34,13 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Creating",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"proxyOverride": "Redirect",
"dnsZone": "1b4e2caff2530"
},
"location": "japaneast",
Expand All @@ -62,6 +63,7 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Creating",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
Expand Down
2 changes: 2 additions & 0 deletions ...esource-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/instancePool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
Expand Down
52 changes: 52 additions & 0 deletions ...preview/2020-11-01-preview/examples/ManagedInstanceGetWithExpandEqualsAdministrators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"subscriptionId": "20d7082a-0fc7-4468-82bd-542694d5042b",
"resourceGroupName": "testrg",
"managedInstanceName": "testinstance",
"api-version": "2020-11-01-preview"
},
"responses": {
"200": {
"body": {
"sku": {
"name": "GP_Gen4",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen4"
},
"properties": {
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/instancePool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
},
"location": "japaneast",
"tags": {
"key": "value"
},
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"name": "testinstance",
"type": "Microsoft.Sql/managedInstances"
}
}
}
}
6 changes: 5 additions & 1 deletion ...source-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
Expand All @@ -50,14 +52,16 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/subnet2",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 16,
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "2c3d1bdae3412",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_2",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
}
}
Expand Down
4 changes: 4 additions & 0 deletions .../Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceListByInstancePool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"dnsZone": "1b4e2caff2530",
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_CanadaCentral_MI_1",
"storageAccountType": "GRS"
Expand All @@ -53,13 +55,15 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 16,
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"dnsZone": "2c3d1bdae3412",
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_CanadaCentral_MI_1",
"storageAccountType": "GRS"
Expand Down
90 changes: 90 additions & 0 deletions ...-01-preview/examples/ManagedInstanceListByInstancePoolWithExpandEqualsAdministrators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"parameters": {
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
"resourceGroupName": "Test1",
"instancePoolName": "pool1",
"api-version": "2020-11-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"location": "canadacentral",
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/managedInstances/testinstance1",
"name": "testinstance1",
"type": "Microsoft.Sql/managedInstances",
"sku": {
"name": "GP_Gen5",
"tier": "GeneralPurpose",
"capacity": 8,
"family": "Gen5"
},
"properties": {
"fullyQualifiedDomainName": "testinstance1.1b4e2caff2530.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"dnsZone": "1b4e2caff2530",
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_CanadaCentral_MI_1",
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
}
},
{
"location": "canadacentral",
"id": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/managedInstances/testinstance2",
"name": "testinstance2",
"type": "Microsoft.Sql/managedInstances",
"sku": {
"name": "GP_Gen5",
"tier": "GeneralPurpose",
"capacity": 16,
"family": "Gen5"
},
"properties": {
"fullyQualifiedDomainName": "testinstance2.2c3d1bdae3412.database.windows.net",
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 16,
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"dnsZone": "2c3d1bdae3412",
"proxyOverride": "Redirect",
"minimalTlsVersion": "1.2",
"instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/Test1/providers/Microsoft.Sql/instancePools/pool1",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_CanadaCentral_MI_2",
"storageAccountType": "GRS",
"administrators": {
"principalType": "User",
"login": "bob@contoso.com",
"sid": "00000011-1111-2222-2222-123456789111",
"tenantId": "00000011-1111-2222-2222-123456789111",
"azureADOnlyAuthentication": true
}
}
}
]
}
}
}
}
8 changes: 6 additions & 2 deletions ...Microsoft.Sql/preview/2020-11-01-preview/examples/ManagedInstanceListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 8,
"storageSizeInGB": 1024,
"licenseType": "LicenseIncluded",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "1b4e2caff2530",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
}
},
Expand All @@ -51,14 +53,16 @@
"administratorLogin": "dummylogin",
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/subnet2",
"state": "Ready",
"provisioningState": "Succeeded",
"vCores": 16,
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"publicDataEndpointEnabled": false,
"proxyOverride": "Default",
"minimalTlsVersion": "1.2",
"dnsZone": "2c3d1bdae3412",
"maintenanceConfigurationId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_JapanEast_MI_1",
"storageAccountType": "GRS"
}
}
Expand Down
Loading