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 <dapzhang@microsoft.com>
Azure · Dec 8, 2021 · e260efc · e260efc
1 parent 5a1b726
commit e260efc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json b/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json
@@ -21,6 +21,9 @@
       "description": "Azure Data Factory nested object which contains a flow with data movements and transformations.",
       "type": "object",
       "discriminator": "type",
+      "required": [
+        "type"
+      ],
       "properties": {
         "type": {
           "type": "string",

diff --git a/...e-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json b/...e-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json
@@ -20,7 +20,6 @@
     "ManagedPrivateEndpoint": {
       "description": "Properties of a managed private endpoint",
       "type": "object",
-      "discriminator": "type",
       "properties": {
         "connectionState": {
           "description": "The managed private endpoint connection state",

diff --git a/...ce-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json b/...ce-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json
@@ -20,7 +20,6 @@
     "ManagedVirtualNetwork": {
       "description": "A managed Virtual Network associated with the Azure Data Factory",
       "type": "object",
-      "discriminator": "type",
       "properties": {
         "vNetId": {
           "description": "Managed Virtual Network ID.",

diff --git a/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json b/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json
@@ -320,7 +320,7 @@
             },
             "events": {
               "description": "The type of events that cause this trigger to fire.",
-              "$ref": "#/definitions/BlobEventTypes"
+              "$ref": "#/definitions/BlobEventTypeArray"
             },
             "scope": {
               "description": "The ARM resource ID of the Storage Account.",
@@ -337,7 +337,7 @@
         "typeProperties"
       ]
     },
-    "BlobEventTypes": {
+    "BlobEventTypeArray": {
       "type": "array",
       "items": {
         "type": "string",