From 591d372d03c66b2f814bd6e71d376676721fbd90 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Wed, 23 Sep 2020 10:48:25 +0800 Subject: [PATCH 1/4] add logSettings and upgrade Concur linked service --- .../2018-06-01/entityTypes/LinkedService.json | 4 ++ .../2018-06-01/entityTypes/Pipeline.json | 60 ++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index ac022366955a..889bbb6e5751 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -3244,6 +3244,10 @@ "ConcurLinkedServiceTypeProperties": { "description": "Concur Service linked service properties.", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "clientId": { "description": "Application client_id supplied by Concur App Management.", "type": "object" 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 35aa8392c78c..e9b7c50c16b1 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 @@ -1475,9 +1475,13 @@ "$ref": "#/definitions/RedirectIncompatibleRowSettings" }, "logStorageSettings": { - "description": "Log storage settings customer need to provide when enabling session log.", + "description": "(Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.", "$ref": "#/definitions/LogStorageSettings" }, + "logSettings": { + "description": "Log settings customer needs provide when enabling log.", + "$ref": "#/definitions/LogSettings" + }, "preserveRules": { "type": "array", "items": { @@ -4298,7 +4302,7 @@ } }, "LogStorageSettings": { - "description": "Log storage settings.", + "description": "(Deprecated. Please use LogSettings) Log storage settings.", "type": "object", "properties": { "linkedServiceName": { @@ -4325,6 +4329,58 @@ "linkedServiceName" ] }, + "LogSettings": { + "description": "Log settings.", + "type": "object", + "properties": { + "enableCopyActivityLog": { + "type": "object", + "description": "Specifies whether to enable copy activity log. Type: boolean (or Expression with resultType boolean)." + }, + "copyActivityLogSettings": { + "description": "Specifies settings for copy activity log.", + "$ref": "#/definitions/CopyActivityLogSettings" + }, + "logLocationSettings": { + "description": "Log location settings customer needs to provide when enabling log.", + "$ref": "#/definitions/LogLocationSettings" + } + }, + "required": [ + "logLocationSettings" + ] + }, + "LogLocationSettings": { + "description": "Log location 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)." + } + }, + "required": [ + "linkedServiceName" + ] + }, + "CopyActivityLogSettings": { + "description": "Settings for copy activity log.", + "type": "object", + "properties": { + "logLevel": { + "type": "object", + "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)." + }, + "enableReliableLogging": { + "type": "object", + "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)." + } + } + }, "StagingSettings": { "description": "Staging settings.", "type": "object", From 0bb777d2db3412ad87755d9b61648b574023dcc4 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Thu, 15 Oct 2020 15:28:21 +0800 Subject: [PATCH 2/4] fix prettier check --- .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++-- 1 file changed, 2 insertions(+), 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 e9b7c50c16b1..0265a4b2f3d0 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 @@ -4361,11 +4361,11 @@ "path": { "type": "object", "description": "The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string)." - } + } }, "required": [ "linkedServiceName" - ] + ] }, "CopyActivityLogSettings": { "description": "Settings for copy activity log.", From e4c15eda24b7c796f917d436d9e3925261dbb084 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Fri, 16 Oct 2020 09:51:04 +0800 Subject: [PATCH 3/4] add s3 temp auth --- .../stable/2018-06-01/entityTypes/LinkedService.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 889bbb6e5751..2acff0be0669 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -2652,6 +2652,10 @@ "AmazonS3LinkedServiceTypeProperties": { "description": "Amazon S3 linked service properties.", "properties": { + "authenticationType": { + "type": "object", + "description": "The authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string)." + }, "accessKeyId": { "type": "object", "description": "The access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)." @@ -2664,6 +2668,10 @@ "type": "object", "description": "This value specifies the endpoint to access with the S3 Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)." }, + "sessionToken": { + "type": "object", + "description": "The session token for the S3 temporary security credential. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." From 6b84af2fe17551b2666767d5b0dfd1b01c2eebde Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Fri, 16 Oct 2020 10:32:46 +0800 Subject: [PATCH 4/4] fix prettier check --- .../stable/2018-06-01/entityTypes/LinkedService.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 2acff0be0669..ba32be38547b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -2652,7 +2652,7 @@ "AmazonS3LinkedServiceTypeProperties": { "description": "Amazon S3 linked service properties.", "properties": { - "authenticationType": { + "authenticationType": { "type": "object", "description": "The authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string)." },