Skip to content

Commit 8edbcef

Browse files
ericshapeJackTnzhenglaizhangleniatghnajian
authored
Update from microsoft.sql 2021-05-01-preview to base branch (#16184)
* Update comment.yml for publish pr (#16166) * Update comment.yml * Update comment.yml * Bump dependencies (#16170) * bump avocado * bump mocha * remove submodule (#16171) * add azure-resource-manager-schema to servicelinker (#16176) Co-authored-by: Nan Jiang <naji@microsoft.com> * Update pr assignment config (#16175) * [Synapse] - fix scheme for Artifacts and update readme to include KQL scripts for October release (#16035) * [Synapse] - fix scheme for Notebook, Spark Job definition and SQL script * Update dataset, linked service and pipeline * Update release tag for october release * Correct type of result limit * Add arguments for SynapseSparkJobActivityTypeProperties Co-authored-by: Dongwei Wang <dongwwa@microsoft.com> * fix (#16164) Merging the change to have accurate Swagger * update swagger files * update readme.md * add missing json files * update custom-words.txt to address the spelling check * remove 201 define in ServerUpdate.json * remove blank line * address comments * address the description comment * update the swagger * remove ManagedInstances_ListOutboundNetworkDependenciesByManagedInstance Co-authored-by: Tianen <347142915@qq.com> Co-authored-by: Zhenglai Zhang <darinzh@microsoft.com> Co-authored-by: Lei Ni <7233663+leni-msft@users.noreply.github.com> Co-authored-by: najian <jiangnan8924@gmail.com> Co-authored-by: Nan Jiang <naji@microsoft.com> Co-authored-by: Ray Chen <raychen@microsoft.com> Co-authored-by: Dongwei Wang <bean0idear@163.com> Co-authored-by: Dongwei Wang <dongwwa@microsoft.com> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>
1 parent 71fa9f5 commit 8edbcef

File tree

92 files changed

+2112
-273
lines changed

Some content is hidden

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

92 files changed

+2112
-273
lines changed

‎custom-words.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ acquisitionid
2323
acrapi
2424
ACSSMS
2525
actionplans
26+
activedirectory
2627
activityruns
2728
actualcost
2829
actuser
@@ -1219,6 +1220,7 @@ MSAZRDE
12191220
MSAZRUSGO
12201221
MSCONCAT
12211222
mscv
1223+
msdb
12221224
MSGETACLSTATUS
12231225
MSGETFILESTATUS
12241226
msix
@@ -2014,6 +2016,7 @@ tasksuccess
20142016
Taxii
20152017
Tcpkeepalive
20162018
Tebibytes
2019+
tempdb
20172020
templated
20182021
templatelink
20192022
templeton

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseAdvisors.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@
300300
"readOnly": true
301301
},
302302
"executeActionDuration": {
303+
"format": "duration",
303304
"description": "Gets the time taken for applying this recommended action on user resource. e.g., time taken for index creation",
304305
"type": "string",
305306
"readOnly": true
@@ -311,6 +312,7 @@
311312
"readOnly": true
312313
},
313314
"revertActionDuration": {
315+
"format": "duration",
314316
"description": "Gets the time taken for reverting changes of this recommended action on user resource. e.g., time taken for dropping the created index.",
315317
"type": "string",
316318
"readOnly": true

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseExtensions.json‎

Lines changed: 124 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"tags": [
6565
"DatabaseExtensions"
6666
],
67-
"description": "Perform a database extension operation, like polybase import",
67+
"description": "Perform a database extension operation, like database import, database export, or polybase import",
6868
"operationId": "DatabaseExtensions_CreateOrUpdate",
6969
"parameters": [
7070
{
@@ -116,6 +116,12 @@
116116
"x-ms-examples": {
117117
"Create or Update database extensions.": {
118118
"$ref": "./examples/CreateOrUpdateDatabaseExtensions.json"
119+
},
120+
"Import database using database extension.": {
121+
"$ref": "./examples/ImportDatabaseUsingDatabaseExtensions.json"
122+
},
123+
"Export database using database extension.": {
124+
"$ref": "./examples/ExportDatabaseUsingDatabaseExtensions.json"
119125
}
120126
}
121127
}
@@ -168,7 +174,7 @@
168174
},
169175
"definitions": {
170176
"DatabaseExtensionsProperties": {
171-
"description": "Contains the database information after successful export.",
177+
"description": "Contains the database information after a successful Import, Export, or PolybaseImport",
172178
"required": [
173179
"operationMode",
174180
"storageKeyType",
@@ -178,9 +184,11 @@
178184
"type": "object",
179185
"properties": {
180186
"operationMode": {
181-
"description": "Operation Mode.",
187+
"description": "Operation mode of the operation: Import, Export, or PolybaseImport.",
182188
"enum": [
183-
"PolybaseImport"
189+
"PolybaseImport",
190+
"Import",
191+
"Export"
184192
],
185193
"type": "string",
186194
"x-ms-enum": {
@@ -192,7 +200,7 @@
192200
]
193201
},
194202
"storageKeyType": {
195-
"description": "Storage key type.",
203+
"description": "Storage key type: StorageAccessKey or SharedAccessKey.",
196204
"enum": [
197205
"SharedAccessKey",
198206
"StorageAccessKey"
@@ -207,14 +215,83 @@
207215
]
208216
},
209217
"storageKey": {
210-
"description": "Storage key.",
218+
"description": "Storage key for the storage account.",
211219
"type": "string",
212220
"x-ms-mutability": [
213221
"create"
214222
]
215223
},
216224
"storageUri": {
217-
"description": "Storage Uri.",
225+
"description": "Storage Uri for the storage account.",
226+
"type": "string",
227+
"x-ms-mutability": [
228+
"create"
229+
]
230+
},
231+
"administratorLogin": {
232+
"description": "Administrator login name.",
233+
"type": "string",
234+
"x-ms-mutability": [
235+
"create"
236+
]
237+
},
238+
"administratorLoginPassword": {
239+
"description": "Administrator login password.",
240+
"type": "string",
241+
"x-ms-mutability": [
242+
"create"
243+
]
244+
},
245+
"authenticationType": {
246+
"description": "Authentication type: SQL authentication or AD password.",
247+
"type": "string",
248+
"x-ms-mutability": [
249+
"create"
250+
]
251+
},
252+
"databaseEdition": {
253+
"description": "Database edition for the newly created database in the case of an import operation.",
254+
"type": "string",
255+
"x-ms-mutability": [
256+
"create"
257+
]
258+
},
259+
"serviceObjectiveName": {
260+
"description": "Database service level objective for the newly created database in the case of an import operation.",
261+
"type": "string",
262+
"x-ms-mutability": [
263+
"create"
264+
]
265+
},
266+
"maxSizeBytes": {
267+
"description": "Database max size in bytes for the newly created database in the case of an import operation.",
268+
"type": "string",
269+
"x-ms-mutability": [
270+
"create"
271+
]
272+
},
273+
"networkIsolation": {
274+
"$ref": "#/definitions/NetworkIsolationSettings",
275+
"description": "Optional resource information to enable network isolation for request.",
276+
"x-ms-mutability": [
277+
"create"
278+
]
279+
}
280+
}
281+
},
282+
"NetworkIsolationSettings": {
283+
"description": "Contains the ARM resources for which to create private endpoint connection.",
284+
"type": "object",
285+
"properties": {
286+
"storageAccountResourceId": {
287+
"description": "The resource id for the storage account used to store BACPAC file. If set, private endpoint connection will be created for the storage account. Must match storage account used for StorageUri parameter.",
288+
"type": "string",
289+
"x-ms-mutability": [
290+
"create"
291+
]
292+
},
293+
"sqlServerResourceId": {
294+
"description": "The resource id for the SQL server which is the target of this request. If set, private endpoint connection will be created for the SQL server. Must match server which is target of the operation.",
218295
"type": "string",
219296
"x-ms-mutability": [
220297
"create"
@@ -223,7 +300,7 @@
223300
}
224301
},
225302
"DatabaseExtensions": {
226-
"description": "An export managed database operation result resource.",
303+
"description": "An Import, Export, or PolybaseImport resource.",
227304
"type": "object",
228305
"allOf": [
229306
{
@@ -277,6 +354,45 @@
277354
"description": "Error message.",
278355
"type": "string",
279356
"readOnly": true
357+
},
358+
"queuedTime": {
359+
"description": "Queued time.",
360+
"type": "string",
361+
"readOnly": true
362+
},
363+
"blobUri": {
364+
"description": "Blob URI.",
365+
"type": "string",
366+
"readOnly": true
367+
},
368+
"privateEndpointConnections": {
369+
"description": "Gets the status of private endpoints associated with this request.",
370+
"type": "array",
371+
"items": {
372+
"$ref": "#/definitions/PrivateEndpointConnectionRequestStatus"
373+
},
374+
"readOnly": true
375+
}
376+
}
377+
},
378+
"PrivateEndpointConnectionRequestStatus": {
379+
"description": "Contains the private endpoint connection requests status.",
380+
"type": "object",
381+
"properties": {
382+
"privateLinkServiceId": {
383+
"description": "Resource id for which the private endpoint is created.",
384+
"type": "string",
385+
"readOnly": true
386+
},
387+
"privateEndpointConnectionName": {
388+
"description": "The connection name for the private endpoint.",
389+
"type": "string",
390+
"readOnly": true
391+
},
392+
"status": {
393+
"description": "Status of this private endpoint connection.",
394+
"type": "string",
395+
"readOnly": true
280396
}
281397
}
282398
},

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseOperations.json‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseRecommendedActions.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@
239239
"readOnly": true
240240
},
241241
"executeActionDuration": {
242+
"format": "duration",
242243
"description": "Gets the time taken for applying this recommended action on user resource. e.g., time taken for index creation",
243244
"type": "string",
244245
"readOnly": true
@@ -250,6 +251,7 @@
250251
"readOnly": true
251252
},
252253
"revertActionDuration": {
254+
"format": "duration",
253255
"description": "Gets the time taken for reverting changes of this recommended action on user resource. e.g., time taken for dropping the created index.",
254256
"type": "string",
255257
"readOnly": true

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseSecurityAlertPolicies.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"required": true,
4949
"type": "string",
5050
"enum": [
51-
"Default"
51+
"default"
5252
],
5353
"x-ms-enum": {
5454
"name": "SecurityAlertPolicyName",
@@ -110,7 +110,7 @@
110110
"required": true,
111111
"type": "string",
112112
"enum": [
113-
"Default"
113+
"default"
114114
],
115115
"x-ms-enum": {
116116
"name": "SecurityAlertPolicyName",

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseUsages.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎specification/sql/resource-manager/Microsoft.Sql/preview/2021-05-01-preview/DatabaseVulnerabilityAssessmentRuleBaselines.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
}
8989
},
9090
"default": {
91-
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of allowed FQDNs. The outbound firewall rules will block the request.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
91+
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of Outbound Firewall Rules.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
9292
}
9393
},
9494
"x-ms-examples": {
@@ -177,7 +177,7 @@
177177
}
178178
},
179179
"default": {
180-
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of allowed FQDNs. The outbound firewall rules will block the request.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
180+
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of Outbound Firewall Rules.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
181181
}
182182
},
183183
"x-ms-examples": {
@@ -254,7 +254,7 @@
254254
"description": "Successfully removed the database vulnerability assessment rule baseline."
255255
},
256256
"default": {
257-
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of allowed FQDNs. The outbound firewall rules will block the request.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
257+
"description": "*** Error Responses: ***\n\n * 400 VulnerabilityAssessmentStorageAuthenticationFailed - Could not authenticate to storage account '{0}' .\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\n\n * 400 VulnerabilityAssessmentStorageOutboundFirewallNotAllowed - The storage account is not in the list of Outbound Firewall Rules.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 VulnerabilityAssessmentInvalidStorageAccount - The storage account '{0}' that was defined in the policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 VulnerabilityAssessmentRuleDoesNotExists - Rule '{0}' does not exist.\n\n * 404 VulnerabilityAssessmentBaselineDoesNotExists - Baseline does not exist for rule '{0}'\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
258258
}
259259
},
260260
"x-ms-examples": {

0 commit comments

Comments
 (0)