Skip to content

Commit 5c1df54

Browse files
authored
Merge pull request #2742 from Azure/autogenerate
Merge Autogenerate
2 parents 44d7f44 + 8bd08c4 commit 5c1df54

File tree

13 files changed

+18852
-156
lines changed

13 files changed

+18852
-156
lines changed

generator/resources.json

Lines changed: 134 additions & 63 deletions
Large diffs are not rendered by default.

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

Lines changed: 78 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27270,6 +27270,35 @@
2727027270
],
2727127271
"description": "A copy activity snowflake source."
2727227272
},
27273+
"SparkConfigurationParametrizationReference": {
27274+
"type": "object",
27275+
"properties": {
27276+
"referenceName": {
27277+
"type": "object",
27278+
"properties": {},
27279+
"description": "Reference spark configuration name. Type: string (or Expression with resultType string)."
27280+
},
27281+
"type": {
27282+
"oneOf": [
27283+
{
27284+
"type": "string",
27285+
"enum": [
27286+
"SparkConfigurationReference"
27287+
]
27288+
},
27289+
{
27290+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
27291+
}
27292+
],
27293+
"description": "Spark configuration reference type."
27294+
}
27295+
},
27296+
"required": [
27297+
"referenceName",
27298+
"type"
27299+
],
27300+
"description": "Spark configuration reference."
27301+
},
2727327302
"SparkDatasetTypeProperties": {
2727427303
"type": "object",
2727527304
"properties": {
@@ -29246,6 +29275,22 @@
2924629275
"properties": {},
2924729276
"description": "Spark configuration properties, which will override the 'conf' of the spark job definition you provide."
2924829277
},
29278+
"configurationType": {
29279+
"oneOf": [
29280+
{
29281+
"type": "string",
29282+
"enum": [
29283+
"Default",
29284+
"Customized",
29285+
"Artifact"
29286+
]
29287+
},
29288+
{
29289+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
29290+
}
29291+
],
29292+
"description": "The type of the spark config."
29293+
},
2924929294
"driverSize": {
2925029295
"type": "object",
2925129296
"properties": {},
@@ -29292,30 +29337,45 @@
2929229337
"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."
2929329338
},
2929429339
"numExecutors": {
29340+
"type": "object",
29341+
"properties": {},
29342+
"description": "Number of executors to launch for this job, which will override the 'numExecutors' of the spark job definition you provide. Type: integer (or Expression with resultType integer)."
29343+
},
29344+
"pythonCodeReference": {
2929529345
"oneOf": [
2929629346
{
29297-
"type": "integer"
29347+
"type": "array",
29348+
"items": {
29349+
"type": "object",
29350+
"properties": {}
29351+
}
2929829352
},
2929929353
{
2930029354
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2930129355
}
2930229356
],
29303-
"description": "Number of executors to launch for this job, which will override the 'numExecutors' of the spark job definition you provide."
29357+
"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."
2930429358
},
29305-
"pythonCodeReference": {
29359+
"scanFolder": {
29360+
"type": "object",
29361+
"properties": {},
29362+
"description": "Scanning subfolders from the root folder of the main definition file, these files will be added as reference files. The folders named 'jars', 'pyFiles', 'files' or 'archives' will be scanned, and the folders name are case sensitive. Type: boolean (or Expression with resultType boolean)."
29363+
},
29364+
"sparkConfig": {
2930629365
"oneOf": [
2930729366
{
29308-
"type": "array",
29309-
"items": {
29367+
"type": "object",
29368+
"additionalProperties": {
2931029369
"type": "object",
2931129370
"properties": {}
29312-
}
29371+
},
29372+
"properties": {}
2931329373
},
2931429374
{
2931529375
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2931629376
}
2931729377
],
29318-
"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."
29378+
"description": "Spark configuration property."
2931929379
},
2932029380
"sparkJob": {
2932129381
"oneOf": [
@@ -29338,6 +29398,17 @@
2933829398
}
2933929399
],
2934029400
"description": "Big data pool reference type."
29401+
},
29402+
"targetSparkConfiguration": {
29403+
"oneOf": [
29404+
{
29405+
"$ref": "#/definitions/SparkConfigurationParametrizationReference"
29406+
},
29407+
{
29408+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
29409+
}
29410+
],
29411+
"description": "Spark configuration reference."
2934129412
}
2934229413
},
2934329414
"required": [

0 commit comments

Comments
 (0)