[DataFactory] Add new features to Swagger (Azure#2504)

haricr · jhendrixMSFT · commit dfc4727f1116 · 2018-02-20T07:57:51.000-08:00
* Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Fix indentations

* Fix review comments
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json
@@ -2830,7 +2830,8 @@
               "Int",
               "Float",
               "Bool",
-              "Array"
+              "Array",
+              "SecureString"
             ],
             "x-ms-enum": {
               "name": "ParameterType",
@@ -3074,6 +3075,10 @@
           "referenceName": {
             "type": "string",
             "description": "Reference LinkedService name."
+          },
+          "parameters": {
+            "$ref": "#/definitions/ParameterValueSpecification",
+            "description": "Arguments for LinkedService."
           }
         },
         "required": [
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json
@@ -1,4 +1,4 @@
-{
+﻿{
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
@@ -30,6 +30,13 @@
         "parameters": {
           "$ref": "../datafactory.json#/definitions/ParameterDefinitionSpecification",
           "description": "Parameters for dataset."
+        },
+        "annotations": {
+          "description": "List of tags that can be used for describing the Dataset.",
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
         }
       },
       "additionalProperties": {
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
@@ -1,4 +1,4 @@
-{
+﻿{
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
@@ -22,6 +22,17 @@
         "description": {
           "description": "Linked service description.",
           "type": "string"
+        },
+        "parameters": {
+          "$ref": "../datafactory.json#/definitions/ParameterDefinitionSpecification",
+          "description": "Parameters for linked service."
+        },
+        "annotations": {
+          "description": "List of tags that can be used for describing the Dataset.",
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
         }
       },
       "additionalProperties": {
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json
@@ -1,4 +1,4 @@
-{
+﻿{
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
@@ -29,7 +29,14 @@
           "type": "integer",
           "minimum": 1,
           "description": "The max number of concurrent runs for the pipeline."
-        }
+        },
+        "annotations": {
+          "description": "List of tags that can be used for describing the Pipeline.",
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        } 
       }
     },
     "Activity": {
@@ -145,6 +152,10 @@
           "description": "Interval between each retry attempt (in seconds). The default is 30 sec.",
           "minimum": 30,
           "maximum": 86400
+        },
+        "secureOutput": {
+          "type": "boolean",
+          "description": "When set to true, Output from activity is considered as secure and will not be logged to monitoring."
         }
       },
       "additionalProperties": {
@@ -2213,7 +2224,8 @@
       "enum": [
         "GET",
         "POST",
-        "PUT"
+        "PUT",
+        "DELETE"
       ],
       "x-ms-enum": {
         "name": "WebActivityMethod",
@@ -2243,7 +2255,7 @@
       "description": "Web activity authentication properties.",
       "properties": {
         "type": {
-          "description": "Web activity authentication (Basic/ClientCertificate)",
+          "description": "Web activity authentication (Basic/ClientCertificate/MSI)",
           "type": "string"
         },
         "pfx": {
@@ -2257,6 +2269,10 @@
         "password": {
           "description": "Password for the PFX file or basic authentication.",
           "$ref": "../datafactory.json#/definitions/SecureString"
+        },
+        "resource": {
+          "description": "Resource for which Azure Auth token will be requested when using MSI Authentication.",
+          "type": "string"
         }
       },
       "required": [
@@ -2413,9 +2429,14 @@
       "description": "ForEach activity properties.",
       "properties": {
         "isSequential": {
-          "description": "Should the loop be executed in sequence or in parallel (max 20)",
+          "description": "Should the loop be executed in sequence or in parallel (max 50)",
           "type": "boolean"
         },
+        "batchCount": {
+          "description": "Batch count to be used for controlling the number of parallel execution (when isSequential is set to false).",
+          "type": "integer",
+          "maximum": 50
+        },
         "items": {
           "description": "Collection to iterate.",
           "$ref": "../datafactory.json#/definitions/Expression"
@@ -2671,6 +2692,42 @@
         "expression",
         "activities"
       ]
+    },
+    "FilterActivity": {
+      "x-ms-discriminator-value": "Filter",
+      "description": "Filter and return results from input array based on the conditions.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ControlActivity"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Filter activity properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/FilterActivityTypeProperties"
+        }
+      },
+      "required": [
+        "typeProperties"
+      ]
+    },
+    "FilterActivityTypeProperties": {
+      "description": "Fitler activity properties.",
+      "properties": {
+        "items": {
+          "description": "Input array on which filter should be applied.",
+          "$ref": "../datafactory.json#/definitions/Expression"
+        },
+        "condition": {
+          "description": "Condition to be used for filtering the input.",
+          "$ref": "../datafactory.json#/definitions/Expression"
+        }
+      },
+      "required": [
+        "condition",
+        "items"
+      ]
     }
   }
 }
