Skip to content

Commit f7c028a

Browse files
kevinAlbskevinAlbs
committed
remove escCollection and ecocCollection from test data
1 parent e30e83f commit f7c028a

14 files changed

+1
-83
lines changed

‎source/client-side-encryption/etc/data/encryptedFields-Range-Date.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-Decimal.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-DecimalPrecision.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-Double.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-DoublePrecision.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-Int.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields-Range-Long.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/data/encryptedFields.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"ecocCollection": "enxcol_.default.ecoc",
42
"fields": [
53
{
64
"keyId": {

‎source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml.template

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ tests:
1818
local: {{ local_provider() }}
1919
encryptedFieldsMap: {
2020
"default.default": {
21-
"escCollection": "enxcol_.default.esc",
22-
"ecocCollection": "enxcol_.default.ecoc",
2321
"fields": []
2422
}
2523
}

‎source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ tests:
4545
},
4646
"schema": {
4747
"default.default": {
48-
"fields": [],
49-
"escCollection": "enxcol_.default.esc",
50-
"ecocCollection": "enxcol_.default.ecoc"
48+
"fields": []
5149
}
5250
}
5351
}

‎source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
},
2323
"encryptedFieldsMap": {
2424
"default.encryptedCollection": {
25-
"escCollection": "enxcol_.encryptedCollection.esc",
26-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
2725
"fields": [
2826
{
2927
"path": "firstName",

‎source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ tests:
1616
aws: {} # Credentials filled in from environment.
1717
encryptedFieldsMap:
1818
default.encryptedCollection: &encrypted_fields0 {
19-
"escCollection": "enxcol_.encryptedCollection.esc",
20-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
2119
"fields": [
2220
{
2321
"path": "firstName",

‎source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
},
2323
"encryptedFieldsMap": {
2424
"default.encryptedCollection": {
25-
"escCollection": "enxcol_.encryptedCollection.esc",
26-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
2725
"fields": [
2826
{
2927
"path": "firstName",
@@ -160,8 +158,6 @@
160158
"command": {
161159
"create": "encryptedCollection",
162160
"encryptedFields": {
163-
"escCollection": "enxcol_.encryptedCollection.esc",
164-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
165161
"fields": [
166162
{
167163
"path": "firstName",
@@ -857,8 +853,6 @@
857853
},
858854
"encryptedFieldsMap": {
859855
"default.encryptedCollection": {
860-
"escCollection": "enxcol_.encryptedCollection.esc",
861-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
862856
"fields": [
863857
{
864858
"path": "firstName",
@@ -941,8 +935,6 @@
941935
},
942936
"encryptedFieldsMap": {
943937
"default.encryptedCollection": {
944-
"escCollection": "enxcol_.encryptedCollection.esc",
945-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
946938
"fields": [
947939
{
948940
"path": "firstName",
@@ -1079,8 +1071,6 @@
10791071
"command": {
10801072
"create": "encryptedCollection",
10811073
"encryptedFields": {
1082-
"escCollection": "enxcol_.encryptedCollection.esc",
1083-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
10841074
"fields": [
10851075
{
10861076
"path": "firstName",
@@ -1134,8 +1124,6 @@
11341124
"arguments": {
11351125
"collection": "encryptedCollection",
11361126
"encryptedFields": {
1137-
"escCollection": "enxcol_.encryptedCollection.esc",
1138-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
11391127
"fields": [
11401128
{
11411129
"path": "firstName",
@@ -1157,8 +1145,6 @@
11571145
"arguments": {
11581146
"collection": "encryptedCollection",
11591147
"encryptedFields": {
1160-
"escCollection": "enxcol_.encryptedCollection.esc",
1161-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
11621148
"fields": [
11631149
{
11641150
"path": "firstName",
@@ -1279,8 +1265,6 @@
12791265
"command": {
12801266
"create": "encryptedCollection",
12811267
"encryptedFields": {
1282-
"escCollection": "enxcol_.encryptedCollection.esc",
1283-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
12841268
"fields": [
12851269
{
12861270
"path": "firstName",
@@ -1339,8 +1323,6 @@
13391323
},
13401324
"encryptedFieldsMap": {
13411325
"default.encryptedCollection": {
1342-
"escCollection": "enxcol_.encryptedCollection.esc",
1343-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
13441326
"fields": [
13451327
{
13461328
"path": "firstName",
@@ -1413,8 +1395,6 @@
14131395
"arguments": {
14141396
"collection": "encryptedCollection",
14151397
"encryptedFields": {
1416-
"escCollection": "enxcol_.encryptedCollection.esc",
1417-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
14181398
"fields": [
14191399
{
14201400
"path": "firstName",
@@ -1436,8 +1416,6 @@
14361416
"arguments": {
14371417
"collection": "encryptedCollection",
14381418
"encryptedFields": {
1439-
"escCollection": "enxcol_.encryptedCollection.esc",
1440-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
14411419
"fields": [
14421420
{
14431421
"path": "firstName",
@@ -1500,8 +1478,6 @@
15001478
"arguments": {
15011479
"collection": "encryptedCollection",
15021480
"encryptedFields": {
1503-
"escCollection": "enxcol_.encryptedCollection.esc",
1504-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
15051481
"fields": [
15061482
{
15071483
"path": "firstName",
@@ -1605,8 +1581,6 @@
16051581
"command": {
16061582
"create": "encryptedCollection",
16071583
"encryptedFields": {
1608-
"escCollection": "enxcol_.encryptedCollection.esc",
1609-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
16101584
"fields": [
16111585
{
16121586
"path": "firstName",
@@ -1700,8 +1674,6 @@
17001674
"arguments": {
17011675
"collection": "encryptedCollection",
17021676
"encryptedFields": {
1703-
"escCollection": "enxcol_.encryptedCollection.esc",
1704-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
17051677
"fields": [
17061678
{
17071679
"path": "firstName",
@@ -1723,8 +1695,6 @@
17231695
"arguments": {
17241696
"collection": "encryptedCollection",
17251697
"encryptedFields": {
1726-
"escCollection": "enxcol_.encryptedCollection.esc",
1727-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
17281698
"fields": [
17291699
{
17301700
"path": "firstName",
@@ -1876,8 +1846,6 @@
18761846
"command": {
18771847
"create": "encryptedCollection",
18781848
"encryptedFields": {
1879-
"escCollection": "enxcol_.encryptedCollection.esc",
1880-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
18811849
"fields": [
18821850
{
18831851
"path": "firstName",

‎source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ tests:
1717
aws: {} # Credentials filled in from environment.
1818
encryptedFieldsMap:
1919
default.encryptedCollection: &encrypted_fields0 {
20-
"escCollection": "enxcol_.encryptedCollection.esc",
21-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
2220
"fields": [
2321
{
2422
"path": "firstName",
@@ -376,8 +374,6 @@ tests:
376374
# encryptedCollection has encryptedCollection.esc as the escCollection.
377375
# encryptedCollection.esc has encryptedCollection as the escCollection.
378376
default.encryptedCollection: &encrypted_fields3 {
379-
"escCollection": "enxcol_.encryptedCollection.esc",
380-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
381377
"fields": [
382378
{
383379
"path": "firstName",
@@ -387,8 +383,6 @@ tests:
387383
]
388384
}
389385
default.encryptedCollection.esc: {
390-
"escCollection": "enxcol_.encryptedCollection.esc",
391-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
392386
"fields": [
393387
{
394388
"path": "firstName",
@@ -489,8 +483,6 @@ tests:
489483
aws: {} # Credentials filled in from environment.
490484
encryptedFieldsMap:
491485
default.encryptedCollection: {
492-
"escCollection": "enxcol_.encryptedCollection.esc",
493-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
494486
"fields": [
495487
{
496488
"path": "firstName",
@@ -542,8 +534,6 @@ tests:
542534
aws: {} # Credentials filled in from environment.
543535
encryptedFieldsMap:
544536
default.encryptedCollection: &encrypted_fields4 {
545-
"escCollection": "enxcol_.encryptedCollection.esc",
546-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
547537
"fields": [
548538
{
549539
"path": "firstName",
@@ -650,8 +640,6 @@ tests:
650640
arguments:
651641
collection: "encryptedCollection"
652642
encryptedFields: {
653-
"escCollection": "enxcol_.encryptedCollection.esc",
654-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
655643
"fields": [
656644
{
657645
"path": "firstName",
@@ -665,8 +653,6 @@ tests:
665653
arguments:
666654
collection: "encryptedCollection"
667655
encryptedFields: &encrypted_fields5 {
668-
"escCollection": "enxcol_.encryptedCollection.esc",
669-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
670656
"fields": [
671657
{
672658
"path": "firstName",
@@ -766,8 +752,6 @@ tests:
766752
aws: {} # Credentials filled in from environment.
767753
encryptedFieldsMap:
768754
default.encryptedCollection: {
769-
"escCollection": "enxcol_.encryptedCollection.esc",
770-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
771755
"fields": [
772756
{
773757
"path": "firstName",
@@ -812,8 +796,6 @@ tests:
812796
arguments:
813797
collection: "encryptedCollection"
814798
encryptedFields: {
815-
"escCollection": "enxcol_.encryptedCollection.esc",
816-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
817799
"fields": [
818800
{
819801
"path": "firstName",
@@ -827,8 +809,6 @@ tests:
827809
arguments:
828810
collection: "encryptedCollection"
829811
encryptedFields: {
830-
"escCollection": "enxcol_.encryptedCollection.esc",
831-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
832812
"fields": [
833813
{
834814
"path": "firstName",
@@ -868,8 +848,6 @@ tests:
868848
arguments:
869849
collection: "encryptedCollection"
870850
encryptedFields: &encrypted_fields6 {
871-
"escCollection": "enxcol_.encryptedCollection.esc",
872-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
873851
"fields": [
874852
{
875853
"path": "firstName",
@@ -979,8 +957,6 @@ tests:
979957
arguments:
980958
collection: "encryptedCollection"
981959
encryptedFields: {
982-
"escCollection": "enxcol_.encryptedCollection.esc",
983-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
984960
"fields": [
985961
{
986962
"path": "firstName",
@@ -994,8 +970,6 @@ tests:
994970
arguments:
995971
collection: "encryptedCollection"
996972
encryptedFields: &encrypted_fields7 {
997-
"escCollection": "enxcol_.encryptedCollection.esc",
998-
"ecocCollection": "enxcol_.encryptedCollection.ecoc",
999973
"fields": [
1000974
{
1001975
"path": "firstName",

0 commit comments

Comments
 (0)