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.

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

[Datafactory] Add one new connector and new properties into three connectors #6762

Merged
merged 2 commits into from
Jul 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,7 @@ overridable
OWASP
oxxm
pageable
paramref
PARAVIRTUAL
Passthrough
patternanyentities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2198,6 +2198,23 @@
}
}
},
"AzureMariaDBTableDataset": {
"x-ms-discriminator-value": "AzureMariaDBTable",
"description": "Azure Database for MariaDB dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Properties specific to this dataset type.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/GenericDatasetTypeProperties"
}
}
},
"MarketoObjectDataset": {
"x-ms-discriminator-value": "MarketoObject",
"description": "Marketo server dataset.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3733,6 +3733,43 @@
}
}
},
"AzureMariaDBLinkedService": {
"x-ms-discriminator-value": "AzureMariaDB",
"description": "Azure Database for MariaDB linked service.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/LinkedService"
}
],
"properties": {
"typeProperties": {
"description": "Azure Database for MariaDB linked service properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/AzureMariaDBLinkedServiceTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"AzureMariaDBLinkedServiceTypeProperties": {
"description": "Azure Database for MariaDB linked service properties.",
"properties": {
"connectionString": {
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
}
}
},
"MarketoLinkedService": {
"x-ms-discriminator-value": "Marketo",
"description": "Marketo server linked service.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,16 @@
"$ref": "#/definitions/CopySource"
}
],
"properties": {}
"properties": {
"excludeLastRequest": {
"type": "object",
"description": "Whether to exclude the records of the last request. The default value is true. Type: boolean (or Expression with resultType boolean)."
},
"baseRequestId": {
"type": "object",
"description": "The ID of request for delta loading. Once it is set, only data with requestId larger than the value of this property will be retrieved. The default value is 0. Type: integer (or Expression with resultType integer )."
}
}
},
"SapTableSource": {
"description": "A copy activity source for SAP Table source.",
Expand Down Expand Up @@ -1288,6 +1297,22 @@
}
],
"properties": {
"requestMethod": {
"type": "object",
"description": "The HTTP method used to call the RESTful API. The default is GET. Type: string (or Expression with resultType string)."
},
"requestBody": {
"type": "object",
"description": "The HTTP request body to the RESTful API if requestMethod is POST. Type: string (or Expression with resultType string)."
},
"additionalHeaders": {
"type": "object",
"description": "The additional HTTP headers in the request to the RESTful API. Type: string (or Expression with resultType string)."
},
"paginationRules": {
"type": "object",
"description": "The pagination rules to compose next page requests. 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:01:40. 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 @@ -1785,7 +1810,28 @@
"$ref": "#/definitions/CopySource"
}
],
"properties": {}
"properties": {
"allowedGroups": {
"type": "object",
"description": "The groups containing all the users. Type: array of strings (or Expression with resultType array of strings)."
},
"userScopeFilterUri": {
"type": "object",
"description": "The user scope uri. Type: string (or Expression with resultType string)."
},
"dateFilterColumn": {
"type": "object",
"description": "The Column to apply the <paramref name=\"StartTime\"/> and <paramref name=\"EndTime\"/>. Type: string (or Expression with resultType string)."
},
"startTime": {
"type": "object",
"description": "Start time of the requested range for this dataset. Type: string (or Expression with resultType string)."
},
"endTime": {
"type": "object",
"description": "End time of the requested range for this dataset. Type: string (or Expression with resultType string)."
}
}
},
"AzureDataLakeStoreSource": {
"description": "A copy activity Azure Data Lake source.",
Expand Down Expand Up @@ -2080,6 +2126,21 @@
}
}
},
"AzureMariaDBSource": {
"description": "A copy activity Azure MariaDB source.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CopySource"
}
],
"properties": {
"query": {
"type": "object",
"description": "A query to retrieve data from source. Type: string (or Expression with resultType string)."
}
}
},
"MarketoSource": {
"description": "A copy activity Marketo server source.",
"type": "object",
Expand Down