Skip to content

Commit 351b524

Browse files
committed
Use keyvault database for FLE tests
This change was not done everywhere, so adding the rest of the places JAVA-3702
1 parent 9ea346b commit 351b524

9 files changed

+14
-14
lines changed

driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void main(final String[] args) throws InterruptedException {
6363
}});
6464
}};
6565

66-
String keyVaultNamespace = "admin.datakeys";
66+
String keyVaultNamespace = "keyvault.datakeys";
6767
ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
6868
.keyVaultMongoClientSettings(MongoClientSettings.builder()
6969
.applyConnectionString(new ConnectionString("mongodb://localhost"))

driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void main(final String[] args) throws InterruptedException {
5555
}});
5656
}};
5757

58-
String keyVaultNamespace = "admin.datakeys";
58+
String keyVaultNamespace = "keyvault.datakeys";
5959

6060
AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
6161
.keyVaultNamespace(keyVaultNamespace)

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public void setUp() throws IOException, URISyntaxException {
101101
documentCallback.get();
102102

103103
// Step 3: Drop and create keyvault.datakeys
104-
MongoDatabase adminDatabase = client.getDatabase("admin");
105-
MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
104+
MongoDatabase keyvaultDatabase = client.getDatabase("keyvault");
105+
MongoCollection<BsonDocument> dataKeysCollection = keyvaultDatabase.getCollection("datakeys", BsonDocument.class)
106106
.withWriteConcern(WriteConcern.MAJORITY);
107107

108108
voidCallback = new FutureResultCallback<Void>();
@@ -150,7 +150,7 @@ public void setUp() throws IOException, URISyntaxException {
150150
ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder().
151151
keyVaultMongoClientSettings(getMongoClientSettings()).
152152
kmsProviders(kmsProviders).
153-
keyVaultNamespace("admin.datakeys").build();
153+
keyVaultNamespace("keyvault.datakeys").build();
154154
clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
155155
}
156156

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public void setUp() throws IOException, URISyntaxException {
7474

7575
/* Step 1: get unencrypted client and recreate keys collection */
7676
client = getMongoClient();
77-
MongoDatabase admin = client.getDatabase("admin");
78-
MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
77+
MongoDatabase keyvaultDatabase = client.getDatabase("keyvault");
78+
MongoCollection<BsonDocument> datakeys = keyvaultDatabase.getCollection("datakeys", BsonDocument.class)
7979
.withWriteConcern(WriteConcern.MAJORITY);
8080
FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
8181
datakeys.drop(voidCallback);

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionMongocryptdSpawnBypassTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
public class ClientSideEncryptionMongocryptdSpawnBypassTest extends DatabaseTestCase {
4141
private final File pidFile;
4242
private final Map<String, Map<String, Object>> kmsProviders;
43-
private final MongoNamespace keyVaultNamespace = new MongoNamespace("admin.datakeys");
43+
private final MongoNamespace keyVaultNamespace = new MongoNamespace("keyvault.datakeys");
4444

4545
public ClientSideEncryptionMongocryptdSpawnBypassTest() throws IOException {
4646
assumeFalse(isNotAtLeastJava8());

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ public void setUp() {
156156
callback.get(30, TimeUnit.SECONDS);
157157
}
158158

159-
/* Insert data into the "admin.datakeys" key vault. */
160-
collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
159+
/* Insert data into the "keyvault.datakeys" key vault. */
160+
collection = getMongoClient().getDatabase("keyvault").getCollection("datakeys", BsonDocument.class)
161161
.withWriteConcern(WriteConcern.MAJORITY);
162162
callback = new FutureResultCallback<Void>();
163163
collection.drop(callback);
@@ -224,7 +224,7 @@ public void setUp() {
224224
}
225225
}
226226

227-
String keyVaultNamespace = "admin.datakeys";
227+
String keyVaultNamespace = "keyvault.datakeys";
228228
if (cryptOptions.containsKey("keyVaultNamespace")) {
229229
keyVaultNamespace = cryptOptions.getString("keyVaultNamespace").getValue();
230230
}

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void setUp() {
7171
kmsProviders.put("local", localMasterkey);
7272

7373
AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
74-
.keyVaultNamespace("admin.datakeys")
74+
.keyVaultNamespace("keyvault.datakeys")
7575
.kmsProviders(kmsProviders);
7676

7777
AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();

driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void main(final String[] args) {
5959
}});
6060
}};
6161

62-
String keyVaultNamespace = "admin.datakeys";
62+
String keyVaultNamespace = "keyvault.datakeys";
6363
ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
6464
.keyVaultMongoClientSettings(MongoClientSettings.builder()
6565
.applyConnectionString(new ConnectionString("mongodb://localhost"))

driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void main(final String[] args) {
5252
}});
5353
}};
5454

55-
String keyVaultNamespace = "admin.datakeys";
55+
String keyVaultNamespace = "keyvault.datakeys";
5656

5757
AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
5858
.keyVaultNamespace(keyVaultNamespace)

0 commit comments

Comments
 (0)