@@ -29,6 +29,7 @@ import org.bson.BsonDocument
29
29
import org.bson.BsonString
30
30
31
31
import static com.mongodb.ClusterFixture.isNotAtLeastJava8
32
+ import static com.mongodb.ClusterFixture.serverVersionAtLeast
32
33
import static com.mongodb.client.Fixture.getDefaultDatabaseName
33
34
import static com.mongodb.client.Fixture.getMongoClient
34
35
import static com.mongodb.client.Fixture.getMongoClientSettings
@@ -48,24 +49,27 @@ class ClientSideEncryptionProseTestSpecification extends FunctionalSpecification
48
49
private final MongoCollection<BsonDocument > dataCollection = getMongoClient()
49
50
.getDatabase(autoEncryptingCollectionNamespace. databaseName). getCollection(autoEncryptingCollectionNamespace. collectionName,
50
51
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
- ]
56
52
57
53
private MongoClient autoEncryptingClient
58
54
private ClientEncryption clientEncryption
59
55
private MongoCollection<BsonDocument > autoEncryptingDataCollection
60
56
61
57
def setup () {
62
58
assumeFalse(isNotAtLeastJava8())
59
+ assumeTrue(serverVersionAtLeast(4 , 2 ))
63
60
assumeTrue(' Key vault tests disabled' ,
64
61
System . getProperty(' org.mongodb.test.awsAccessKeyId' ) != null
65
62
&& ! System . getProperty(' org.mongodb.test.awsAccessKeyId' ). isEmpty())
66
63
dataKeyCollection. drop()
67
64
dataCollection. drop()
68
65
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
+
69
73
autoEncryptingClient = MongoClients . create(getMongoClientSettingsBuilder()
70
74
.autoEncryptionSettings(AutoEncryptionSettings . builder()
71
75
.keyVaultNamespace(keyVaultNamespace. fullName)
0 commit comments