From 5e54670508b90d66ed341ab44aa8dd19d2644a1d Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Fri, 2 Nov 2018 15:58:32 +0800 Subject: [PATCH 1/5] Enable delete activity --- .../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 24fdecaf29ea..8fe41d9b0785 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 @@ -2326,6 +2326,42 @@ "required": [ "pipeline" ] + }, + "DeleteActivity": { + "x-ms-discriminator-value": "Delete", + "description": "Delete activity.", + "allOf": [ + { + "$ref": "#/definitions/ExecutionActivity" + } + ], + "properties": { + "typeProperties": { + "description": "Delete activity properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/DeleteActivityTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "DeleteActivityTypeProperties": { + "description": "Delete activity properties.", + "properties": { + "recursive": { + "type": "boolean", + "description": "If true, files under the folder path will be deleted recursively. Default is true. Type: boolean (or Expression with resultType boolean)." + }, + "dataset": { + "description": "Delete activity dataset reference.", + "$ref": "../datafactory.json#/definitions/DatasetReference" + } + }, + "required": [ + "source", + "recursive" + ] }, "LookupActivity": { "x-ms-discriminator-value": "Lookup", From cf65697ea020da33e927c257d64339b5504733fa Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Fri, 2 Nov 2018 16:07:42 +0800 Subject: [PATCH 2/5] Enable delete activity. --- .../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 8fe41d9b0785..cf2f8a2a0a99 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 @@ -2359,7 +2359,7 @@ } }, "required": [ - "source", + "dataset", "recursive" ] }, From 5ff291ba3fd2e3bda21c89a3b159531d56a75fbb Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Mon, 5 Nov 2018 09:45:18 +0800 Subject: [PATCH 3/5] Update --- .../stable/2018-06-01/entityTypes/Pipeline.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 cf2f8a2a0a99..b9d1154b8b16 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 @@ -2327,7 +2327,7 @@ "pipeline" ] }, - "DeleteActivity": { + "DeleteActivity": { "x-ms-discriminator-value": "Delete", "description": "Delete activity.", "allOf": [ @@ -2350,7 +2350,7 @@ "description": "Delete activity properties.", "properties": { "recursive": { - "type": "boolean", + "type": "object", "description": "If true, files under the folder path will be deleted recursively. Default is true. Type: boolean (or Expression with resultType boolean)." }, "dataset": { @@ -2359,8 +2359,7 @@ } }, "required": [ - "dataset", - "recursive" + "dataset" ] }, "LookupActivity": { From 6effad585c2bd2f1de30e2c6e5467750384a3d0b Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Tue, 4 Dec 2018 11:13:33 +0800 Subject: [PATCH 4/5] Refactor delete activity content --- .../2018-06-01/entityTypes/Pipeline.json | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 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 b9d1154b8b16..627c64e6fa8d 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 @@ -1458,6 +1458,26 @@ "modelAsString": true } }, + "LogStorageSettings": { + "description": "Log storage settings.", + "type": "object", + "properties": { + "linkedServiceName": { + "description": "Log storage linked service reference.", + "$ref": "../datafactory.json#/definitions/LinkedServiceReference" + }, + "path": { + "type": "object", + "description": "The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string)." + } + }, + "additionalProperties": { + "type": "object" + }, + "required": [ + "linkedServiceName" + ] + }, "StagingSettings": { "description": "Staging settings.", "type": "object", @@ -2351,7 +2371,20 @@ "properties": { "recursive": { "type": "object", - "description": "If true, files under the folder path will be deleted recursively. Default is true. Type: boolean (or Expression with resultType boolean)." + "description": "If true, files or sub-folders under current folder path will be deleted recursively. Default is false. Type: boolean (or Expression with resultType boolean)." + }, + "maxConcurrentConnections":{ + "type": "integer", + "minimum": 1, + "description": "The max concurrent connections to connect data source at the same time." + }, + "enableLogging":{ + "type":"object", + "description": "Whether to record detailed logs of delete-activity execution. Default value is false. Type: boolean (or Expression with resultType boolean)." + }, + "logStorageSettings":{ + "description": "Log storage settings customer need to provide when enableLogging is true.", + "$ref": "#/definitions/LogStorageSettings" }, "dataset": { "description": "Delete activity dataset reference.", From fd13d7e45b8d65c0f81299d8ef0e5f977d1f149a Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Thu, 6 Dec 2018 14:47:26 +0800 Subject: [PATCH 5/5] Update --- .../stable/2018-06-01/entityTypes/Pipeline.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 918593532825..8a44e1e8c452 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 @@ -2344,8 +2344,7 @@ "pipeline" ] }, - " - Activity": { + "DeleteActivity": { "x-ms-discriminator-value": "Delete", "description": "Delete activity.", "allOf": [