Skip to content

Commit 105ae56

Browse files
mdb-admdb-ad
committed
sync tests
1 parent e61c368 commit 105ae56

File tree

100 files changed

+1639
-860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1639
-860
lines changed

‎src/libmongoc/tests/json/client_side_encryption/unified/aggregate.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}

‎src/libmongoc/tests/json/client_side_encryption/unified/awsTemporary.json

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,19 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
15-
"awsTemporary": {}
16+
"aws": {
17+
"accessKeyId": {
18+
"$$placeholder": 1
19+
},
20+
"secretAccessKey": {
21+
"$$placeholder": 1
22+
},
23+
"sessionToken": {
24+
"$$placeholder": 1
25+
}
26+
}
1627
}
1728
},
1829
"observeEvents": [
@@ -38,8 +49,17 @@
3849
"client": {
3950
"id": "client1",
4051
"autoEncryptOpts": {
52+
"keyVaultNamespace": "keyvault.datakeys",
4153
"kmsProviders": {
42-
"awsTemporaryNoSessionToken": {}
54+
"aws": {
55+
"accessKeyId": {
56+
"$$placeholder": 1
57+
},
58+
"secretAccessKey": {
59+
"$$placeholder": 1
60+
},
61+
"sessionToken": "bad"
62+
}
4363
}
4464
},
4565
"observeEvents": [

‎src/libmongoc/tests/json/client_side_encryption/unified/azureKMS.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"azure": {}
1617
}

‎src/libmongoc/tests/json/client_side_encryption/unified/badSchema.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"schemaMap": {
1516
"default.default": {
1617
"properties": {
@@ -39,9 +40,6 @@
3940
},
4041
"secretAccessKey": {
4142
"$$placeholder": 1
42-
},
43-
"sessionToken": {
44-
"$$placeholder": 1
4543
}
4644
}
4745
}
@@ -69,6 +67,7 @@
6967
"client": {
7068
"id": "client1",
7169
"autoEncryptOpts": {
70+
"keyVaultNamespace": "keyvault.datakeys",
7271
"schemaMap": {
7372
"default.default": {
7473
"properties": {
@@ -100,9 +99,6 @@
10099
},
101100
"secretAccessKey": {
102101
"$$placeholder": 1
103-
},
104-
"sessionToken": {
105-
"$$placeholder": 1
106102
}
107103
}
108104
}
@@ -130,6 +126,7 @@
130126
"client": {
131127
"id": "client2",
132128
"autoEncryptOpts": {
129+
"keyVaultNamespace": "keyvault.datakeys",
133130
"schemaMap": {
134131
"default.default": {
135132
"properties": {
@@ -158,9 +155,6 @@
158155
},
159156
"secretAccessKey": {
160157
"$$placeholder": 1
161-
},
162-
"sessionToken": {
163-
"$$placeholder": 1
164158
}
165159
}
166160
}
@@ -188,6 +182,7 @@
188182
"client": {
189183
"id": "client3",
190184
"autoEncryptOpts": {
185+
"keyVaultNamespace": "keyvault.datakeys",
191186
"schemaMap": {
192187
"default.default": {
193188
"anyOf": [
@@ -219,9 +214,6 @@
219214
},
220215
"secretAccessKey": {
221216
"$$placeholder": 1
222-
},
223-
"sessionToken": {
224-
"$$placeholder": 1
225217
}
226218
}
227219
}

‎src/libmongoc/tests/json/client_side_encryption/unified/basic.json

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}
@@ -43,6 +41,28 @@
4341
"database": "db",
4442
"collectionName": "default"
4543
}
44+
},
45+
{
46+
"client": {
47+
"id": "client_unencrypted",
48+
"observeEvents": [
49+
"commandStartedEvent"
50+
]
51+
}
52+
},
53+
{
54+
"database": {
55+
"id": "db_unencrypted",
56+
"client": "client_unencrypted",
57+
"databaseName": "default"
58+
}
59+
},
60+
{
61+
"collection": {
62+
"id": "coll_unencrypted",
63+
"database": "db_unencrypted",
64+
"collectionName": "default"
65+
}
4666
}
4767
],
4868
"initialData": [
@@ -307,20 +327,21 @@
307327
"random": "123"
308328
}
309329
]
310-
}
311-
],
312-
"outcome": [
330+
},
313331
{
314-
"documents": [
332+
"name": "find",
333+
"object": "coll_unencrypted",
334+
"arguments": {
335+
"filter": {}
336+
},
337+
"expectResult": [
315338
{
316339
"_id": 1,
317340
"random": {
318341
"$$type": "binData"
319342
}
320343
}
321-
],
322-
"collectionName": "default",
323-
"databaseName": "default"
344+
]
324345
}
325346
],
326347
"expectEvents": [

‎src/libmongoc/tests/json/client_side_encryption/unified/bulk.json

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}
@@ -43,6 +41,28 @@
4341
"database": "db",
4442
"collectionName": "default"
4543
}
44+
},
45+
{
46+
"client": {
47+
"id": "client_unencrypted",
48+
"observeEvents": [
49+
"commandStartedEvent"
50+
]
51+
}
52+
},
53+
{
54+
"database": {
55+
"id": "db_unencrypted",
56+
"client": "client_unencrypted",
57+
"databaseName": "default"
58+
}
59+
},
60+
{
61+
"collection": {
62+
"id": "coll_unencrypted",
63+
"database": "db_unencrypted",
64+
"collectionName": "default"
65+
}
4666
}
4767
],
4868
"initialData": [
@@ -205,11 +225,14 @@
205225
"ordered": true
206226
},
207227
"object": "coll"
208-
}
209-
],
210-
"outcome": [
228+
},
211229
{
212-
"documents": [
230+
"name": "find",
231+
"object": "coll_unencrypted",
232+
"arguments": {
233+
"filter": {}
234+
},
235+
"expectResult": [
213236
{
214237
"_id": 1,
215238
"encrypted_string": {
@@ -222,9 +245,7 @@
222245
"$$type": "binData"
223246
}
224247
}
225-
],
226-
"collectionName": "default",
227-
"databaseName": "default"
248+
]
228249
}
229250
],
230251
"expectEvents": [

‎src/libmongoc/tests/json/client_side_encryption/unified/bypassAutoEncryption.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"bypassAutoEncryption": true,
1516
"kmsProviders": {
1617
"aws": {
@@ -19,9 +20,6 @@
1920
},
2021
"secretAccessKey": {
2122
"$$placeholder": 1
22-
},
23-
"sessionToken": {
24-
"$$placeholder": 1
2523
}
2624
}
2725
}

‎src/libmongoc/tests/json/client_side_encryption/unified/bypassedCommand.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}

‎src/libmongoc/tests/json/client_side_encryption/unified/count.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}

‎src/libmongoc/tests/json/client_side_encryption/unified/countDocuments.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}

‎src/libmongoc/tests/json/client_side_encryption/unified/create-and-createIndexes.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"local": {
16-
"key": {
17-
"$binary": {
18-
"base64": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk",
19-
"subType": "00"
20-
}
21-
}
17+
"key": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk"
2218
}
2319
}
2420
},

‎src/libmongoc/tests/json/client_side_encryption/unified/delete.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
"client": {
1212
"id": "client0",
1313
"autoEncryptOpts": {
14+
"keyVaultNamespace": "keyvault.datakeys",
1415
"kmsProviders": {
1516
"aws": {
1617
"accessKeyId": {
1718
"$$placeholder": 1
1819
},
1920
"secretAccessKey": {
2021
"$$placeholder": 1
21-
},
22-
"sessionToken": {
23-
"$$placeholder": 1
2422
}
2523
}
2624
}

0 commit comments

Comments
 (0)