Modify tours to accept the connection string from args

stIncMale · stIncMale · commit 540b6f3be6b3 · 2024-03-19T16:34:09.000-06:00
JAVA-3580
diff --git a/.evergreen/run-graalvm-native-image-app.sh b/.evergreen/run-graalvm-native-image-app.sh
@@ -4,6 +4,7 @@ set -o errexit
 
 # Supported/used environment variables:
 # JAVA_VERSION The Java SE version for Gradle toolchain.
+# MONGODB_URI The connection string to use, including credentials and topology info.
 
 ############################################
 #            Main Program                  #
@@ -14,18 +15,19 @@ source "${RELATIVE_DIR_PATH}/javaConfig.bash"
 readonly JDK="${JAVA_HOME}"
 readonly JDK_GRAALVM_VAR_NAME="JDK${JAVA_VERSION}_GRAALVM"
 readonly JDK_GRAALVM="${!JDK_GRAALVM_VAR_NAME}"
-echo "The JDK distribution for running Gradle located at \"${JDK}\" is"
+echo "The JDK distribution for running Gradle located at \`${JDK}\` is"
 echo "$("${JDK}"/bin/java --version)"
 echo "The Java SE version for the Gradle toolchain is ${JAVA_VERSION}"
 echo "The GraalVM JDK distribution expected to be found at \"${JDK_GRAALVM}\" by the Gradle toolchain functionality is"
 echo "$("${JDK_GRAALVM}"/bin/java --version)"
 echo "The Gradle version is"
 ./gradlew --version
+echo "MONGODB_URI=${MONGODB_URI}"
 
 echo "Building GraalVM native image app"
 ./gradlew :graalvm-native-image-app:clean
-env JAVA_HOME=${JDK_GRAALVM} ./gradlew -PjavaVersion=${JAVA_VERSION} -Pagent :graalvm-native-image-app:run
+env JAVA_HOME=${JDK_GRAALVM} ./gradlew -PjavaVersion=${JAVA_VERSION} -Pagent -Dorg.mongodb.test.uri=${MONGODB_URI} :graalvm-native-image-app:run
 env JAVA_HOME=${JDK_GRAALVM} ./gradlew :graalvm-native-image-app:metadataCopy
 
 echo "Running GraalVM native image app"
-./gradlew -PjavaVersion=${JAVA_VERSION} :graalvm-native-image-app:nativeRun
+./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${MONGODB_URI} :graalvm-native-image-app:nativeRun
diff --git a/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -64,11 +64,14 @@ public static void main(final String[] args) {
            }});
         }};
 
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
         String keyVaultNamespace = "admin.datakeys";
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace)
                 .kmsProviders(kmsProviders)
                 .build();
@@ -107,7 +110,7 @@ public static void main(final String[] args) {
                                     + "}"));
                 }}).build();
 
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings clientSettings = MongoClientSettings.builder(commonClientSettings)
                 .autoEncryptionSettings(autoEncryptionSettings)
                 .build();
 
diff --git a/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionExplicitEncryptionAndDecryptionTour.java b/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionExplicitEncryptionAndDecryptionTour.java
@@ -69,9 +69,12 @@ public static void main(final String[] args) {
         }};
 
         MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
-
-        MongoClientSettings clientSettings = MongoClientSettings.builder().build();
-        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
+        MongoClient mongoClient = MongoClients.create(commonClientSettings);
 
         // Set up the key vault for this example
         MongoCollection<Document> keyVaultCollection = mongoClient.getDatabase(keyVaultNamespace.getDatabaseName())
@@ -96,9 +99,7 @@ public static void main(final String[] args) {
 
         // Create the ClientEncryption instance
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace.getFullName())
                 .kmsProviders(kmsProviders)
                 .build();
diff --git a/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionExplicitEncryptionOnlyTour.java b/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionExplicitEncryptionOnlyTour.java
@@ -69,8 +69,12 @@ public static void main(final String[] args) {
         }};
 
         MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
