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

add sharepointonlinelist connector and httpRequestTimeout #8832

Merged
merged 1 commit into from
Mar 26, 2020
Merged

add sharepointonlinelist connector and httpRequestTimeout #8832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3103,6 +3103,32 @@
"description": "The table name of the Snowflake database. Type: string (or Expression with resultType string)."
}
}
},
"SharePointOnlineListResourceDataset": {
"x-ms-discriminator-value": "SharePointOnlineListResource",
"description": "The sharepoint online list resource dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Sharepoint online list dataset properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/SharePointOnlineListDatasetTypeProperties"
}
}
},
"SharePointOnlineListDatasetTypeProperties": {
"description": "Sharepoint online list dataset properties.",
"properties": {
"listName": {
"type": "object",
"description": "The name of the SharePoint Online list. Type: string (or Expression with resultType string)."
}
}
}
}
}
51 changes: 51 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 @@ -5729,6 +5729,57 @@
"required": [
"connectionString"
]
},
"SharePointOnlineListLinkedService": {
"x-ms-discriminator-value": "SharePointOnlineList",
"description": "SharePoint Online List linked service.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/LinkedService"
}
],
"properties": {
"typeProperties": {
"description": "SharePoint Online List linked service properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/SharePointOnlineListLinkedServiceTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"SharePointOnlineListLinkedServiceTypeProperties": {
"description": "SharePoint Online List linked service properties.",
"properties": {
"siteUrl": {
"type": "object",
"description": "The URL of the SharePoint Online site. For example, https://contoso.sharepoint.com/sites/siteName. Type: string (or Expression with resultType string)."
},
"tenantId": {
"type": "object",
"description": "The tenant ID under which your application resides. You can find it from Azure portal Active Directory overview page. Type: string (or Expression with resultType string)."
},
"servicePrincipalId": {
"type": "object",
"description": "The application (client) ID of your application registered in Azure Active Directory. Make sure to grant SharePoint site permission to this application. Type: string (or Expression with resultType string)."
},
"servicePrincipalKey": {
"description": "The client secret of your application registered in Azure Active Directory. Type: string (or Expression with resultType string).",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"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)."
}
},
"required": [
"siteUrl",
"tenantId",
"servicePrincipalId",
"servicePrincipalKey"
]
}
}
}
39 changes: 39 additions & 0 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 @@ -1535,6 +1535,10 @@
"type": "object",
"description": "OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)."
},
"httpRequestTimeout": {
"type": "object",
"description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
},
Copy link
Member

Choose a reason for hiding this comment

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

suggest to move new added property below additionalColumns in case cause SDK breaking

"additionalColumns": {
"type": "array",
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
Expand Down Expand Up @@ -1617,6 +1621,10 @@
"query": {
"type": "object",
"description": "SAP Cloud for Customer OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)."
},
"httpRequestTimeout": {
"type": "object",
"description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
}
}
},
Expand All @@ -1632,6 +1640,10 @@
"query": {
"type": "object",
"description": "SAP ECC OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)."
},
"httpRequestTimeout": {
"type": "object",
"description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
}
}
},
Expand Down Expand Up @@ -2990,6 +3002,10 @@
"query": {
"type": "object",
"description": "A query to retrieve data from source. Type: string (or Expression with resultType string)."
},
"httpRequestTimeout": {
"type": "object",
"description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
}
}
},
Expand Down Expand Up @@ -3209,6 +3225,10 @@
"name": "SapCloudForCustomerSinkWriteBehavior",
"modelAsString": true
}
},
"httpRequestTimeout": {
"type": "object",
"description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
}
}
},
Expand Down Expand Up @@ -6209,6 +6229,25 @@
"required": [
"dataFlow"
]
},
"SharePointOnlineListSource": {
"description": "A copy activity source for sharePoint online list source.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CopySource"
}
],
"properties": {
"query": {
"type": "object",
"description": "The OData query to filter the data in SharePoint Online list. For example, \"$top=1\". Type: string (or Expression with resultType string)."
},
"httpRequestTimeout": {
"type": "object",
"description": "The wait time to get a response from SharePoint Online. Default value is 5 minutes (00:05:00). Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
}
}
}
}
}