Skip to content

Commit 600fe4a

Browse files
authored
Fix v5 sdk errors and update swagger (#12480)
* update v5 sdk errors * update RestorableDroppedDatabases.json
1 parent d1d0982 commit 600fe4a

11 files changed

+305
-11
lines changed

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,51 @@
7171
}
7272
}
7373
}
74+
},
75+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/dataWarehouseUserActivities": {
76+
"get": {
77+
"tags": [
78+
"DataWarehouseUserActivities"
79+
],
80+
"description": "List the user activities of a data warehouse which includes running and suspended queries",
81+
"operationId": "DataWarehouseUserActivities_ListByDatabase",
82+
"parameters": [
83+
{
84+
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
85+
},
86+
{
87+
"$ref": "#/parameters/ServerNameParameter"
88+
},
89+
{
90+
"$ref": "#/parameters/DatabaseNameParameter"
91+
},
92+
{
93+
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
94+
},
95+
{
96+
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
97+
}
98+
],
99+
"responses": {
100+
"200": {
101+
"description": "Successfully list the data warehouse user activities.",
102+
"schema": {
103+
"$ref": "#/definitions/DataWarehouseUserActivitiesListResult"
104+
}
105+
},
106+
"default": {
107+
"description": "*** Error Responses: ***\n\n * 400 UpdateNotAllowedOnPausedDatabase - User attempted to perform an update on a paused database.\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 ResourceNotFound - The specified resource was not found."
108+
}
109+
},
110+
"x-ms-pageable": {
111+
"nextLinkName": "nextLink"
112+
},
113+
"x-ms-examples": {
114+
"List of the user activities of a data warehouse": {
115+
"$ref": "./examples/ListDataWarehouseUserActivities.json"
116+
}
117+
}
118+
}
74119
}
75120
},
76121
"definitions": {
@@ -101,6 +146,25 @@
101146
"x-ms-client-flatten": true
102147
}
103148
}
149+
},
150+
"DataWarehouseUserActivitiesListResult": {
151+
"description": "User activities of a data warehouse",
152+
"type": "object",
153+
"properties": {
154+
"value": {
155+
"description": "Array of results.",
156+
"type": "array",
157+
"items": {
158+
"$ref": "#/definitions/DataWarehouseUserActivities"
159+
},
160+
"readOnly": true
161+
},
162+
"nextLink": {
163+
"description": "Link to retrieve next page of results.",
164+
"type": "string",
165+
"readOnly": true
166+
}
167+
}
104168
}
105169
},
106170
"parameters": {

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

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

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

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

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,59 @@
156156
}
157157
}
158158
}
159+
},
160+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/databases/{databaseName}/transparentDataEncryption": {
161+
"get": {
162+
"tags": [
163+
"ManagedDatabaseTransparentDataEncryption"
164+
],
165+
"description": "Gets a list of managed database's transparent data encryptions.",
166+
"operationId": "ManagedDatabaseTransparentDataEncryption_ListByDatabase",
167+
"parameters": [
168+
{
169+
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
170+
},
171+
{
172+
"name": "managedInstanceName",
173+
"in": "path",
174+
"description": "The name of the managed instance.",
175+
"required": true,
176+
"type": "string"
177+
},
178+
{
179+
"name": "databaseName",
180+
"in": "path",
181+
"description": "The name of the managed database for which the transparent data encryption is defined.",
182+
"required": true,
183+
"type": "string"
184+
},
185+
{
186+
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
187+
},
188+
{
189+
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
190+
}
191+
],
192+
"responses": {
193+
"200": {
194+
"description": "Successfully retrieved the list of managed database transparent data encryptions.",
195+
"schema": {
196+
"$ref": "#/definitions/ManagedTransparentDataEncryptionListResult"
197+
}
198+
},
199+
"default": {
200+
"description": "*** Error Responses: ***\n\n * 400 SecurityAdalPrincipalCertExpiredError - The operation could not be completed because the Azure Key Vault principal certificate has expired.\n\n * 400 SecurityInvalidAzureKeyVaultRecoveryLevel - The provided Key Vault uri is not valid.\n\n * 400 KeyMaterialNotFoundOnRemoteServer - Remote server does not have access to key material used as a TDE protector.\n\n * 400 AzureKeyVaultMismatchError - Unexpected Key Vault region found in the http response.\n\n * 400 AzureKeyVaultRsaKeyNotSupported - The provided key vault uses unsupported RSA Key Size or Key Type. The supported RSA key size is 2048 or 3072 and Key Type is RSA or RSA-HSM.\n\n * 400 AzureKeyVaultInvalidExpirationDate - The operation could not be completed because the Azure Key Vault key expiration date is invalid.\n\n * 400 SecurityAzureKeyVaultUrlNullOrEmpty - The operation could not be completed because the Azure Key Vault Uri is null or empty.\n\n * 400 AzureKeyVaultInvalidUri - An invalid response from Azure Key Vault. Please use a valid Azure Key Vault URI.\n\n * 400 SecurityAzureKeyVaultInvalidKeyName - The operation could not be completed because of an invalid Server Key name.\n\n * 400 AzureKeyVaultMalformedVaultUri - The provided Key Vault uri is not valid.\n\n * 400 SecurityAzureKeyVaultGeoChainError - Creating secondary of secondary (a process known as chaining) is not supported when enabling Transparent Data Encryption using Azure Key Vault (BYOK).\n\n * 400 ReadOnly - Cannot enable or modify database encryption on a database that is read-only, has read-only files or is not recovered.\n\n * 400 CanNotDropAlterOnMirror - Please modify Transparent Data Encryption on the primary databases.\n\n * 401 AzureKeyVaultKeyDisabled - The operation could not be completed on the server because the Azure Key Vault key is disabled.\n\n * 401 AzureKeyVaultNoServerIdentity - The server identity is not correctly configured.\n\n * 401 AzureKeyVaultMissingPermissions - The server is missing required permissions on the Azure Key Vault. \n\n * 401 AdalGenericError - The operation could not be completed because an Azure Active Directory error was encountered.\n\n * 401 AdalServicePrincipalNotFound - The operation could not be completed because an Azure Active Directory library Service Principal not found error was encountered.\n\n * 401 CanNotChangeReadOnlyDuringTdeScan - Cannot modify filegroup read-only/read-write state while an encryption transition is in progress.\n\n * 409 ServerKeyNameAlreadyExists - The server key already exists on the server.\n\n * 409 ServerKeyUriAlreadyExists - The server key URI already exists on the server.\n\n * 409 ServerKeyDoesNotExists - The server key does not exist.\n\n * 409 AzureKeyVaultKeyNameNotFound - The operation could not be completed because the Azure Key Vault Key name does not exist.\n\n * 409 AzureKeyVaultKeyInUse - The key is currently being used by the server.\n\n * 409 NeedsLogBackup - Please wait several minutes for a log backup to occur. \n\n * 409 EncryptionInProgress - Cannot modify encryption while an encryption scan in progress.\n\n * 409 KeyChangeInProgress - Cannot change database encryption key while an encryption, decryption, or key change scan is in progress.\n\n * 409 NoBulkOperationLock - CREATE/ALTER/DROP DATABASE ENCRYPTION KEY failed because a lock could not be placed on database. Try again later.\n\n * 409 AltStateConflict - The operation cannot be performed on database because it is involved in a database mirroring session or an availability group. Some operations are not allowed on a database that is participating in a database mirroring session or in an availability group.\n\n * 503 AzureKeyVaultConnectionFailed - The operation could not be completed on the server because attempts to connect to Azure Key Vault have failed\n\n * 503 AzureKeyVaultGenericConnectionError - The operation could not be completed because an error was encountered when attempting to retrieve Key Vault information .\n\n * 503 NoDekLock - CREATE/ALTER/DROP DATABASE ENCRYPTION KEY failed because a lock could not be placed on the database. Try again later."
201+
}
202+
},
203+
"x-ms-pageable": {
204+
"nextLinkName": "nextLink"
205+
},
206+
"x-ms-examples": {
207+
"Get a list of the database's transparent data encryptions": {
208+
"$ref": "./examples/ManagedTransparentDataEncryptionList.json"
209+
}
210+
}
211+
}
159212
}
160213
},
161214
"definitions": {
@@ -195,6 +248,25 @@
195248
"x-ms-client-flatten": true
196249
}
197250
}
251+
},
252+
"ManagedTransparentDataEncryptionListResult": {
253+
"description": "A list of managed transparent data encryptions",
254+
"type": "object",
255+
"properties": {
256+
"value": {
257+
"description": "Array of results.",
258+
"type": "array",
259+
"items": {
260+
"$ref": "#/definitions/ManagedTransparentDataEncryption"
261+
},
262+
"readOnly": true
263+
},
264+
"nextLink": {
265+
"description": "Link to retrieve next page of results.",
266+
"type": "string",
267+
"readOnly": true
268+
}
269+
}
198270
}
199271
},
200272
"parameters": {},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
}
6060
},
6161
"default": {
62-
"description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
62+
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
6363
}
6464
},
6565
"x-ms-examples": {
@@ -119,7 +119,7 @@
119119
}
120120
},
121121
"default": {
122-
"description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
122+
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
123123
},
124124
"202": {
125125
"description": "Accepted"

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,32 @@
166166
},
167167
"RestorableDroppedDatabase": {
168168
"description": "A restorable dropped database resource.",
169-
"required": [
170-
"location"
171-
],
172169
"type": "object",
173170
"allOf": [
174171
{
175-
"$ref": "../../../common/v1/types.json#/definitions/TrackedResource"
172+
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
176173
}
177174
],
178175
"properties": {
179176
"sku": {
180177
"$ref": "../../../common/v1/types.json#/definitions/Sku",
181178
"description": "The name and tier of the SKU."
182179
},
180+
"location": {
181+
"description": "Resource location.",
182+
"type": "string",
183+
"x-ms-mutability": [
184+
"read",
185+
"create"
186+
]
187+
},
188+
"tags": {
189+
"description": "Resource tags.",
190+
"type": "object",
191+
"additionalProperties": {
192+
"type": "string"
193+
}
194+
},
183195
"properties": {
184196
"$ref": "#/definitions/RestorableDroppedDatabaseProperties",
185197
"description": "Resource properties.",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
}
6060
},
6161
"default": {
62-
"description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found."
62+
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found."
6363
}
6464
},
6565
"x-ms-examples": {
@@ -119,7 +119,7 @@
119119
}
120120
},
121121
"default": {
122-
"description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation."
122+
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation."
123123
},
124124
"202": {
125125
"description": "Accepted"

0 commit comments

Comments
 (0)