Skip to content

Commit e260efc

Browse files
Datafactory duplicate schema issue (#16585)
* require DataFlow * ManagedPrivateEndpoint,ManagedVirtualNetwork * fix * xx * ManagedPrivateEndpoint delete discriminator * Duplicate Schema named 'BlobEventTypes' * prettier * keep the enum type unchanged Co-authored-by: ArcturusZhang <[email protected]>
1 parent 5a1b726 commit e260efc

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"description": "Azure Data Factory nested object which contains a flow with data movements and transformations.",
2222
"type": "object",
2323
"discriminator": "type",
24+
"required": [
25+
"type"
26+
],
2427
"properties": {
2528
"type": {
2629
"type": "string",

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"ManagedPrivateEndpoint": {
2121
"description": "Properties of a managed private endpoint",
2222
"type": "object",
23-
"discriminator": "type",
2423
"properties": {
2524
"connectionState": {
2625
"description": "The managed private endpoint connection state",

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"ManagedVirtualNetwork": {
2121
"description": "A managed Virtual Network associated with the Azure Data Factory",
2222
"type": "object",
23-
"discriminator": "type",
2423
"properties": {
2524
"vNetId": {
2625
"description": "Managed Virtual Network ID.",

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
},
321321
"events": {
322322
"description": "The type of events that cause this trigger to fire.",
323-
"$ref": "#/definitions/BlobEventTypes"
323+
"$ref": "#/definitions/BlobEventTypeArray"
324324
},
325325
"scope": {
326326
"description": "The ARM resource ID of the Storage Account.",
@@ -337,7 +337,7 @@
337337
"typeProperties"
338338
]
339339
},
340-
"BlobEventTypes": {
340+
"BlobEventTypeArray": {
341341
"type": "array",
342342
"items": {
343343
"type": "string",

0 commit comments

Comments
 (0)