Write to data key collection with majority write concern

JAVA-3464

Author: jyemin

driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptionImpl.java

@@ -18,6 +18,7 @@
 
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.client.internal.Crypt;
 import com.mongodb.async.client.internal.Crypts;
@@ -60,6 +61,7 @@ public void onResult(final RawBsonDocument dataKeyDocument, final Throwable t) {
                     MongoNamespace namespace = new MongoNamespace(options.getKeyVaultNamespace());
                     keyVaultClient.getDatabase(namespace.getDatabaseName())
                             .getCollection(namespace.getCollectionName(), BsonDocument.class)
+                            .withWriteConcern(WriteConcern.MAJORITY)
                             .insertOne(dataKeyDocument, new SingleResultCallback<Void>() {
                                 @Override
                                 public void onResult(final Void result, final Throwable t) {

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionProseTestSpecification.groovy

@@ -20,11 +20,14 @@ import com.mongodb.AutoEncryptionSettings
 import com.mongodb.ClientEncryptionSettings
 import com.mongodb.MongoClientException
 import com.mongodb.MongoNamespace
+import com.mongodb.WriteConcern
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.client.vault.ClientEncryption
 import com.mongodb.async.client.vault.ClientEncryptions
 import com.mongodb.client.model.vault.DataKeyOptions
 import com.mongodb.client.model.vault.EncryptOptions
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
 import org.bson.BsonBinarySubType
 import org.bson.BsonDocument
 import org.bson.BsonString
@@ -34,7 +37,6 @@ import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
 import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString
-import static com.mongodb.async.client.Fixture.getMongoClientSettings
 import static com.mongodb.client.model.Filters.eq
 import static java.util.Collections.singletonMap
 import static org.junit.Assume.assumeFalse
@@ -51,6 +53,7 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
     private MongoClient autoEncryptingClient
     private ClientEncryption clientEncryption
     private MongoCollection<BsonDocument> autoEncryptingDataCollection
+    private TestCommandListener commandListener
 
     def setup() {
         assumeFalse(isNotAtLeastJava8())
@@ -93,8 +96,12 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
         autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
                 .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
 
+        commandListener = new TestCommandListener()
+
         clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(getMongoClientSettings())
+                .keyVaultMongoClientSettings(getMongoClientBuilderFromConnectionString()
+                        .addCommandListener(commandListener)
+                        .build())
                 .keyVaultNamespace(keyVaultNamespace.fullName)
                 .kmsProviders(providerProperties)
                 .build())
@@ -107,6 +114,11 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
         def localDataKeyId = callback.get()
 
         then:
+        commandListener.getCommandStartedEvents().size() == 1
+        def event = commandListener.getCommandStartedEvents().get(0) as CommandStartedEvent
+        event.getCommand().containsKey('writeConcern')
+        event.getCommand().getDocument('writeConcern') == WriteConcern.MAJORITY.asDocument()
+
         localDataKeyId != null
         localDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
 

driver-sync/src/main/com/mongodb/client/internal/ClientEncryptionImpl.java

@@ -18,6 +18,7 @@
 
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.model.vault.DataKeyOptions;
@@ -51,6 +52,7 @@ public BsonBinary createDataKey(final String kmsProvider, final DataKeyOptions d
 
         MongoNamespace namespace = new MongoNamespace(options.getKeyVaultNamespace());
         keyVaultClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY)
                 .insertOne(dataKeyDocument);
         return dataKeyDocument.getBinary("_id");
     }

driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionProseTestSpecification.groovy

@@ -20,10 +20,13 @@ import com.mongodb.AutoEncryptionSettings
 import com.mongodb.ClientEncryptionSettings
 import com.mongodb.MongoClientException
 import com.mongodb.MongoNamespace
+import com.mongodb.WriteConcern
 import com.mongodb.client.model.vault.DataKeyOptions
 import com.mongodb.client.model.vault.EncryptOptions
 import com.mongodb.client.vault.ClientEncryption
 import com.mongodb.client.vault.ClientEncryptions
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
 import org.bson.BsonBinarySubType
 import org.bson.BsonDocument
 import org.bson.BsonString
@@ -32,7 +35,6 @@ import static com.mongodb.ClusterFixture.isNotAtLeastJava8
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.client.Fixture.getMongoClient
-import static com.mongodb.client.Fixture.getMongoClientSettings
 import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder
 import static com.mongodb.client.model.Filters.eq
 import static java.util.Collections.singletonMap
@@ -53,6 +55,7 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
     private MongoClient autoEncryptingClient
     private ClientEncryption clientEncryption
     private MongoCollection<BsonDocument> autoEncryptingDataCollection
+    private TestCommandListener commandListener
 
     def setup() {
         assumeFalse(isNotAtLeastJava8())
@@ -95,8 +98,11 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
         autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
                 .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
 
+        commandListener = new TestCommandListener()
         clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(getMongoClientSettings())
+                .keyVaultMongoClientSettings(getMongoClientSettingsBuilder()
+                        .addCommandListener(commandListener)
+                        .build())
                 .keyVaultNamespace(keyVaultNamespace.fullName)
                 .kmsProviders(providerProperties)
                 .build())
@@ -107,6 +113,11 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
         def localDataKeyId = clientEncryption.createDataKey('local', new DataKeyOptions().keyAltNames(['local_altname']))
 
         then:
+        commandListener.getCommandStartedEvents().size() == 1
+        def event = commandListener.getCommandStartedEvents().get(0) as CommandStartedEvent
+        event.getCommand().containsKey('writeConcern')
+        event.getCommand().getDocument('writeConcern') == WriteConcern.MAJORITY.asDocument()
+
         localDataKeyId != null
         localDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
         dataKeyCollection.find(eq('masterKey.provider', 'local')).into([]).size() == 1