Skip to content

Commit fb30570

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #2254 from Azure/autogenerate
Merge Autogenerate
2 parents 72cdd2d + 4c9cb72 commit fb30570

File tree

14 files changed

+17580
-65
lines changed

14 files changed

+17580
-65
lines changed

‎generator/resources.json

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

‎schemas/2018-05-01/subscriptionDeploymentTemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,9 @@
12891289
{
12901290
"$ref": "https://schema.management.azure.com/schemas/2021-07-01/Microsoft.Security.json#/subscription_resourceDefinitions/settings"
12911291
},
1292+
{
1293+
"$ref": "https://schema.management.azure.com/schemas/2022-03-01/Microsoft.Security.json#/subscription_resourceDefinitions/pricings"
1294+
},
12921295
{
12931296
"$ref": "https://schema.management.azure.com/schemas/2019-05-01-preview/Microsoft.Support.json#/subscription_resourceDefinitions/supportTickets"
12941297
},

‎schemas/2019-06-01-preview/Microsoft.Sql.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,10 @@
676676
"type": "string",
677677
"description": "The resource identifier of the source database associated with create operation of this database."
678678
},
679+
"sourceResourceId": {
680+
"type": "string",
681+
"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 "
682+
},
679683
"storageAccountType": {
680684
"oneOf": [
681685
{

‎schemas/2021-05-01-preview/Microsoft.Sql.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3686,7 +3686,7 @@
36863686
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
36873687
}
36883688
],
3689-
"description": "The number of secondary replicas associated with the database that are used to provide high availability."
3689+
"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."
36903690
},
36913691
"isLedgerOn": {
36923692
"oneOf": [
@@ -3769,7 +3769,7 @@
37693769
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
37703770
}
37713771
],
3772-
"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."
3772+
"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."
37733773
},
37743774
"recoverableDatabaseId": {
37753775
"type": "string",
@@ -3845,6 +3845,10 @@
38453845
"type": "string",
38463846
"description": "The resource identifier of the source database associated with create operation of this database."
38473847
},
3848+
"sourceResourceId": {
3849+
"type": "string",
3850+
"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 "
3851+
},
38483852
"zoneRedundant": {
38493853
"oneOf": [
38503854
{

‎schemas/2021-06-01-preview/Microsoft.Synapse.json

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@
142142
{
143143
"$ref": "#/definitions/workspaces_encryptionProtector_childResource"
144144
},
145+
{
146+
"$ref": "#/definitions/workspaces_dedicatedSQLminimalTlsSettings_childResource"
147+
},
145148
{
146149
"$ref": "#/definitions/workspaces_administrators_childResource"
147150
},
@@ -387,6 +390,53 @@
387390
],
388391
"description": "Microsoft.Synapse/workspaces/bigDataPools"
389392
},
393+
"workspaces_dedicatedSQLminimalTlsSettings": {
394+
"type": "object",
395+
"properties": {
396+
"apiVersion": {
397+
"type": "string",
398+
"enum": [
399+
"2021-06-01-preview"
400+
]
401+
},
402+
"name": {
403+
"oneOf": [
404+
{
405+
"type": "string",
406+
"pattern": "^.*/default$"
407+
},
408+
{
409+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
410+
}
411+
],
412+
"description": "The name of the dedicated sql minimal tls settings."
413+
},
414+
"properties": {
415+
"oneOf": [
416+
{
417+
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
418+
},
419+
{
420+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
421+
}
422+
],
423+
"description": "Properties of a dedicated sql minimal tls settings."
424+
},
425+
"type": {
426+
"type": "string",
427+
"enum": [
428+
"Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
429+
]
430+
}
431+
},
432+
"required": [
433+
"apiVersion",
434+
"name",
435+
"properties",
436+
"type"
437+
],
438+
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
439+
},
390440
"workspaces_encryptionProtector": {
391441
"type": "object",
392442
"properties": {
@@ -2729,6 +2779,16 @@
27292779
],
27302780
"description": "The properties of a Sql pool data masking rule."
27312781
},
2782+
"DedicatedSQLminimalTlsSettingsProperties": {
2783+
"type": "object",
2784+
"properties": {
2785+
"minimalTlsVersion": {
2786+
"type": "string",
2787+
"description": "The minimal tls version of the sql server."
2788+
}
2789+
},
2790+
"description": "Properties of a dedicated sql minimal tls settings."
2791+
},
27322792
"DynamicExecutorAllocation": {
27332793
"type": "object",
27342794
"properties": {
@@ -6101,6 +6161,48 @@
61016161
],
61026162
"description": "Microsoft.Synapse/workspaces/bigDataPools"
61036163
},
6164+
"workspaces_dedicatedSQLminimalTlsSettings_childResource": {
6165+
"type": "object",
6166+
"properties": {
6167+
"apiVersion": {
6168+
"type": "string",
6169+
"enum": [
6170+
"2021-06-01-preview"
6171+
]
6172+
},
6173+
"name": {
6174+
"type": "string",
6175+
"enum": [
6176+
"default"
6177+
],
6178+
"description": "The name of the dedicated sql minimal tls settings."
6179+
},
6180+
"properties": {
6181+
"oneOf": [
6182+
{
6183+
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
6184+
},
6185+
{
6186+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6187+
}
6188+
],
6189+
"description": "Properties of a dedicated sql minimal tls settings."
6190+
},
6191+
"type": {
6192+
"type": "string",
6193+
"enum": [
6194+
"dedicatedSQLminimalTlsSettings"
6195+
]
6196+
}
6197+
},
6198+
"required": [
6199+
"apiVersion",
6200+
"name",
6201+
"properties",
6202+
"type"
6203+
],
6204+
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
6205+
},
61046206
"workspaces_encryptionProtector_childResource": {
61056207
"type": "object",
61066208
"properties": {

‎schemas/2021-06-01/Microsoft.Synapse.json

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@
136136
{
137137
"$ref": "#/definitions/workspaces_encryptionProtector_childResource"
138138
},
139+
{
140+
"$ref": "#/definitions/workspaces_dedicatedSQLminimalTlsSettings_childResource"
141+
},
139142
{
140143
"$ref": "#/definitions/workspaces_administrators_childResource"
141144
},
@@ -384,6 +387,53 @@
384387
],
385388
"description": "Microsoft.Synapse/workspaces/bigDataPools"
386389
},
390+
"workspaces_dedicatedSQLminimalTlsSettings": {
391+
"type": "object",
392+
"properties": {
393+
"apiVersion": {
394+
"type": "string",
395+
"enum": [
396+
"2021-06-01"
397+
]
398+
},
399+
"name": {
400+
"oneOf": [
401+
{
402+
"type": "string",
403+
"pattern": "^.*/default$"
404+
},
405+
{
406+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
407+
}
408+
],
409+
"description": "The name of the dedicated sql minimal tls settings."
410+
},
411+
"properties": {
412+
"oneOf": [
413+
{
414+
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
415+
},
416+
{
417+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
418+
}
419+
],
420+
"description": "Properties of a dedicated sql minimal tls settings."
421+
},
422+
"type": {
423+
"type": "string",
424+
"enum": [
425+
"Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
426+
]
427+
}
428+
},
429+
"required": [
430+
"apiVersion",
431+
"name",
432+
"properties",
433+
"type"
434+
],
435+
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
436+
},
387437
"workspaces_encryptionProtector": {
388438
"type": "object",
389439
"properties": {
@@ -2144,6 +2194,16 @@
21442194
],
21452195
"description": "The properties of a Sql pool data masking rule."
21462196
},
2197+
"DedicatedSQLminimalTlsSettingsProperties": {
2198+
"type": "object",
2199+
"properties": {
2200+
"minimalTlsVersion": {
2201+
"type": "string",
2202+
"description": "The minimal tls version of the sql server."
2203+
}
2204+
},
2205+
"description": "Properties of a dedicated sql minimal tls settings."
2206+
},
21472207
"DynamicExecutorAllocation": {
21482208
"type": "object",
21492209
"properties": {
@@ -4849,6 +4909,48 @@
48494909
],
48504910
"description": "Microsoft.Synapse/workspaces/bigDataPools"
48514911
},
4912+
"workspaces_dedicatedSQLminimalTlsSettings_childResource": {
4913+
"type": "object",
4914+
"properties": {
4915+
"apiVersion": {
4916+
"type": "string",
4917+
"enum": [
4918+
"2021-06-01"
4919+
]
4920+
},
4921+
"name": {
4922+
"type": "string",
4923+
"enum": [
4924+
"default"
4925+
],
4926+
"description": "The name of the dedicated sql minimal tls settings."
4927+
},
4928+
"properties": {
4929+
"oneOf": [
4930+
{
4931+
"$ref": "#/definitions/DedicatedSQLminimalTlsSettingsProperties"
4932+
},
4933+
{
4934+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4935+
}
4936+
],
4937+
"description": "Properties of a dedicated sql minimal tls settings."
4938+
},
4939+
"type": {
4940+
"type": "string",
4941+
"enum": [
4942+
"dedicatedSQLminimalTlsSettings"
4943+
]
4944+
}
4945+
},
4946+
"required": [
4947+
"apiVersion",
4948+
"name",
4949+
"properties",
4950+
"type"
4951+
],
4952+
"description": "Microsoft.Synapse/workspaces/dedicatedSQLminimalTlsSettings"
4953+
},
48524954
"workspaces_encryptionProtector_childResource": {
48534955
"type": "object",
48544956
"properties": {

‎schemas/2021-08-01-preview/Microsoft.Sql.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3887,6 +3887,10 @@
38873887
"type": "string",
38883888
"description": "The resource identifier of the source database associated with create operation of this database."
38893889
},
3890+
"sourceResourceId": {
3891+
"type": "string",
3892+
"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 "
3893+
},
38903894
"zoneRedundant": {
38913895
"oneOf": [
38923896
{

0 commit comments

Comments
 (0)