Use keyvault database for FLE tests

This change was not done everywhere, so adding the rest of the places JAVA-3702
mongodb · Feb 4, 2021 · 351b524 · 351b524
1 parent 9ea346b
commit 351b524
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -63,7 +63,7 @@ public static void main(final String[] args) throws InterruptedException {
            }});
         }};
 
-        String keyVaultNamespace = "admin.datakeys";
+        String keyVaultNamespace = "keyvault.datakeys";
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
                 .keyVaultMongoClientSettings(MongoClientSettings.builder()
                         .applyConnectionString(new ConnectionString("mongodb://localhost"))

diff --git a/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java b/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java
@@ -55,7 +55,7 @@ public static void main(final String[] args) throws InterruptedException {
             }});
         }};
 
-        String keyVaultNamespace = "admin.datakeys";
+        String keyVaultNamespace = "keyvault.datakeys";
 
         AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
                 .keyVaultNamespace(keyVaultNamespace)

diff --git a/...er-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java b/...er-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java
@@ -101,8 +101,8 @@ public void setUp() throws IOException, URISyntaxException {
         documentCallback.get();
 
         // Step 3: Drop and create keyvault.datakeys
-        MongoDatabase adminDatabase = client.getDatabase("admin");
-        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
+        MongoDatabase keyvaultDatabase = client.getDatabase("keyvault");
+        MongoCollection<BsonDocument> dataKeysCollection = keyvaultDatabase.getCollection("datakeys", BsonDocument.class)
                 .withWriteConcern(WriteConcern.MAJORITY);
 
         voidCallback = new FutureResultCallback<Void>();
@@ -150,7 +150,7 @@ public void setUp() throws IOException, URISyntaxException {
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder().
                 keyVaultMongoClientSettings(getMongoClientSettings()).
                 kmsProviders(kmsProviders).
-                keyVaultNamespace("admin.datakeys").build();
+                keyVaultNamespace("keyvault.datakeys").build();
         clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
     }
 

diff --git a/...rc/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java b/...rc/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java
@@ -74,8 +74,8 @@ public void setUp() throws IOException, URISyntaxException {
 
         /* Step 1: get unencrypted client and recreate keys collection */
         client = getMongoClient();
-        MongoDatabase admin = client.getDatabase("admin");
-        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
+        MongoDatabase keyvaultDatabase = client.getDatabase("keyvault");
+        MongoCollection<BsonDocument> datakeys = keyvaultDatabase.getCollection("datakeys", BsonDocument.class)
                 .withWriteConcern(WriteConcern.MAJORITY);
         FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
         datakeys.drop(voidCallback);

diff --git a/...t/functional/com/mongodb/async/client/ClientSideEncryptionMongocryptdSpawnBypassTest.java b/...t/functional/com/mongodb/async/client/ClientSideEncryptionMongocryptdSpawnBypassTest.java
@@ -40,7 +40,7 @@
 public class ClientSideEncryptionMongocryptdSpawnBypassTest extends DatabaseTestCase {
     private final File pidFile;
     private final Map<String, Map<String, Object>> kmsProviders;
-    private final MongoNamespace keyVaultNamespace = new MongoNamespace("admin.datakeys");
+    private final MongoNamespace keyVaultNamespace = new MongoNamespace("keyvault.datakeys");
 
     public ClientSideEncryptionMongocryptdSpawnBypassTest() throws IOException {
         assumeFalse(isNotAtLeastJava8());

diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java
@@ -156,8 +156,8 @@ public void setUp() {
             callback.get(30, TimeUnit.SECONDS);
         }
 
-        /* Insert data into the "admin.datakeys" key vault. */
-        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
+        /* Insert data into the "keyvault.datakeys" key vault. */
+        collection = getMongoClient().getDatabase("keyvault").getCollection("datakeys", BsonDocument.class)
                 .withWriteConcern(WriteConcern.MAJORITY);
         callback = new FutureResultCallback<Void>();
         collection.drop(callback);
@@ -224,7 +224,7 @@ public void setUp() {
             }
         }
 
-        String keyVaultNamespace = "admin.datakeys";
+        String keyVaultNamespace = "keyvault.datakeys";
         if (cryptOptions.containsKey("keyVaultNamespace")) {
             keyVaultNamespace = cryptOptions.getString("keyVaultNamespace").getValue();
         }

diff --git a/...c/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java b/...c/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java
@@ -71,7 +71,7 @@ public void setUp() {
         kmsProviders.put("local", localMasterkey);
 
         AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
-                .keyVaultNamespace("admin.datakeys")
+                .keyVaultNamespace("keyvault.datakeys")
                 .kmsProviders(kmsProviders);
 
         AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();

diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -59,7 +59,7 @@ public static void main(final String[] args) {
            }});
         }};
 
-        String keyVaultNamespace = "admin.datakeys";
+        String keyVaultNamespace = "keyvault.datakeys";
         ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
                 .keyVaultMongoClientSettings(MongoClientSettings.builder()
                         .applyConnectionString(new ConnectionString("mongodb://localhost"))

diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java
@@ -52,7 +52,7 @@ public static void main(final String[] args) {
            }});
         }};
 
-        String keyVaultNamespace = "admin.datakeys";
+        String keyVaultNamespace = "keyvault.datakeys";
 
         AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
                 .keyVaultNamespace(keyVaultNamespace)