Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Data Factory]Add logSettings and upgrade Concur linked service for ADF public swagger #10903

Merged
merged 13 commits into from
Oct 16, 2020
Merged

[Data Factory]Add logSettings and upgrade Concur linked service for ADF public swagger #10903

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9cb1293
Merge pull request #1 from Azure/master
rickysun93 Apr 3, 2020
f3abc16
Merge pull request #2 from Azure/master
rickysun93 May 15, 2020
209674a
Merge pull request #3 from Azure/master
rickysun93 Jun 23, 2020
53d78be
Merge pull request #4 from Azure/master
rickysun93 Jul 23, 2020
3531325
Merge pull request #5 from Azure/master
rickysun93 Jul 31, 2020
0e01091
Merge pull request #6 from Azure/master
rickysun93 Aug 7, 2020
02b3f0b
Merge pull request #7 from Azure/master
rickysun93 Aug 19, 2020
8b1b029
Merge pull request #8 from Azure/master
rickysun93 Sep 2, 2020
60eff1b
Merge pull request #9 from Azure/master
rickysun93 Sep 23, 2020
591d372
add logSettings and upgrade Concur linked service
Sep 23, 2020
0bb777d
fix prettier check
Oct 15, 2020
e4c15ed
add s3 temp auth
Oct 16, 2020
6b84af2
fix prettier check
Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
60 changes: 58 additions & 2 deletions ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this property deprecated in ADF service? Will it break existing customers?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Existing customers will still be supported with this property.

"$ref": "#/definitions/LogStorageSettings"
},
"logSettings": {
"description": "Log settings customer needs provide when enabling log.",
"$ref": "#/definitions/LogSettings"
},
"preserveRules": {
"type": "array",
"items": {
Expand Down Expand Up @@ -4298,7 +4302,7 @@
}
},
"LogStorageSettings": {
"description": "Log storage settings.",
"description": "(Deprecated. Please use LogSettings) Log storage settings.",
"type": "object",
"properties": {
"linkedServiceName": {
Expand All @@ -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",
Expand Down