[Data Factory] Add Chainingtrigger (#7076)

* Add Chaining Trigger * Add Chaining Trigger * Fix Issues * Update review comments
Azure · Aug 30, 2019 · e315499 · e315499
1 parent 33e4ec6
commit e315499
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 2 deletions.
diff --git a/...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
@@ -4505,6 +4505,14 @@
           },
           "readOnly": true
         },
+        "runDimensions": {
+          "description": "Run dimensions emitted by Pipeline run.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "readOnly": true
+        },
         "invokedBy": {
           "description": "Entity that started the pipeline run.",
           "$ref": "#/definitions/PipelineRunInvokedBy",
@@ -4744,6 +4752,22 @@
             "type": "string"
           },
           "readOnly": true
+        },
+        "runDimension": {
+          "description": "Run dimension for which trigger was fired.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "readOnly": true
+        },
+        "dependencyStatus": {
+          "description": "Status of the upstream pipelines.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "object"
+          },
+          "readOnly": true
         }
       },
       "additionalProperties": {

diff --git a/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -41,6 +41,14 @@
             "type": "object"
           }
         },
+        "runDimensions": {
+          "description": "Dimensions emitted by Pipeline.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "description": "Type: string (or Expression with resultType string)."
+          }
+        },
         "folder": {
           "description": "The folder that this Pipeline is in. If not specified, Pipeline will appear at the root level.",
           "type": "object",

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
@@ -585,6 +585,46 @@
       "required": [
         "typeProperties"
       ]
+    },
+    "ChainingTrigger": {
+      "description": "Trigger that allows the referenced pipeline to depend on other pipeline runs based on runDimension Name/Value pairs. Upstream pipelines should declare the same runDimension Name and their runs should have the values for those runDimensions. The referenced pipeline run would be triggered if the values for the runDimension match for all upstream pipeline runs.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Trigger"
+        }
+      ],
+      "properties": {
+        "pipeline": {
+          "$ref": "../datafactory.json#/definitions/TriggerPipelineReference",
+          "description": "Pipeline for which runs are created when all upstream pipelines complete successfully."
+        },
+        "typeProperties": {
+          "description": "Chaining Trigger properties.",
+          "x-ms-client-flatten": true,
+          "properties": {
+            "dependsOn": {
+              "type": "array",
+              "items": {
+                "$ref": "../datafactory.json#/definitions/PipelineReference"
+              },
+              "description": "Upstream Pipelines."
+            },
+            "runDimension": {
+              "description": "Run Dimension property that needs to be emitted by upstream pipelines.",
+              "type": "string"
+            }
+          },
+          "required": [
+            "runDimension",
+            "dependsOn"
+          ]
+        }
+      },
+      "required": [
+        "pipeline",
+        "typeProperties"
+      ]
     }
   }
 }
diff --git a/...manager/Microsoft.DataFactory/stable/2018-06-01/examples/PipelineRuns_QueryByFactory.json b/...manager/Microsoft.DataFactory/stable/2018-06-01/examples/PipelineRuns_QueryByFactory.json
@@ -45,7 +45,10 @@
             "status": "Succeeded",
             "message": "",
             "lastUpdated": "2018-06-16T00:38:12.7314495Z",
-            "annotations": []
+            "annotations": [],
+            "runDimension": {
+              "JobId": "79c1cc52-265f-41a5-9553-be65e736fbd3"
+            }	
           },
           {
             "runId": "16ac5348-ff82-4f95-a80d-638c1d47b721",
@@ -63,7 +66,10 @@
             "status": "Cancelled",
             "message": "",
             "lastUpdated": "2018-06-16T00:39:51.216097Z",
-            "annotations": []
+            "annotations": [],
+            "runDimension": {
+              "JobId": "84a3c493-0628-4b44-852f-ef5b3a11bdab"
+            }
           }
         ]
       }

diff --git a/...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json b/...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json
@@ -61,12 +61,21 @@
         "parameters": {
           "OutputBlobNameList": {
             "type": "Array"
+          },
+          "JobId": {
+            "type": "String"
           }
         },
         "variables": {
           "TestVariableArray": {
             "type": "Array"
           }
+        },
+        "runDimensions": {
+          "JobId": {
+            "value": "@pipeline().parameters.JobId",
+            "type": "Expression"
+          }
         }
       }
     },
@@ -140,12 +149,21 @@
           "parameters": {
             "OutputBlobNameList": {
               "type": "Array"
+            },
+            "JobId": {
+              "type": "String"
             }
           },
           "variables": {
             "TestVariableArray": {
               "type": "Array"
             }
+          },
+          "runDimensions": {
+            "JobId": {
+              "value": "@pipeline().parameters.JobId",
+              "type": "Expression"
+            }
           }
         },
         "etag": "0a0069d4-0000-0000-0000-5b245bd50000"