Skip to content

Commit 793e9f9

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #2658 from Azure/autogenerate
Autogenerate
2 parents cc7e305 + 1bd0287 commit 793e9f9

File tree

10 files changed

+28785
-156
lines changed

10 files changed

+28785
-156
lines changed

‎generator/resources.json

Lines changed: 287 additions & 134 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
@@ -1058,6 +1058,9 @@
10581058
{
10591059
"$ref": "https://schema.management.azure.com/schemas/2022-05-01/Microsoft.Network.NRP.json#/subscription_resourceDefinitions/networkManagerConnections"
10601060
},
1061+
{
1062+
"$ref": "https://schema.management.azure.com/schemas/2022-07-01/Microsoft.Network.NRP.json#/subscription_resourceDefinitions/networkManagerConnections"
1063+
},
10611064
{
10621065
"$ref": "https://schema.management.azure.com/schemas/2019-08-01-preview/Microsoft.Peering.json#/subscription_resourceDefinitions/peerAsns"
10631066
},

‎schemas/2018-06-01/Microsoft.DataFactory.json

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
{
7979
"$ref": "#/definitions/factories_managedVirtualNetworks_childResource"
8080
},
81+
{
82+
"$ref": "#/definitions/factories_credentials_childResource"
83+
},
8184
{
8285
"$ref": "#/definitions/factories_privateEndpointConnections_childResource"
8386
},
@@ -117,6 +120,55 @@
117120
],
118121
"description": "Microsoft.DataFactory/factories"
119122
},
123+
"factories_credentials": {
124+
"type": "object",
125+
"properties": {
126+
"apiVersion": {
127+
"type": "string",
128+
"enum": [
129+
"2018-06-01"
130+
]
131+
},
132+
"name": {
133+
"oneOf": [
134+
{
135+
"type": "string",
136+
"pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
137+
"minLength": 1,
138+
"maxLength": 127
139+
},
140+
{
141+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
142+
}
143+
],
144+
"description": "Credential name"
145+
},
146+
"properties": {
147+
"oneOf": [
148+
{
149+
"$ref": "#/definitions/ManagedIdentityCredential"
150+
},
151+
{
152+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
153+
}
154+
],
155+
"description": "Managed identity credential."
156+
},
157+
"type": {
158+
"type": "string",
159+
"enum": [
160+
"Microsoft.DataFactory/factories/credentials"
161+
]
162+
}
163+
},
164+
"required": [
165+
"apiVersion",
166+
"name",
167+
"properties",
168+
"type"
169+
],
170+
"description": "Microsoft.DataFactory/factories/credentials"
171+
},
120172
"factories_dataflows": {
121173
"type": "object",
122174
"properties": {
@@ -12375,6 +12427,55 @@
1237512427
],
1237612428
"description": "Azure Data Factory expression definition."
1237712429
},
12430+
"factories_credentials_childResource": {
12431+
"type": "object",
12432+
"properties": {
12433+
"apiVersion": {
12434+
"type": "string",
12435+
"enum": [
12436+
"2018-06-01"
12437+
]
12438+
},
12439+
"name": {
12440+
"oneOf": [
12441+
{
12442+
"type": "string",
12443+
"pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
12444+
"minLength": 1,
12445+
"maxLength": 127
12446+
},
12447+
{
12448+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
12449+
}
12450+
],
12451+
"description": "Credential name"
12452+
},
12453+
"properties": {
12454+
"oneOf": [
12455+
{
12456+
"$ref": "#/definitions/ManagedIdentityCredential"
12457+
},
12458+
{
12459+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
12460+
}
12461+
],
12462+
"description": "Managed identity credential."
12463+
},
12464+
"type": {
12465+
"type": "string",
12466+
"enum": [
12467+
"credentials"
12468+
]
12469+
}
12470+
},
12471+
"required": [
12472+
"apiVersion",
12473+
"name",
12474+
"properties",
12475+
"type"
12476+
],
12477+
"description": "Microsoft.DataFactory/factories/credentials"
12478+
},
1237812479
"factories_dataflows_childResource": {
1237912480
"type": "object",
1238012481
"properties": {
@@ -18827,6 +18928,68 @@
1882718928
],
1882818929
"description": "A copy activity Magento server source."
1882918930
},
18931+
"ManagedIdentityCredential": {
18932+
"type": "object",
18933+
"properties": {
18934+
"additionalProperties": {
18935+
"oneOf": [
18936+
{
18937+
"type": "object",
18938+
"additionalProperties": {
18939+
"type": "object",
18940+
"properties": {}
18941+
},
18942+
"properties": {}
18943+
},
18944+
{
18945+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
18946+
}
18947+
],
18948+
"description": "Unmatched properties from the message are deserialized this collection"
18949+
},
18950+
"annotations": {
18951+
"oneOf": [
18952+
{
18953+
"type": "array",
18954+
"items": {
18955+
"type": "object",
18956+
"properties": {}
18957+
}
18958+
},
18959+
{
18960+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
18961+
}
18962+
],
18963+
"description": "List of tags that can be used for describing the Credential."
18964+
},
18965+
"description": {
18966+
"type": "string",
18967+
"description": "Credential description."
18968+
},
18969+
"typeProperties": {
18970+
"oneOf": [
18971+
{
18972+
"$ref": "#/definitions/ManagedIdentityTypeProperties"
18973+
},
18974+
{
18975+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
18976+
}
18977+
],
18978+
"description": "Managed identity type properties."
18979+
}
18980+
},
18981+
"description": "Managed identity credential."
18982+
},
18983+
"ManagedIdentityTypeProperties": {
18984+
"type": "object",
18985+
"properties": {
18986+
"resourceId": {
18987+
"type": "string",
18988+
"description": "The resource id of user assigned managed identity"
18989+
}
18990+
},
18991+
"description": "Managed identity type properties."
18992+
},
1883018993
"ManagedIntegrationRuntime": {
1883118994
"type": "object",
1883218995
"properties": {

‎schemas/2019-08-01/managementGroupDeploymentTemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,9 @@
782782
{
783783
"$ref": "https://schema.management.azure.com/schemas/2022-05-01/Microsoft.Network.NRP.json#/managementGroup_resourceDefinitions/networkManagerConnections"
784784
},
785+
{
786+
"$ref": "https://schema.management.azure.com/schemas/2022-07-01/Microsoft.Network.NRP.json#/managementGroup_resourceDefinitions/networkManagerConnections"
787+
},
785788
{
786789
"$ref": "https://schema.management.azure.com/schemas/2018-07-01-preview/Microsoft.PolicyInsights.json#/unknown_resourceDefinitions/remediations"
787790
},

‎schemas/2022-05-01/Microsoft.DataProtection.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -675,17 +675,6 @@
675675
"BackupVault": {
676676
"type": "object",
677677
"properties": {
678-
"isVaultProtectedByResourceGuard": {
679-
"oneOf": [
680-
{
681-
"type": "boolean"
682-
},
683-
{
684-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
685-
}
686-
],
687-
"description": "Is vault protected by resource guard"
688-
},
689678
"monitoringSettings": {
690679
"oneOf": [
691680
{

0 commit comments

Comments
 (0)