Skip to content

Commit 3fe1ff2

Browse files
rozzajyemin
rozza
authored and
jyemin
committed
Use keyvault database for FLE tests
JAVA-3702
1 parent 3c8d9bc commit 3fe1ff2

36 files changed

+1710
-1645
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void setUp() {
8888
ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
8989
keyVaultMongoClientSettings(Fixture.getMongoClientSettings())
9090
.kmsProviders(kmsProviders)
91-
.keyVaultNamespace("admin.datakeys");
91+
.keyVaultNamespace("keyvault.datakeys");
9292

9393
ClientEncryptionSettings clientEncryptionSettings = clientEncryptionSettingsBuilder.build();
9494
clientEncryption = ClientEncryptions.create(clientEncryptionSettings);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void setUp() throws IOException, URISyntaxException {
100100
.append("validator", new BsonDocument("$jsonSchema", schemaDocument)), documentCallback);
101101
documentCallback.get();
102102

103-
// Step 3: Drop and create admin.datakeys
103+
// Step 3: Drop and create keyvault.datakeys
104104
MongoDatabase adminDatabase = client.getDatabase("admin");
105105
MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
106106
.withWriteConcern(WriteConcern.MAJORITY);
@@ -133,7 +133,7 @@ public void setUp() throws IOException, URISyntaxException {
133133
schemaMap.put("db.coll", schemaDocument);
134134

135135
AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
136-
.keyVaultNamespace("admin.datakeys")
136+
.keyVaultNamespace("keyvault.datakeys")
137137
.kmsProviders(kmsProviders);
138138

139139
if (useLocalSchema) {

‎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
@@ -97,7 +97,7 @@ public void setUp() throws IOException, URISyntaxException {
9797
schemaMap.put("db.coll", bsonDocumentFromPath("external-schema.json"));
9898

9999
AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
100-
.keyVaultNamespace("admin.datakeys")
100+
.keyVaultNamespace("keyvault.datakeys")
101101
.kmsProviders(kmsProviders)
102102
.schemaMap(schemaMap);
103103

@@ -119,7 +119,7 @@ public void setUp() throws IOException, URISyntaxException {
119119
ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
120120
keyVaultMongoClientSettings(getMongoClientBuilderFromConnectionString().build())
121121
.kmsProviders(kmsProviders)
122-
.keyVaultNamespace("admin.datakeys");
122+
.keyVaultNamespace("keyvault.datakeys");
123123

124124
if (withExternalKeyVault) {
125125
clientEncryptionSettingsBuilder.keyVaultMongoClientSettings(externalClientSettings);

‎driver-core/src/test/resources/client-side-encryption-limits/limits-doc.json‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
11
{
2-
"00": "a",
3-
"01": "a",
4-
"02": "a",
5-
"03": "a",
6-
"04": "a",
7-
"05": "a",
8-
"06": "a",
9-
"07": "a",
10-
"08": "a",
11-
"09": "a",
12-
"10": "a",
13-
"11": "a",
14-
"12": "a",
15-
"13": "a",
16-
"14": "a",
17-
"15": "a",
18-
"16": "a",
19-
"17": "a",
20-
"18": "a",
21-
"19": "a",
22-
"20": "a",
23-
"21": "a",
24-
"22": "a",
25-
"23": "a",
26-
"24": "a",
27-
"25": "a",
28-
"26": "a",
29-
"27": "a",
30-
"28": "a",
31-
"29": "a",
32-
"30": "a",
33-
"31": "a",
34-
"32": "a",
35-
"33": "a",
36-
"34": "a",
37-
"35": "a",
38-
"36": "a",
39-
"37": "a",
40-
"38": "a",
41-
"39": "a",
42-
"40": "a",
43-
"41": "a",
44-
"42": "a",
45-
"43": "a",
46-
"44": "a",
47-
"45": "a",
48-
"46": "a",
49-
"47": "a",
50-
"48": "a",
51-
"49": "a",
52-
"50": "a",
53-
"51": "a",
54-
"52": "a",
55-
"53": "a",
56-
"54": "a",
57-
"55": "a",
58-
"56": "a",
59-
"57": "a",
60-
"58": "a",
61-
"59": "a",
62-
"60": "a",
63-
"61": "a",
64-
"62": "a",
65-
"63": "a",
66-
"64": "a",
67-
"65": "a",
68-
"66": "a",
69-
"67": "a",
70-
"68": "a",
71-
"69": "a",
72-
"70": "a",
73-
"71": "a",
74-
"72": "a",
75-
"73": "a",
76-
"74": "a",
77-
"75": "a",
78-
"76": "a",
79-
"77": "a",
80-
"78": "a",
81-
"79": "a",
82-
"80": "a",
83-
"81": "a",
84-
"82": "a",
85-
"83": "a",
86-
"84": "a",
87-
"85": "a",
88-
"86": "a",
89-
"87": "a",
90-
"88": "a",
91-
"89": "a",
92-
"90": "a",
93-
"91": "a",
94-
"92": "a",
95-
"93": "a",
96-
"94": "a",
97-
"95": "a",
98-
"96": "a",
99-
"97": "a",
100-
"98": "a",
101-
"99": "a"
102-
}
2+
"00": "a",
3+
"01": "a",
4+
"02": "a",
5+
"03": "a",
6+
"04": "a",
7+
"05": "a",
8+
"06": "a",
9+
"07": "a",
10+
"08": "a",
11+
"09": "a",
12+
"10": "a",
13+
"11": "a",
14+
"12": "a",
15+
"13": "a",
16+
"14": "a",
17+
"15": "a",
18+
"16": "a",
19+
"17": "a",
20+
"18": "a",
21+
"19": "a",
22+
"20": "a",
23+
"21": "a",
24+
"22": "a",
25+
"23": "a",
26+
"24": "a",
27+
"25": "a",
28+
"26": "a",
29+
"27": "a",
30+
"28": "a",
31+
"29": "a",
32+
"30": "a",
33+
"31": "a",
34+
"32": "a",
35+
"33": "a",
36+
"34": "a",
37+
"35": "a",
38+
"36": "a",
39+
"37": "a",
40+
"38": "a",
41+
"39": "a",
42+
"40": "a",
43+
"41": "a",
44+
"42": "a",
45+
"43": "a",
46+
"44": "a",
47+
"45": "a",
48+
"46": "a",
49+
"47": "a",
50+
"48": "a",
51+
"49": "a",
52+
"50": "a",
53+
"51": "a",
54+
"52": "a",
55+
"53": "a",
56+
"54": "a",
57+
"55": "a",
58+
"56": "a",
59+
"57": "a",
60+
"58": "a",
61+
"59": "a",
62+
"60": "a",
63+
"61": "a",
64+
"62": "a",
65+
"63": "a",
66+
"64": "a",
67+
"65": "a",
68+
"66": "a",
69+
"67": "a",
70+
"68": "a",
71+
"69": "a",
72+
"70": "a",
73+
"71": "a",
74+
"72": "a",
75+
"73": "a",
76+
"74": "a",
77+
"75": "a",
78+
"76": "a",
79+
"77": "a",
80+
"78": "a",
81+
"79": "a",
82+
"80": "a",
83+
"81": "a",
84+
"82": "a",
85+
"83": "a",
86+
"84": "a",
87+
"85": "a",
88+
"86": "a",
89+
"87": "a",
90+
"88": "a",
91+
"89": "a",
92+
"90": "a",
93+
"91": "a",
94+
"92": "a",
95+
"93": "a",
96+
"94": "a",
97+
"95": "a",
98+
"96": "a",
99+
"97": "a",
100+
"98": "a",
101+
"99": "a"
102+
}

‎driver-core/src/test/resources/client-side-encryption-limits/limits-key.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"status": {
3-
"$numberInt": "1"
4-
},
5-
"_id": {
6-
"$binary": {
7-
"base64": "LOCALAAAAAAAAAAAAAAAAA==",
8-
"subType": "04"
9-
}
10-
},
11-
"masterKey": {
12-
"provider": "local"
13-
},
14-
"updateDate": {
15-
"$date": {
16-
"$numberLong": "1557827033449"
17-
}
18-
},
19-
"keyMaterial": {
20-
"$binary": {
21-
"base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==",
22-
"subType": "00"
23-
}
24-
},
25-
"creationDate": {
26-
"$date": {
27-
"$numberLong": "1557827033449"
28-
}
29-
},
30-
"keyAltNames": [ "local" ]
31-
}
2+
"status": {
3+
"$numberInt": "1"
4+
},
5+
"_id": {
6+
"$binary": {
7+
"base64": "LOCALAAAAAAAAAAAAAAAAA==",
8+
"subType": "04"
9+
}
10+
},
11+
"masterKey": {
12+
"provider": "local"
13+
},
14+
"updateDate": {
15+
"$date": {
16+
"$numberLong": "1557827033449"
17+
}
18+
},
19+
"keyMaterial": {
20+
"$binary": {
21+
"base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==",
22+
"subType": "00"
23+
}
24+
},
25+
"creationDate": {
26+
"$date": {
27+
"$numberLong": "1557827033449"
28+
}
29+
},
30+
"keyAltNames": [ "local" ]
31+
}

0 commit comments

Comments
 (0)