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

Fix ARM Errors and update the swagger files. #12293

Merged
merged 10 commits into from
Jan 14, 2021
Merged

Fix ARM Errors and update the swagger files. #12293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d44421c
Fix ARM Errors and update the swagger files.
ericshape Jan 5, 2021
efea9b1
update
ericshape Jan 6, 2021
28e8816
update import export spec file.
ericshape Jan 12, 2021
07bb86c
Merge branch 'master' into fix_arm_errors
ericshape Jan 12, 2021
cc24856
remove import/export from v2 and v1
ericshape Jan 12, 2021
4fcb4d6
update import export spec file.
ericshape Jan 12, 2021
a8306e2
Merge branch 'fix_arm_errors' of https://github.com/ericshape/azure-r…
ericshape Jan 12, 2021
8d55f36
separate db import export from this PR.
ericshape Jan 12, 2021
3987121
Merge branch 'master' of https://github.com/ericshape/azure-rest-api-…
ericshape Jan 12, 2021
f113b7a
revert importdatabases
ericshape Jan 13, 2021
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
12 changes: 8 additions & 4 deletions ...ification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/BlobAuditing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -661,6 +661,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -749,7 +750,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -767,6 +768,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -851,7 +853,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -869,6 +871,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -949,7 +952,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -967,6 +970,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down
153 changes: 0 additions & 153 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/Databases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,61 +657,6 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/import": {
"post": {
"tags": [
"Databases"
],
"description": "Imports a bacpac into a new database.",
"operationId": "Databases_ImportDatabase",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"name": "parameters",
"in": "body",
"description": "The database import request parameters.",
"required": true,
"schema": {
"$ref": "#/definitions/ImportNewDatabaseDefinition"
}
},
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully imported the database.",
"schema": {
"$ref": "#/definitions/ImportExportOperationResult"
}
},
"default": {
"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."
},
"202": {
"description": "Importing the database is in progress."
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Imports to a new database.": {
"$ref": "./examples/ImportNewDatabase.json"
},
"Imports to a new database, using private link for the SQL server and storage account.": {
"$ref": "./examples/ImportNewDatabaseWithNetworkIsolation.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/export": {
"post": {
"tags": [
Expand Down Expand Up @@ -1370,104 +1315,6 @@
}
}
},
"ImportNewDatabaseDefinition": {
"description": "Contains the information necessary to perform import operation for new database.",
"required": [
"storageKeyType",
"storageKey",
"storageUri",
"administratorLogin",
"administratorLoginPassword"
],
"type": "object",
"properties": {
"databaseName": {
"description": "Name of the import database.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"edition": {
"description": "Edition of the import database.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"serviceObjectiveName": {
"description": "Service level objective name of the import database.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"maxSizeBytes": {
"description": "Max size in bytes for the import database.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"storageKeyType": {
"description": "Storage key type.",
"enum": [
"SharedAccessKey",
"StorageAccessKey"
],
"type": "string",
"x-ms-enum": {
"name": "StorageKeyType",
"modelAsString": true
},
"x-ms-mutability": [
"create"
]
},
"storageKey": {
"description": "Storage key.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"storageUri": {
"description": "Storage Uri.",
"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.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"networkIsolation": {
"$ref": "#/definitions/NetworkIsolationSettings",
"description": "Optional resource information to enable network isolation for request.",
"x-ms-mutability": [
"create"
]
}
}
},
"ExportDatabaseDefinition": {
"description": "Contains the information necessary to perform export database operation.",
"required": [
Expand Down
8 changes: 4 additions & 4 deletions ...l/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/LongTermRetentionBackups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\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."
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMismatchingSubscriptionId - The provided subscription id did not match the id in the other input\n\n * 400 LongTermRetentionMismatchingResourceGroupName - The provided resource group name did not match the name in the other input\n\n * 400 LongTermRetentionMismatchingServerName - The provided server name did not match the name in the other input\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."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -123,7 +123,7 @@
"description": "Successfully deleted the backup."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\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."
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMismatchingSubscriptionId - The provided subscription id did not match the id in the other input\n\n * 400 LongTermRetentionMismatchingResourceGroupName - The provided resource group name did not match the name in the other input\n\n * 400 LongTermRetentionMismatchingServerName - The provided server name did not match the name in the other input\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."
},
"202": {
"description": "Accepted"
Expand Down Expand Up @@ -410,7 +410,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\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."
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMismatchingSubscriptionId - The provided subscription id did not match the id in the other input\n\n * 400 LongTermRetentionMismatchingResourceGroupName - The provided resource group name did not match the name in the other input\n\n * 400 LongTermRetentionMismatchingServerName - The provided server name did not match the name in the other input\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."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -469,7 +469,7 @@
"description": "Successfully deleted the backup."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\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 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription."
"description": "*** Error Responses: ***\n\n * 400 InvalidLongTermRetentionBackupId - Invalid long term retention backup identifier for SQL DBs.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMismatchingSubscriptionId - The provided subscription id did not match the id in the other input\n\n * 400 LongTermRetentionMismatchingResourceGroupName - The provided resource group name did not match the name in the other input\n\n * 400 LongTermRetentionMismatchingServerName - The provided server name did not match the name in the other input\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 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription."
},
"202": {
"description": "Accepted"
Expand Down
2 changes: 1 addition & 1 deletion ...sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/ManagedDatabaseQueries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"ManagedDatabaseQueries"
],
"description": "Get query by query id.",
"operationId": "ManagedDatabaseQueries_ListByQueryId_Get",
"operationId": "ManagedDatabaseQueries_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
Expand Down
Loading