From 7dcc7c0d4641c2010a627161c5b7bfd73d62646d Mon Sep 17 00:00:00 2001
From: HugoLabraMSFT <96317755+HugoLabraMSFT@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:21:33 -0800
Subject: [PATCH 1/3] Add FailActivity in swagger Pipeline.json for Azure Data
 Factory

---
 .../2018-06-01/entityTypes/Pipeline.json      | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index 5e26933b60db..60491996ef1c 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -6726,6 +6726,42 @@
         "waitTimeInSeconds"
       ]
     },
+    "FailActivity": {
+      "x-ms-discriminator-value": "Fail",
+      "description": "Fails within the activity scope and provides a custom error message and error code.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ControlActivity"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Fail activity properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/FailActivityTypeProperties"
+        }
+      },
+      "required": [
+        "typeProperties"
+      ]
+    },
+    "FailActivityTypeProperties": {
+      "description": "Fail activity properties.",
+      "properties": {
+        "message": {
+          "description": "The error message that surfaced in the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string).",
+          "type": "object"
+        },
+        "errorCode": {
+          "description": "The error code that categorizes the error type of the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string).",
+          "type": "object"
+        }
+      },
+      "required": [
+        "message",
+        "errorCode"
+      ]
+    },
     "UntilActivity": {
       "x-ms-discriminator-value": "Until",
       "description": "This activity executes inner activities until the specified boolean expression results to true or timeout is reached, whichever is earlier.",

From 06169c8d494eae90b25abe68970e6f390104e700 Mon Sep 17 00:00:00 2001
From: HugoLabraMSFT <96317755+HugoLabraMSFT@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:20:54 -0800
Subject: [PATCH 2/3] Update description of FailActivity

---
 .../stable/2018-06-01/entityTypes/Pipeline.json                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index 60491996ef1c..acc844fe85be 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -6728,7 +6728,7 @@
     },
     "FailActivity": {
       "x-ms-discriminator-value": "Fail",
-      "description": "Fails within the activity scope and provides a custom error message and error code.",
+      "description": "This activity will fail within its own scope and output a custom error message and error code. The error message and code can provided either as a string literal or as an expression that can be evaluated to a string at runtime. The activity scope can be the whole pipeline or a control activity (e.g. foreach, switch, until), if the fail activity is contained in it.",
       "allOf": [
         {
           "$ref": "#/definitions/ControlActivity"

From 62cccf308c092d22c0da66d18e4e3a55014dc551 Mon Sep 17 00:00:00 2001
From: HugoLabraMSFT <96317755+HugoLabraMSFT@users.noreply.github.com>
Date: Tue, 4 Jan 2022 21:08:29 -0800
Subject: [PATCH 3/3] Adding 'type:object' to FailActivity and
 FailActivityTypeProperties

---
 .../stable/2018-06-01/entityTypes/Pipeline.json                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index acc844fe85be..1bbe83bbe342 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -6728,6 +6728,7 @@
     },
     "FailActivity": {
       "x-ms-discriminator-value": "Fail",
+      "type": "object",
       "description": "This activity will fail within its own scope and output a custom error message and error code. The error message and code can provided either as a string literal or as an expression that can be evaluated to a string at runtime. The activity scope can be the whole pipeline or a control activity (e.g. foreach, switch, until), if the fail activity is contained in it.",
       "allOf": [
         {
@@ -6747,6 +6748,7 @@
     },
     "FailActivityTypeProperties": {
       "description": "Fail activity properties.",
+      "type": "object",
       "properties": {
         "message": {
           "description": "The error message that surfaced in the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string).",