Skip to content

Support auto encryption in unified tests #1727

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+59 −2
Draft

Support auto encryption in unified tests #1727

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
3 changes: 3 additions & 0 deletions driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ public void create(final WriteConcern writeConcern, final BsonDocument createOpt
case "size":
createCollectionOptions.sizeInBytes(createOptions.getNumber("size").longValue());
break;
case "encryptedFields":
createCollectionOptions.encryptedFields(createOptions.getDocument("encryptedFields"));
break;
default:
throw new UnsupportedOperationException("Unsupported create collection option: " + option);
}
Expand Down
56 changes: 55 additions & 1 deletion driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.mongodb.client.unified;

import com.mongodb.AutoEncryptionSettings;
import com.mongodb.ClientEncryptionSettings;
import com.mongodb.ClientSessionOptions;
import com.mongodb.ConnectionString;
Expand Down Expand Up @@ -111,7 +112,7 @@
public final class Entities {
private static final Set<String> SUPPORTED_CLIENT_ENTITY_OPTIONS = new HashSet<>(
asList(
"id", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
"id", "autoEncryptOpts", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
"observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents"));
private final Set<String> entityNames = new HashSet<>();
private final Map<String, ExecutorService> threads = new HashMap<>();
Expand Down Expand Up @@ -604,6 +605,59 @@ private void initClient(final BsonDocument entity, final String id,
}
clientSettingsBuilder.serverApi(serverApiBuilder.build());
}
if (entity.containsKey("autoEncryptOpts")) {
AutoEncryptionSettings.Builder builder = AutoEncryptionSettings.builder();
for (Map.Entry<String, BsonValue> entry : entity.getDocument("autoEncryptOpts").entrySet()) {
switch (entry.getKey()) {
case "bypassAutoEncryption":
builder.bypassAutoEncryption(entry.getValue().asBoolean().getValue());
break;
case "bypassQueryAnalysis":
builder.bypassQueryAnalysis(entry.getValue().asBoolean().getValue());
break;
case "schemaMap":
Map<String, BsonDocument> schemaMap = new HashMap<>();
for (Map.Entry<String, BsonValue> entries : entry.getValue().asDocument().entrySet()) {
schemaMap.put(entries.getKey(), entries.getValue().asDocument());
}
builder.schemaMap(schemaMap);
break;
case "encryptedFieldsMap":
Map<String, BsonDocument> encryptedFieldsMap = new HashMap<>();
for (Map.Entry<String, BsonValue> entries : entry.getValue().asDocument().entrySet()) {
encryptedFieldsMap.put(entries.getKey(), entries.getValue().asDocument());
}
builder.encryptedFieldsMap(encryptedFieldsMap);
break;
case "extraOptions":
Map<String, Object> extraOptions = new HashMap<>();
for (Map.Entry<String, BsonValue> extraOptionsEntry : entry.getValue().asDocument().entrySet()) {
switch (extraOptionsEntry.getKey()) {
case "mongocryptdBypassSpawn":
extraOptions.put(extraOptionsEntry.getKey(), extraOptionsEntry.getValue().asBoolean().getValue());
break;
default:
throw new UnsupportedOperationException("Unsupported extra encryption option: " + extraOptionsEntry.getKey());
}
}
builder.extraOptions(extraOptions);
break;
case "keyVaultNamespace":
builder.keyVaultNamespace(entry.getValue().asString().getValue());
break;
case "kmsProviders":
builder.kmsProviders(createKmsProvidersMap(entry.getValue().asDocument()));
break;
case "keyExpirationMS":
builder.keyExpiration(entry.getValue().asNumber().longValue(), TimeUnit.MILLISECONDS);
break;
default:
throw new UnsupportedOperationException("Unsupported client encryption option: " + entry.getKey());
}
}
clientSettingsBuilder.autoEncryptionSettings(builder.build());
}

MongoClientSettings clientSettings = clientSettingsBuilder.build();

if (entity.containsKey("observeLogMessages")) {
Expand Down
2 changes: 1 addition & 1 deletion driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public abstract class UnifiedTest {
private static final Set<String> PRESTART_POOL_ASYNC_WORK_MANAGER_FILE_DESCRIPTIONS = Collections.singleton(
"wait queue timeout errors include details about checked out connections");

private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.22";
private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.23";
private static final List<Integer> MAX_SUPPORTED_SCHEMA_VERSION_COMPONENTS = Arrays.stream(MAX_SUPPORTED_SCHEMA_VERSION.split("\\."))
.map(Integer::parseInt)
.collect(Collectors.toList());
Expand Down