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.

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

Update from microsoft.sql 2021-05-01-preview to base branch #16184

Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
3 changes: 3 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ acquisitionid
acrapi
ACSSMS
actionplans
activedirectory
activityruns
actualcost
actuser
Expand Down Expand Up @@ -1219,6 +1220,7 @@ MSAZRDE
MSAZRUSGO
MSCONCAT
mscv
msdb
MSGETACLSTATUS
MSGETFILESTATUS
msix
Expand Down Expand Up @@ -2014,6 +2016,7 @@ tasksuccess
Taxii
Tcpkeepalive
Tebibytes
tempdb
templated
templatelink
templeton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@
"readOnly": true
},
"executeActionDuration": {
"format": "duration",
"description": "Gets the time taken for applying this recommended action on user resource. e.g., time taken for index creation",
"type": "string",
"readOnly": true
Expand All @@ -311,6 +312,7 @@
"readOnly": true
},
"revertActionDuration": {
"format": "duration",
"description": "Gets the time taken for reverting changes of this recommended action on user resource. e.g., time taken for dropping the created index.",
"type": "string",
"readOnly": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"tags": [
"DatabaseExtensions"
],
"description": "Perform a database extension operation, like polybase import",
"description": "Perform a database extension operation, like database import, database export, or polybase import",
"operationId": "DatabaseExtensions_CreateOrUpdate",
"parameters": [
{
Expand Down Expand Up @@ -116,6 +116,12 @@
"x-ms-examples": {
"Create or Update database extensions.": {
"$ref": "./examples/CreateOrUpdateDatabaseExtensions.json"
},
"Import database using database extension.": {
"$ref": "./examples/ImportDatabaseUsingDatabaseExtensions.json"
},
"Export database using database extension.": {
"$ref": "./examples/ExportDatabaseUsingDatabaseExtensions.json"
}
}
}
Expand Down Expand Up @@ -168,7 +174,7 @@
},
"definitions": {
"DatabaseExtensionsProperties": {
"description": "Contains the database information after successful export.",
"description": "Contains the database information after a successful Import, Export, or PolybaseImport",
"required": [
"operationMode",
"storageKeyType",
Expand All @@ -178,9 +184,11 @@
"type": "object",
"properties": {
"operationMode": {
"description": "Operation Mode.",
"description": "Operation mode of the operation: Import, Export, or PolybaseImport.",
"enum": [
"PolybaseImport"
"PolybaseImport",
"Import",
"Export"
],
"type": "string",
"x-ms-enum": {
Expand All @@ -192,7 +200,7 @@
]
},
"storageKeyType": {
"description": "Storage key type.",
"description": "Storage key type: StorageAccessKey or SharedAccessKey.",
"enum": [
"SharedAccessKey",
"StorageAccessKey"
Expand All @@ -207,14 +215,83 @@
]
},
"storageKey": {
"description": "Storage key.",
"description": "Storage key for the storage account.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"storageUri": {
"description": "Storage Uri.",
"description": "Storage Uri for the storage account.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"administratorLogin": {
"description": "Administrator login name.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"administratorLoginPassword": {
"description": "Administrator login password.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"authenticationType": {
"description": "Authentication type: SQL authentication or AD password.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"databaseEdition": {
"description": "Database edition for the newly created database in the case of an import operation.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"serviceObjectiveName": {
"description": "Database service level objective for the newly created database in the case of an import operation.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"maxSizeBytes": {
"description": "Database max size in bytes for the newly created database in the case of an import operation.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"networkIsolation": {
"$ref": "#/definitions/NetworkIsolationSettings",
"description": "Optional resource information to enable network isolation for request.",
"x-ms-mutability": [
"create"
]
}
}
},
"NetworkIsolationSettings": {
"description": "Contains the ARM resources for which to create private endpoint connection.",
"type": "object",
"properties": {
"storageAccountResourceId": {
"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.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"sqlServerResourceId": {
"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.",
"type": "string",
"x-ms-mutability": [
"create"
Expand All @@ -223,7 +300,7 @@
}
},
"DatabaseExtensions": {
"description": "An export managed database operation result resource.",
"description": "An Import, Export, or PolybaseImport resource.",
"type": "object",
"allOf": [
{
Expand Down Expand Up @@ -277,6 +354,45 @@
"description": "Error message.",
"type": "string",
"readOnly": true
},
"queuedTime": {
"description": "Queued time.",
"type": "string",
TimLovellSmith marked this conversation as resolved.
Show resolved Hide resolved
"readOnly": true
},
"blobUri": {
"description": "Blob URI.",
"type": "string",
"readOnly": true
},
"privateEndpointConnections": {
"description": "Gets the status of private endpoints associated with this request.",
"type": "array",
"items": {
"$ref": "#/definitions/PrivateEndpointConnectionRequestStatus"
},
"readOnly": true
}
}
},
"PrivateEndpointConnectionRequestStatus": {
"description": "Contains the private endpoint connection requests status.",
"type": "object",
"properties": {
"privateLinkServiceId": {
"description": "Resource id for which the private endpoint is created.",
"type": "string",
"readOnly": true
},
"privateEndpointConnectionName": {
"description": "The connection name for the private endpoint.",
"type": "string",
"readOnly": true
},
"status": {
"description": "Status of this private endpoint connection.",
"type": "string",
"readOnly": true
}
}
},
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
"readOnly": true
},
"executeActionDuration": {
"format": "duration",
"description": "Gets the time taken for applying this recommended action on user resource. e.g., time taken for index creation",
"type": "string",
"readOnly": true
Expand All @@ -250,6 +251,7 @@
"readOnly": true
},
"revertActionDuration": {
"format": "duration",
"description": "Gets the time taken for reverting changes of this recommended action on user resource. e.g., time taken for dropping the created index.",
"type": "string",
"readOnly": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"required": true,
"type": "string",
"enum": [
"Default"
"default"
],
"x-ms-enum": {
"name": "SecurityAlertPolicyName",
Expand Down Expand Up @@ -110,7 +110,7 @@
"required": true,
"type": "string",
"enum": [
"Default"
"default"
],
"x-ms-enum": {
"name": "SecurityAlertPolicyName",
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
}
},
"default": {
"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."
"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."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -177,7 +177,7 @@
}
},
"default": {
"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."
"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."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -254,7 +254,7 @@
"description": "Successfully removed the database vulnerability assessment rule baseline."
},
"default": {
"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."
"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."
}
},
"x-ms-examples": {
Expand Down
Loading