Skip to content

Commit 9b03e34

Browse files
committed
MLE-24893 Added note about PDC auth
1 parent 16ace44 commit 9b03e34

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.copyrightconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ startyear: 2023
1111
# - Dotfiles already skipped automatically
1212
# Enable by removing the leading '# ' from the next line and editing values.
1313
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14-
filesexcluded: .github/*, README.md, CONTRIBUTING.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, docs/**, *.json, *.txt
14+
filesexcluded: .github/*, README.md, CONTRIBUTING.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, docs/**, *.json, *.txt, CODEOWNERS

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# These owners will be the default owners for everything in the repo.
5-
* @anu3990 @billfarber @rjrudin @stevebio
5+
* @billfarber @rjrudin @stevebio

docs/configuration.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ These options define how the connector connects and authenticates with MarkLogic
3939
| spark.marklogic.client.password | Required for `basic` and `digest` authentication. |
4040
| spark.marklogic.client.certificate.file | Required for `certificate` authentication; the path to a certificate file. |
4141
| spark.marklogic.client.certificate.password | Required for `certificate` authentication; the password for accessing the certificate file. |
42-
| spark.marklogic.client.cloud.apiKey | Required for MarkLogic `cloud` authentication. |
42+
| spark.marklogic.client.cloud.apiKey | Required for Progress Data Cloud (PDC) `cloud` authentication. |
4343
| spark.marklogic.client.kerberos.principal | Required for `kerberos` authentication. |
4444
| spark.marklogic.client.saml.token | Required for `saml` authentication. |
4545
| spark.marklogic.client.sslEnabled | If 'true', an SSL connection is created using the JVM's default SSL context.
@@ -50,6 +50,10 @@ These options define how the connector connects and authenticates with MarkLogic
5050
| spark.marklogic.client.ssl.keystore.algorithm | Java keystore algorithm for 2-way SSL; defaults to "SunX509"; since 2.1.0. |
5151
| spark.marklogic.client.uri | Shortcut for setting the host, port, username, and password when using `basic` or `digest` authentication. See below for more information. |
5252

53+
If you are using the connector with a MarkLogic server hosted in Progress Data Cloud (PDC), please see
54+
the related [Flux documentation](https://marklogic.github.io/flux/common-options.html) on how to configure the
55+
values for the MarkLogic host, base path, and cloud API key.
56+
5357
### Connecting with a client URI
5458

5559
The `spark.marklogic.client.uri` is a convenience for the common case of using `basic` or `digest` authentication.

0 commit comments

Comments
 (0)