Skip to content

Commit 14b96e7

Browse files
committed
Ensure client-side encryption prose test runs in CI
* Don't use Java 8+ Base64 type in field initializer * Only run on MongoDB 4.2+ since that is required for auto-encryption
1 parent 26f72b9 commit 14b96e7

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import org.bson.BsonDocument
2929
import org.bson.BsonString
3030

3131
import static com.mongodb.ClusterFixture.isNotAtLeastJava8
32+
import static com.mongodb.ClusterFixture.serverVersionAtLeast
3233
import static com.mongodb.client.Fixture.getDefaultDatabaseName
3334
import static com.mongodb.client.Fixture.getMongoClient
3435
import static com.mongodb.client.Fixture.getMongoClientSettings
@@ -48,24 +49,27 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
4849
private final MongoCollection<BsonDocument> dataCollection = getMongoClient()
4950
.getDatabase(autoEncryptingCollectionNamespace.databaseName).getCollection(autoEncryptingCollectionNamespace.collectionName,
5051
BsonDocument)
51-
private final Map<String, Map<String, ? extends Object>> providerProperties =
52-
['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')],
53-
'aws' : ['accessKeyId' : System.getProperty('org.mongodb.test.awsAccessKeyId'),
54-
'secretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey')]
55-
]
5652

5753
private MongoClient autoEncryptingClient
5854
private ClientEncryption clientEncryption
5955
private MongoCollection<BsonDocument> autoEncryptingDataCollection
6056

6157
def setup() {
6258
assumeFalse(isNotAtLeastJava8())
59+
assumeTrue(serverVersionAtLeast(4, 2))
6360
assumeTrue('Key vault tests disabled',
6461
System.getProperty('org.mongodb.test.awsAccessKeyId') != null
6562
&& !System.getProperty('org.mongodb.test.awsAccessKeyId').isEmpty())
6663
dataKeyCollection.drop()
6764
dataCollection.drop()
6865

66+
def providerProperties =
67+
['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'
68+
+ '3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')],
69+
'aws' : ['accessKeyId' : System.getProperty('org.mongodb.test.awsAccessKeyId'),
70+
'secretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey')]
71+
]
72+
6973
autoEncryptingClient = MongoClients.create(getMongoClientSettingsBuilder()
7074
.autoEncryptionSettings(AutoEncryptionSettings.builder()
7175
.keyVaultNamespace(keyVaultNamespace.fullName)

0 commit comments

Comments
 (0)