Skip to content

Commit 3128013

Browse files
ericshapexaliciayangayeletshpigelmanstrehan1993kukislav
authored
Dev sql microsoft.sql 2020 11 01 preview minor change (#13689)
* Adds base for updating Microsoft.Sql from version preview/2020-08-01-preview to version 2020-11-01-preview * Updates readme * Updates API version in new specs and examples * Add updated 2020-11-01-preview versions of LongTermRetenionBackups.json and Databases.json (#12146) * add updated databases.json swagger * update readme with new package * v4 -> v5 * add missing chunk in readme * add correct swaggeR * add examples * add correct examplese * remove unreferenced examples * update swagger and examples. add 2020-11 pure package * Fix reference to 2020-08-01 reference to ElasticPools.json * update Databases.json name * update examples * remove nonexistant swagger * fixed reference capitals in readme * update package composite and fix ref to ManagedInstances.jsON * make backupstorageredundancy settings consistent * add requestedBackupStorageRedundancy to properties object in example * add LTR swagger and examples * add LTR Policies swagger and examples * make v5 match v4 * add updated Databses.json * merge conflicts in LTR Policies swagger' * take out comments in readme * taking ImportExport.json out from 2020-11 package * remove duplicate 2020-11 tag in readme * modify Databases_legacy.json to exclude ImportExport-related APIs * add servers.json for IE APIS and remove unused databases examples * fix model & prettier errors; add missing server example * add missing servers examples * fix example to exclude property from server obj * change RecommendedActions definitoins * change tag to composite v4 * Add missing properties for api version 2020-02-02-preview of securityAlertPolicies (#13117) * Add missing properties for api version 2020-02-02-preview * fix checks * fix according to prettier check * Add the change to version 2020-08-01-preview and version 2020-11-01-preview * remove changes in package-lock * Add new line at the end of file * update version 2020-11-01-preview * Update the ref to system data in serverdevopsaudit * add missing point * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * fix the validation errors (#13325) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * Address Private Endpoint validation issues in V3, V2 and V1 SDK tags (#13404) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * Identity/Key/external Admin API (#13411) * Add examples for sql mi remove maintenance configuration (#13390) * Add missing specs 2020 11 01 (#13488) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * add missing specs in 2020-11-01-preview * update the validation errors * update systemData and sync with global common/v1/types.json * update legacy to match the latest database specs * remove RestorableDroppedManagedInstances due to it should be internal * Updated database extensions (#13584) Co-authored-by: Geetha Athreya <[email protected]> Co-authored-by: xaliciayang <[email protected]> Co-authored-by: ayeletshpigelman <[email protected]> Co-authored-by: strehan1993 <[email protected]> Co-authored-by: Ivan Kulezic <[email protected]> Co-authored-by: Geetha Athreya <[email protected]> Co-authored-by: Geetha Athreya <[email protected]>
1 parent a46829b commit 3128013

File tree

79 files changed

+1134
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1134
-288
lines changed

‎specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
4+
"resourceGroupName": "testrg",
5+
"managedInstanceName": "testinstance",
6+
"api-version": "2015-05-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"sku": {
17+
"name": "GP_Gen4",
18+
"tier": "GeneralPurpose",
19+
"capacity": 8,
20+
"family": "Gen4"
21+
},
22+
"properties": {
23+
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
24+
"administratorLogin": "dummylogin",
25+
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
26+
"state": "Ready",
27+
"vCores": 8,
28+
"storageSizeInGB": 1024,
29+
"licenseType": "LicenseIncluded",
30+
"collation": "SQL_Latin1_General_CP1_CI_AS",
31+
"publicDataEndpointEnabled": false,
32+
"proxyOverride": "Default",
33+
"dnsZone": "1b4e2caff2530",
34+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
35+
},
36+
"location": "japaneast",
37+
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
38+
"name": "testinstance",
39+
"type": "Microsoft.Sql/managedInstances"
40+
}
41+
},
42+
"202": {}
43+
}
44+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,9 @@
243243
},
244244
"Update managed instance with all properties": {
245245
"$ref": "./examples/ManagedInstanceUpdateMax.json"
246+
},
247+
"Remove maintenance policy from managed instance (select default maintenance policy)": {
248+
"$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
246249
}
247250
}
248251
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
4+
"resourceGroupName": "testrg",
5+
"managedInstanceName": "testinstance",
6+
"api-version": "2018-06-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"sku": {
17+
"name": "GP_Gen4",
18+
"tier": "GeneralPurpose",
19+
"capacity": 8,
20+
"family": "Gen4"
21+
},
22+
"properties": {
23+
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
24+
"administratorLogin": "dummylogin",
25+
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
26+
"state": "Ready",
27+
"vCores": 8,
28+
"storageSizeInGB": 1024,
29+
"licenseType": "LicenseIncluded",
30+
"collation": "SQL_Latin1_General_CP1_CI_AS",
31+
"publicDataEndpointEnabled": false,
32+
"proxyOverride": "Default",
33+
"dnsZone": "1b4e2caff2530",
34+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
35+
},
36+
"location": "japaneast",
37+
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
38+
"name": "testinstance",
39+
"type": "Microsoft.Sql/managedInstances"
40+
}
41+
},
42+
"202": {}
43+
}
44+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@
289289
},
290290
"Update managed instance with all properties": {
291291
"$ref": "./examples/ManagedInstanceUpdateMax.json"
292+
},
293+
"Remove maintenance policy from managed instance (select default maintenance policy)": {
294+
"$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
292295
}
293296
}
294297
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/ManagedInstances.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@
289289
},
290290
"Update managed instance with all properties": {
291291
"$ref": "./examples/ManagedInstanceUpdateMax.json"
292+
},
293+
"Remove maintenance policy from managed instance (select default maintenance policy)": {
294+
"$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
292295
}
293296
}
294297
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
4+
"resourceGroupName": "testrg",
5+
"managedInstanceName": "testinstance",
6+
"api-version": "2020-02-02-preview",
7+
"parameters": {
8+
"properties": {
9+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"sku": {
17+
"name": "GP_Gen4",
18+
"tier": "GeneralPurpose",
19+
"capacity": 8,
20+
"family": "Gen4"
21+
},
22+
"properties": {
23+
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
24+
"administratorLogin": "dummylogin",
25+
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
26+
"state": "Ready",
27+
"vCores": 8,
28+
"storageSizeInGB": 1024,
29+
"licenseType": "LicenseIncluded",
30+
"collation": "SQL_Latin1_General_CP1_CI_AS",
31+
"publicDataEndpointEnabled": false,
32+
"proxyOverride": "Default",
33+
"dnsZone": "1b4e2caff2530",
34+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
35+
},
36+
"location": "japaneast",
37+
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
38+
"name": "testinstance",
39+
"type": "Microsoft.Sql/managedInstances"
40+
}
41+
},
42+
"202": {}
43+
}
44+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/DatabaseExtensions.json‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"description": "The database import request parameters.",
8989
"required": true,
9090
"schema": {
91-
"$ref": "#/definitions/DatabaseExtensionsDefinition"
91+
"$ref": "#/definitions/DatabaseExtensions"
9292
}
9393
},
9494
{
@@ -106,7 +106,7 @@
106106
}
107107
},
108108
"default": {
109-
"description": "*** Error Responses: ***\n\n * 400 MissingImportExportInputParameters - Missing ImportExport input parameters.\n\n * 400 PolybaseImportAuthenticationTypeNotSupported - Authentication type parameter is not support for PolybaseImport operation.\n\n * 400 DatabaseExtensionsMissingOperationMode - Missing operationMode parameter for database extension.\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 InvalidOperationType - Provide a valid operation type.\n\n * 404 ResourceNotFound - Invalid request specifying a non-existent resource.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ImportExportOperationIdNotFound - The operation Id for import or export cannot be found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 409 ImportExportOperationInProgress - There is an import or export operation in progress on the database."
109+
"description": "*** Error Responses: ***\n\n * 400 MissingImportExportInputParameters - Missing ImportExport input parameters.\n\n * 400 PolybaseImportAuthenticationTypeNotSupported - Authentication type parameter is not support for PolybaseImport operation.\n\n * 400 DatabaseExtensionsInvalidOperationMode - Invalid operationMode parameter for database extension.\n\n * 400 DatabaseExtensionsInvalidStorageKeyType - The storage key type must by 'StorageAccessKey'.\n\n * 400 DatabaseExtensionsMissingStorageUri - Storage URI cannot be empty.\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 InvalidOperationType - Provide a valid operation type.\n\n * 400 ImportExportJobError - The ImportExport operation has failed.\n\n * 400 BlockedByOutboundFirewall - The outbound firewall rules blocked the request.\n\n * 404 ResourceNotFound - Invalid request specifying a non-existent resource.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ImportExportOperationIdNotFound - The operation Id for import or export cannot be found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 409 ImportExportOperationInProgress - There is an import or export operation in progress on the database."
110110
},
111111
"202": {
112112
"description": "Import/Export operation is in progress."
@@ -167,7 +167,8 @@
167167
}
168168
},
169169
"definitions": {
170-
"DatabaseExtensionsDefinition": {
170+
"DatabaseExtensionsProperties": {
171+
"description": "Contains the database information after successful export.",
171172
"required": [
172173
"operationMode",
173174
"storageKeyType",
@@ -218,27 +219,22 @@
218219
"x-ms-mutability": [
219220
"create"
220221
]
221-
},
222-
"administratorLogin": {
223-
"description": "Administrator login name.",
224-
"type": "string",
225-
"x-ms-mutability": [
226-
"create"
227-
]
228-
},
229-
"administratorLoginPassword": {
230-
"description": "Administrator login password.",
231-
"type": "string",
232-
"x-ms-mutability": [
233-
"create"
234-
]
235-
},
236-
"authenticationType": {
237-
"description": "Authentication type.",
238-
"type": "string",
239-
"x-ms-mutability": [
240-
"create"
241-
]
222+
}
223+
}
224+
},
225+
"DatabaseExtensions": {
226+
"description": "An export managed database operation result resource.",
227+
"type": "object",
228+
"allOf": [
229+
{
230+
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
231+
}
232+
],
233+
"properties": {
234+
"properties": {
235+
"$ref": "#/definitions/DatabaseExtensionsProperties",
236+
"description": "Resource properties.",
237+
"x-ms-client-flatten": true
242238
}
243239
}
244240
},

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/ManagedInstances.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@
289289
},
290290
"Update managed instance with all properties": {
291291
"$ref": "./examples/ManagedInstanceUpdateMax.json"
292+
},
293+
"Remove maintenance policy from managed instance (select default maintenance policy)": {
294+
"$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
292295
}
293296
}
294297
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/examples/CreateOrUpdateDatabaseExtensions.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
"extensionName": "polybaseimport",
88
"api-version": "2020-08-01-preview",
99
"parameters": {
10-
"operationMode": "PolybaseImport",
11-
"storageKeyType": "StorageAccessKey",
12-
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
13-
"storageUri": "https://teststorage.blob.core.windows.net/testcontainer/Manifest.xml"
10+
"properties": {
11+
"operationMode": "PolybaseImport",
12+
"storageKeyType": "StorageAccessKey",
13+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
14+
"storageUri": "https://teststorage.blob.core.windows.net/testcontainer/Manifest.xml"
15+
}
1416
}
1517
},
1618
"responses": {

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
4+
"resourceGroupName": "testrg",
5+
"managedInstanceName": "testinstance",
6+
"api-version": "2020-08-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"sku": {
17+
"name": "GP_Gen4",
18+
"tier": "GeneralPurpose",
19+
"capacity": 8,
20+
"family": "Gen4"
21+
},
22+
"properties": {
23+
"fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
24+
"administratorLogin": "dummylogin",
25+
"subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
26+
"state": "Ready",
27+
"vCores": 8,
28+
"storageSizeInGB": 1024,
29+
"licenseType": "LicenseIncluded",
30+
"collation": "SQL_Latin1_General_CP1_CI_AS",
31+
"publicDataEndpointEnabled": false,
32+
"proxyOverride": "Default",
33+
"dnsZone": "1b4e2caff2530",
34+
"maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
35+
},
36+
"location": "japaneast",
37+
"id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
38+
"name": "testinstance",
39+
"type": "Microsoft.Sql/managedInstances"
40+
}
41+
},
42+
"202": {}
43+
}
44+
}

0 commit comments

Comments
 (0)