Skip to content

Commit e5fd7d4

Browse files
XynoclafeXynoclafe
authored
Merge pull request #2619 from Azure/autogenerate
Autogenerate
2 parents 916aa61 + 5f4b473 commit e5fd7d4

File tree

14 files changed

+4208
-94
lines changed

14 files changed

+4208
-94
lines changed

‎generator/resources.json

Lines changed: 179 additions & 85 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,12 @@
734734
{
735735
"$ref": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments"
736736
},
737+
{
738+
"$ref": "https://schema.management.azure.com/schemas/2022-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments"
739+
},
740+
{
741+
"$ref": "https://schema.management.azure.com/schemas/2022-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions"
742+
},
737743
{
738744
"$ref": "https://schema.management.azure.com/schemas/2022-08-01-preview/Microsoft.Authorization.Resources.json#/subscription_resourceDefinitions/variables"
739745
},

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

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6068,6 +6068,11 @@
60686068
"type": "object",
60696069
"properties": {},
60706070
"description": "https://<workspacename>.dev.azuresynapse.net, Azure Synapse Analytics workspace URL. Type: string (or Expression with resultType string)."
6071+
},
6072+
"workspaceResourceId": {
6073+
"type": "object",
6074+
"properties": {},
6075+
"description": "The resource ID of the Synapse workspace. The format should be: /subscriptions/{subscriptionID}/resourceGroups/{resourceGroup}/providers/Microsoft.Synapse/workspaces/{workspaceName}. Type: string (or Expression with resultType string)."
60716076
}
60726077
},
60736078
"required": [
@@ -13017,6 +13022,17 @@
1301713022
"type": "string",
1301813023
"description": "Collaboration branch."
1301913024
},
13025+
"disablePublish": {
13026+
"oneOf": [
13027+
{
13028+
"type": "boolean"
13029+
},
13030+
{
13031+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
13032+
}
13033+
],
13034+
"description": "Disable manual publish operation in ADF studio to favor automated publish."
13035+
},
1302013036
"lastCommitId": {
1302113037
"type": "string",
1302213038
"description": "Last commit id."
@@ -29089,7 +29105,22 @@
2908929105
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2909029106
}
2909129107
],
29092-
"description": "Additional files used for reference in the main definition file, which will override the 'files' of the spark job definition you provide."
29108+
"description": "(Deprecated. Please use pythonCodeReference and filesV2) Additional files used for reference in the main definition file, which will override the 'files' of the spark job definition you provide."
29109+
},
29110+
"filesV2": {
29111+
"oneOf": [
29112+
{
29113+
"type": "array",
29114+
"items": {
29115+
"type": "object",
29116+
"properties": {}
29117+
}
29118+
},
29119+
{
29120+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
29121+
}
29122+
],
29123+
"description": "Additional files used for reference in the main definition file, which will override the 'jars' and 'files' of the spark job definition you provide."
2909329124
},
2909429125
"numExecutors": {
2909529126
"oneOf": [
@@ -29102,6 +29133,21 @@
2910229133
],
2910329134
"description": "Number of executors to launch for this job, which will override the 'numExecutors' of the spark job definition you provide."
2910429135
},
29136+
"pythonCodeReference": {
29137+
"oneOf": [
29138+
{
29139+
"type": "array",
29140+
"items": {
29141+
"type": "object",
29142+
"properties": {}
29143+
}
29144+
},
29145+
{
29146+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
29147+
}
29148+
],
29149+
"description": "Additional python code files used for reference in the main definition file, which will override the 'pyFiles' of the spark job definition you provide."
29150+
},
2910529151
"sparkJob": {
2910629152
"oneOf": [
2910729153
{
@@ -29161,8 +29207,9 @@
2916129207
"type": "object",
2916229208
"properties": {
2916329209
"referenceName": {
29164-
"type": "string",
29165-
"description": "Reference spark job name."
29210+
"type": "object",
29211+
"properties": {},
29212+
"description": "Reference spark job name. Expression with resultType string."
2916629213
},
2916729214
"type": {
2916829215
"oneOf": [

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,12 @@
674674
{
675675
"$ref": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments"
676676
},
677+
{
678+
"$ref": "https://schema.management.azure.com/schemas/2022-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments"
679+
},
680+
{
681+
"$ref": "https://schema.management.azure.com/schemas/2022-07-01-preview/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyExemptions"
682+
},
677683
{
678684
"$ref": "https://schema.management.azure.com/schemas/2022-08-01-preview/Microsoft.Authorization.Resources.json#/managementGroup_resourceDefinitions/variables"
679685
},

‎schemas/2022-03-01/Microsoft.Compute.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,9 +4043,15 @@
40434043
"description": "The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all."
40444044
},
40454045
"protectedSettingsFromKeyVault": {
4046-
"type": "object",
4047-
"properties": {},
4048-
"description": "The extensions protected settings that are passed by reference, and consumed from key vault"
4046+
"oneOf": [
4047+
{
4048+
"$ref": "#/definitions/KeyVaultSecretReference"
4049+
},
4050+
{
4051+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4052+
}
4053+
],
4054+
"description": "Describes a reference to Key Vault Secret"
40494055
},
40504056
"publisher": {
40514057
"type": "string",
@@ -5188,9 +5194,15 @@
51885194
"description": "The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all."
51895195
},
51905196
"protectedSettingsFromKeyVault": {
5191-
"type": "object",
5192-
"properties": {},
5193-
"description": "The extensions protected settings that are passed by reference, and consumed from key vault"
5197+
"oneOf": [
5198+
{
5199+
"$ref": "#/definitions/KeyVaultSecretReference"
5200+
},
5201+
{
5202+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
5203+
}
5204+
],
5205+
"description": "Describes a reference to Key Vault Secret"
51945206
},
51955207
"provisionAfterExtensions": {
51965208
"oneOf": [

0 commit comments

Comments
 (0)