Skip to content

[AutoPR sql] Add Standby Geo Support #6156

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[AutoPR sql] Add Standby Geo Support #6156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions schemas/2019-06-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,10 +676,6 @@
"type": "string",
"description": "The resource identifier of the source database associated with create operation of this database."
},
"sourceResourceId": {
"type": "string",
"description": "The resource identifier of the source associated with the create operation of this database.\r\n\r\nWhen sourceResourceId is specified, sourceDatabaseId, recoverableDatabaseId, restorableDroppedDatabaseId and sourceDatabaseDeletionDate must not be specified and CreateMode must be PointInTimeRestore, Restore or Recover.\r\n\r\nWhen createMode is PointInTimeRestore, sourceResourceId must be the resource ID of an existing database or existing sql pool, and restorePointInTime must be specified.\r\n\r\nWhen createMode is Restore, sourceResourceId must be the resource ID of restorable dropped database or restorable dropped sql pool.\r\n\r\nWhen createMode is Recover, sourceResourceId must be the resource ID of recoverable database or recoverable sql pool.\r\n\r\nThis property allows to restore across subscriptions which is only supported for DataWarehouse edition.\r\n\r\nWhen source subscription belongs to a different tenant than target subscription, “x-ms-authorization-auxiliary” header must contain authentication token for the source tenant. For more details about “x-ms-authorization-auxiliary” header see https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant "
},
"storageAccountType": {
"oneOf": [
{
Expand Down
6 changes: 3 additions & 3 deletions schemas/2020-11-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,9 @@
{
"$ref": "#/definitions/servers_auditingSettings_childResource"
},
{
"$ref": "#/definitions/servers_elasticPools_childResource"
},
{
"$ref": "#/definitions/servers_encryptionProtector_childResource"
},
Expand Down Expand Up @@ -1170,9 +1173,6 @@
},
{
"$ref": "#/definitions/servers_databases_childResource"
},
{
"$ref": "#/definitions/servers_elasticPools_childResource"
}
]
}
Expand Down
51 changes: 42 additions & 9 deletions schemas/2021-05-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@
{
"$ref": "#/definitions/managedInstances_distributedAvailabilityGroups_childResource"
},
{
"$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource"
},
{
"$ref": "#/definitions/managedInstances_databases_childResource"
},
Expand All @@ -225,6 +222,9 @@
{
"$ref": "#/definitions/managedInstances_securityAlertPolicies_childResource"
},
{
"$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource"
},
{
"$ref": "#/definitions/managedInstances_sqlAgent_childResource"
}
Expand Down Expand Up @@ -3557,6 +3557,21 @@
"DatabaseIdentity": {
"type": "object",
"properties": {
"delegatedResources": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Delegation"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Resources delegated to the database - Internal Use Only"
},
"type": {
"oneOf": [
{
Expand Down Expand Up @@ -3671,7 +3686,7 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The number of secondary replicas associated with the database that are used to provide high availability. Not applicable to a Hyperscale database within an elastic pool."
"description": "The number of secondary replicas associated with the database that are used to provide high availability."
},
"isLedgerOn": {
"oneOf": [
Expand Down Expand Up @@ -3729,6 +3744,18 @@
],
"description": "Minimal capacity that database will always have allocated, if not paused"
},
"primaryDelegatedIdentityClientId": {
"oneOf": [
{
"type": "string",
"pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only"
},
"readScale": {
"oneOf": [
{
Expand All @@ -3742,7 +3769,7 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region. Not applicable to a Hyperscale database within an elastic pool."
"description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region."
},
"recoverableDatabaseId": {
"type": "string",
Expand Down Expand Up @@ -3818,10 +3845,6 @@
"type": "string",
"description": "The resource identifier of the source database associated with create operation of this database."
},
"sourceResourceId": {
"type": "string",
"description": "The resource identifier of the source associated with the create operation of this database.\r\n\r\nWhen sourceResourceId is specified, sourceDatabaseId, recoverableDatabaseId, restorableDroppedDatabaseId and sourceDatabaseDeletionDate must not be specified and CreateMode must be PointInTimeRestore, Restore or Recover.\r\n\r\nWhen createMode is PointInTimeRestore, sourceResourceId must be the resource ID of an existing database or existing sql pool, and restorePointInTime must be specified.\r\n\r\nWhen createMode is Restore, sourceResourceId must be the resource ID of restorable dropped database or restorable dropped sql pool.\r\n\r\nWhen createMode is Recover, sourceResourceId must be the resource ID of recoverable database or recoverable sql pool.\r\n\r\nThis property allows to restore across subscriptions which is only supported for DataWarehouse edition.\r\n\r\nWhen source subscription belongs to a different tenant than target subscription, “x-ms-authorization-auxiliary” header must contain authentication token for the source tenant. For more details about “x-ms-authorization-auxiliary” header see https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant "
},
"zoneRedundant": {
"oneOf": [
{
Expand Down Expand Up @@ -3916,6 +3939,16 @@
],
"description": "Properties of a database Vulnerability Assessment rule baseline."
},
"Delegation": {
"type": "object",
"properties": {
"resourceId": {
"type": "string",
"description": "The resource id of the source resource - Internal Use Only"
}
},
"description": "Delegated Resource Properties - Internal Use Only"
},
"DistributedAvailabilityGroupProperties": {
"type": "object",
"properties": {
Expand Down
14 changes: 5 additions & 9 deletions schemas/2021-08-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,9 +1204,6 @@
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/definitions/servers_elasticPools_childResource"
},
{
"$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
},
Expand All @@ -1216,6 +1213,9 @@
{
"$ref": "#/definitions/servers_databases_childResource"
},
{
"$ref": "#/definitions/servers_elasticPools_childResource"
},
{
"$ref": "#/definitions/servers_encryptionProtector_childResource"
},
Expand Down Expand Up @@ -3728,7 +3728,7 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The number of secondary replicas associated with the database that are used to provide high availability. Not applicable to a Hyperscale database within an elastic pool."
"description": "The number of secondary replicas associated with the database that are used to provide high availability."
},
"isLedgerOn": {
"oneOf": [
Expand Down Expand Up @@ -3811,7 +3811,7 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region. Not applicable to a Hyperscale database within an elastic pool."
"description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region."
},
"recoverableDatabaseId": {
"type": "string",
Expand Down Expand Up @@ -3887,10 +3887,6 @@
"type": "string",
"description": "The resource identifier of the source database associated with create operation of this database."
},
"sourceResourceId": {
"type": "string",
"description": "The resource identifier of the source associated with the create operation of this database.\r\n\r\nWhen sourceResourceId is specified, sourceDatabaseId, recoverableDatabaseId, restorableDroppedDatabaseId and sourceDatabaseDeletionDate must not be specified and CreateMode must be PointInTimeRestore, Restore or Recover.\r\n\r\nWhen createMode is PointInTimeRestore, sourceResourceId must be the resource ID of an existing database or existing sql pool, and restorePointInTime must be specified.\r\n\r\nWhen createMode is Restore, sourceResourceId must be the resource ID of restorable dropped database or restorable dropped sql pool.\r\n\r\nWhen createMode is Recover, sourceResourceId must be the resource ID of recoverable database or recoverable sql pool.\r\n\r\nThis property allows to restore across subscriptions which is only supported for DataWarehouse edition.\r\n\r\nWhen source subscription belongs to a different tenant than target subscription, “x-ms-authorization-auxiliary” header must contain authentication token for the source tenant. For more details about “x-ms-authorization-auxiliary” header see https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant "
},
"zoneRedundant": {
"oneOf": [
{
Expand Down
42 changes: 3 additions & 39 deletions schemas/2021-11-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3784,21 +3784,6 @@
"DatabaseIdentity": {
"type": "object",
"properties": {
"delegatedResources": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Delegation"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Resources delegated to the database - Internal Use Only"
},
"type": {
"oneOf": [
{
Expand Down Expand Up @@ -3971,18 +3956,6 @@
],
"description": "Minimal capacity that database will always have allocated, if not paused"
},
"primaryDelegatedIdentityClientId": {
"oneOf": [
{
"type": "string",
"pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only"
},
"readScale": {
"oneOf": [
{
Expand Down Expand Up @@ -4054,14 +4027,15 @@
"type": "string",
"enum": [
"Geo",
"Named"
"Named",
"StandbyGeo"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The secondary type of the database if it is a secondary. Valid values are Geo and Named."
"description": "The secondary type of the database if it is a secondary. Valid values are Geo, Named and StandbyGeo."
},
"sourceDatabaseDeletionDate": {
"type": "string",
Expand Down Expand Up @@ -4170,16 +4144,6 @@
],
"description": "Properties of a database Vulnerability Assessment rule baseline."
},
"Delegation": {
"type": "object",
"properties": {
"resourceId": {
"type": "string",
"description": "The resource id of the source resource - Internal Use Only"
}
},
"description": "Delegated Resource Properties - Internal Use Only"
},
"DistributedAvailabilityGroupProperties": {
"type": "object",
"properties": {
Expand Down