Skip to content

Commit

Permalink
Merge pull request #2254 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Merge Autogenerate
  • Loading branch information
jorgecotillo authored Mar 12, 2022
2 parents 72cdd2d + 4c9cb72 commit fb30570
Show file tree
Hide file tree
Showing 14 changed files with 17,580 additions and 65 deletions.
189 changes: 129 additions & 60 deletions generator/resources.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions schemas/2018-05-01/subscriptionDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2021-07-01/Microsoft.Security.json#/subscription_resourceDefinitions/settings"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-03-01/Microsoft.Security.json#/subscription_resourceDefinitions/pricings"
},
{
"$ref": "https://schema.management.azure.com/schemas/2019-05-01-preview/Microsoft.Support.json#/subscription_resourceDefinitions/supportTickets"
},
Expand Down
4 changes: 4 additions & 0 deletions schemas/2019-06-01-preview/Microsoft.Sql.json
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,10 @@
"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
8 changes: 6 additions & 2 deletions schemas/2021-05-01-preview/Microsoft.Sql.json
Original file line number Diff line number Diff line change
Expand Up @@ -3686,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."
"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."
},
"isLedgerOn": {
"oneOf": [
Expand Down Expand Up @@ -3769,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."
"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."
},
"recoverableDatabaseId": {
"type": "string",
Expand Down Expand Up @@ -3845,6 +3845,10 @@
"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
102 changes: 102 additions & 0 deletions schemas/2021-06-01-preview/Microsoft.Synapse.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@
{
"$ref": "#/definitions/workspaces_encryptionProtector_childResource"
},
{
"$ref": "#/definitions/workspaces_dedicatedSQLminimalTlsSettings_childResource"
},
{
"$ref": "#/definitions/workspaces_administrators_childResource"
},
Expand Down Expand Up @@ -387,6 +390,53 @@
],
"description": "Microsoft.Synapse/workspaces/bigDataPools"
},
"workspaces_dedicatedSQLminimalTlsSettings": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-06-01-preview"
]
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^.*/default$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The name of the dedicated sql minimal tls settings."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Properties of a dedicated sql minimal tls settings."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
},
"workspaces_encryptionProtector": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2729,6 +2779,16 @@
],
"description": "The properties of a Sql pool data masking rule."
},
"DedicatedSQLminimalTlsSettingsProperties": {
"type": "object",
"properties": {
"minimalTlsVersion": {
"type": "string",
"description": "The minimal tls version of the sql server."
}
},
"description": "Properties of a dedicated sql minimal tls settings."
},
"DynamicExecutorAllocation": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6101,6 +6161,48 @@
],
"description": "Microsoft.Synapse/workspaces/bigDataPools"
},
"workspaces_dedicatedSQLminimalTlsSettings_childResource": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-06-01-preview"
]
},
"name": {
"type": "string",
"enum": [
"default"
],
"description": "The name of the dedicated sql minimal tls settings."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Properties of a dedicated sql minimal tls settings."
},
"type": {
"type": "string",
"enum": [
"dedicatedSQLminimalTlsSettings"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
},
"workspaces_encryptionProtector_childResource": {
"type": "object",
"properties": {
Expand Down
102 changes: 102 additions & 0 deletions schemas/2021-06-01/Microsoft.Synapse.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@
{
"$ref": "#/definitions/workspaces_encryptionProtector_childResource"
},
{
"$ref": "#/definitions/workspaces_dedicatedSQLminimalTlsSettings_childResource"
},
{
"$ref": "#/definitions/workspaces_administrators_childResource"
},
Expand Down Expand Up @@ -384,6 +387,53 @@
],
"description": "Microsoft.Synapse/workspaces/bigDataPools"
},
"workspaces_dedicatedSQLminimalTlsSettings": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-06-01"
]
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^.*/default$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The name of the dedicated sql minimal tls settings."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Properties of a dedicated sql minimal tls settings."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
},
"workspaces_encryptionProtector": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2144,6 +2194,16 @@
],
"description": "The properties of a Sql pool data masking rule."
},
"DedicatedSQLminimalTlsSettingsProperties": {
"type": "object",
"properties": {
"minimalTlsVersion": {
"type": "string",
"description": "The minimal tls version of the sql server."
}
},
"description": "Properties of a dedicated sql minimal tls settings."
},
"DynamicExecutorAllocation": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -4849,6 +4909,48 @@
],
"description": "Microsoft.Synapse/workspaces/bigDataPools"
},
"workspaces_dedicatedSQLminimalTlsSettings_childResource": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-06-01"
]
},
"name": {
"type": "string",
"enum": [
"default"
],
"description": "The name of the dedicated sql minimal tls settings."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Properties of a dedicated sql minimal tls settings."
},
"type": {
"type": "string",
"enum": [
"dedicatedSQLminimalTlsSettings"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
},
"workspaces_encryptionProtector_childResource": {
"type": "object",
"properties": {
Expand Down
4 changes: 4 additions & 0 deletions schemas/2021-08-01-preview/Microsoft.Sql.json
Original file line number Diff line number Diff line change
Expand Up @@ -3887,6 +3887,10 @@
"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
Loading

0 comments on commit fb30570

Please sign in to comment.