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 adc9894777c5..f6c6c78b0d7b 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 @@ -2689,6 +2689,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)." @@ -2701,6 +2705,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)." @@ -3281,6 +3289,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 7b100ca81dbd..0e319987eced 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": { @@ -4332,7 +4336,7 @@ } }, "LogStorageSettings": { - "description": "Log storage settings.", + "description": "(Deprecated. Please use LogSettings) Log storage settings.", "type": "object", "properties": { "linkedServiceName": { @@ -4359,6 +4363,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",