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

Salesforce Marketing Cloud Connector, ServiceUri in Dynamics LS, and SSL support in MongoDB LS #2579

Merged
merged 1 commit into from
Mar 9, 2018
Merged

Salesforce Marketing Cloud Connector, ServiceUri in Dynamics LS, and SSL support in MongoDB LS #2579

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
12 changes: 12 additions & 0 deletions ...esource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,18 @@
],
"properties": {
}
},
"SalesforceMarketingCloudObjectDataset": {
"x-ms-discriminator-value": "SalesforceMarketingCloudObject",
"description": "Salesforce Marketing Cloud dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
}
}
}
}
64 changes: 64 additions & 0 deletions ...e-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@
"type": "object",
"description": "The port of on-premises Dynamics server. The property is required for on-prem and not allowed for online. Default is 443. Type: integer (or Expression with resultType integer), minimum: 0."
},
"serviceUri": {
"type": "object",
"description": "The URL to the Microsoft Dynamics server. The property is required for on-line and not allowed for on-prem. Type: string (or Expression with resultType string)."
},
"organizationName": {
"type": "object",
"description": "The organization name of the Dynamics instance. The property is required for on-prem and required for online when there are more than one Dynamics instances associated with the user. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -1309,6 +1313,14 @@
"type": "object",
"description": "The TCP port number that the MongoDB server uses to listen for client connections. The default value is 27017. Type: integer (or Expression with resultType integer), minimum: 0."
},
"enableSsl": {
"type": "object",
"description": "Specifies whether the connections to the server are encrypted using SSL. The default value is false. Type: boolean (or Expression with resultType boolean)."
},
"allowSelfSignedServerCert": {
"type": "object",
"description": "Specifies whether to allow self-signed certificates from the server. The default value is false. Type: boolean (or Expression with resultType boolean)."
},
"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)."
Expand Down Expand Up @@ -3714,6 +3726,58 @@
}
}
},
"SalesforceMarketingCloudLinkedService": {
"x-ms-discriminator-value": "SalesforceMarketingCloud",
"description": "Salesforce Marketing Cloud linked service.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/LinkedService"
}
],
"properties": {
"typeProperties": {
"description": "Salesforce Marketing Cloud linked service properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/SalesforceMarketingCloudLinkedServiceTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"SalesforceMarketingCloudLinkedServiceTypeProperties": {
"description": "Salesforce Marketing Cloud linked service properties.",
"properties": {
"clientId": {
"description": "The client ID associated with the Salesforce Marketing Cloud application. Type: string (or Expression with resultType string).",
"type": "object"
},
"clientSecret": {
"description": "The client secret associated with the Salesforce Marketing Cloud application. Type: string (or Expression with resultType string).",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"useEncryptedEndpoints": {
"description": "Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. Type: boolean (or Expression with resultType boolean).",
"type": "object"
},
"useHostVerification": {
"description": "Specifies whether to require the host name in the server's certificate to match the host name of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean).",
"type": "object"
},
"usePeerVerification": {
"description": "Specifies whether to verify the identity of the server when connecting over SSL. The default value is true. Type: boolean (or Expression with resultType boolean).",
"type": "object"
},
"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"
}
},
"required": [
"clientId"
]
},
"HDInsightOnDemandLinkedService": {
"x-ms-discriminator-value": "HDInsightOnDemand",
"description": "HDInsight ondemand linked service.",
Expand Down
15 changes: 15 additions & 0 deletions ...source-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,21 @@
"description": "A query to retrieve data from source. Type: string (or Expression with resultType string)."
}
}
},
"SalesforceMarketingCloudSource": {
"description": "A copy activity Salesforce Marketing Cloud 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)."
}
}
},
"AmazonRedshiftSource": {
"description": "A copy activity source for Amazon Redshift Source.",
Expand Down