-
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
+        MongoClientSettings clientSettings = MongoClientSettings.builder(commonClientSettings)
                 .autoEncryptionSettings(AutoEncryptionSettings.builder()
                         .keyVaultNamespace(keyVaultNamespace.getFullName())
                         .kmsProviders(kmsProviders)
@@ -102,9 +106,7 @@ public static void main(final String[] args) {
 
         // Create the ClientEncryption instance
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace.getFullName())
                 .kmsProviders(kmsProviders)
                 .build();
diff --git a/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionSimpleTour.java b/driver-reactive-streams/src/examples/reactivestreams/tour/ClientSideEncryptionSimpleTour.java
@@ -18,6 +18,7 @@
 package reactivestreams.tour;
 
 import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.result.InsertOneResult;
 import com.mongodb.reactivestreams.client.MongoClient;
@@ -64,7 +65,10 @@ public static void main(final String[] args) {
                 .kmsProviders(kmsProviders)
                 .build();
 
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings clientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
                 .autoEncryptionSettings(autoEncryptionSettings)
                 .build();
 
diff --git a/driver-sync/src/examples/documentation/CausalConsistencyExamples.java b/driver-sync/src/examples/documentation/CausalConsistencyExamples.java
@@ -17,6 +17,8 @@
 package documentation;
 
 import com.mongodb.ClientSessionOptions;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
@@ -42,8 +44,13 @@ public final class CausalConsistencyExamples {
      * @param args takes an optional single argument for the connection string
      */
     public static void main(final String[] args) {
-        setupDatabase();
-        MongoClient client = MongoClients.create();
+        MongoClientSettings clientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
+        setupDatabase(clientSettings);
+        MongoClient client = MongoClients.create(clientSettings);
 
         // Start Causal Consistency Example 1
         // Example 1: Use a causally consistent session to ensure that the update occurs before the insert.
@@ -81,8 +88,8 @@ public static void main(final String[] args) {
         // End Causal Consistency Example 2
     }
 
-    private static void setupDatabase() {
-        MongoClient client = MongoClients.create();
+    private static void setupDatabase(final MongoClientSettings clientSettings) {
+        MongoClient client = MongoClients.create(clientSettings);
         client.getDatabase("test").drop();
 
         MongoDatabase database = client.getDatabase("test");
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -58,12 +58,14 @@ public static void main(final String[] args) {
                put("key", localMasterKey);
            }});
         }};
-
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
         String keyVaultNamespace = "encryption.__keyVault";
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace)
                 .kmsProviders(kmsProviders)
                 .build();
@@ -99,7 +101,7 @@ public static void main(final String[] args) {
                                     + "}"));
                 }}).build();
 
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings clientSettings = MongoClientSettings.builder(commonClientSettings)
                 .autoEncryptionSettings(autoEncryptionSettings)
                 .build();
 
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionExplicitEncryptionAndDecryptionTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionExplicitEncryptionAndDecryptionTour.java
@@ -60,9 +60,12 @@ public static void main(final String[] args) {
                 put("key", localMasterKey);
             }});
         }};
-
-        MongoClientSettings clientSettings = MongoClientSettings.builder().build();
-        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
+        MongoClient mongoClient = MongoClients.create(commonClientSettings);
 
         // Set up the key vault for this example
         MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
@@ -81,9 +84,7 @@ public static void main(final String[] args) {
 
         // Create the ClientEncryption instance
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace.getFullName())
                 .kmsProviders(kmsProviders)
                 .build();
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionExplicitEncryptionOnlyTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionExplicitEncryptionOnlyTour.java
@@ -62,8 +62,12 @@ public static void main(final String[] args) {
         }};
 
         MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
-
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings commonClientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
+                .build();
+        MongoClientSettings clientSettings = MongoClientSettings.builder(commonClientSettings)
                 .autoEncryptionSettings(AutoEncryptionSettings.builder()
                         .keyVaultNamespace(keyVaultNamespace.getFullName())
                         .kmsProviders(kmsProviders)
@@ -87,9 +91,7 @@ public static void main(final String[] args) {
 
         // Create the ClientEncryption instance
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
-                        .build())
+                .keyVaultMongoClientSettings(commonClientSettings)
                 .keyVaultNamespace(keyVaultNamespace.getFullName())
                 .kmsProviders(kmsProviders)
                 .build();
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java
@@ -17,6 +17,7 @@
 package tour;
 
 import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -59,7 +60,10 @@ public static void main(final String[] args) {
                 .kmsProviders(kmsProviders)
                 .build();
 
-        MongoClientSettings clientSettings = MongoClientSettings.builder()
+        MongoClientSettings clientSettings = (
+                args.length == 0
+                        ? MongoClientSettings.builder()
+                        : MongoClientSettings.builder().applyConnectionString(new ConnectionString(args[0])))
                 .autoEncryptionSettings(autoEncryptionSettings)
                 .build();
 
diff --git a/graalvm-native-image-app/build.gradle b/graalvm-native-image-app/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     implementation project(path:':driver-reactive-streams', configuration:'archives')
     implementation project(path:':driver-legacy', configuration:'archives')
     // note that as a result of these `sourceSets` dependencies, `driver-sync/src/test/resources/logback-test.xml` is used
+    implementation project(':driver-core').sourceSets.test.output
     implementation project(':driver-sync').sourceSets.test.output
     implementation project(':driver-legacy').sourceSets.test.output
     implementation project(':driver-reactive-streams').sourceSets.test.output
diff --git a/graalvm-native-image-app/src/main/com/mongodb/internal/graalvm/NativeImageApp.java b/graalvm-native-image-app/src/main/com/mongodb/internal/graalvm/NativeImageApp.java
