Skip to content

Commit e1a8678

Browse files
baileympearsonbaileympearson
authored
Merge branch 'main' into fix/rewind
2 parents e6fd591 + b2511f0 commit e1a8678

File tree

45 files changed

+1156
-643
lines changed

Some content is hidden

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

45 files changed

+1156
-643
lines changed

‎.evergreen/ci_matrix_constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const versions = [
33
{ codeName: 'gallium', versionNumber: 16, npmVersion: 9 },
44
{ codeName: 'hydrogen', versionNumber: 18, npmVersion: 10 },
55
{ codeName: 'iron', versionNumber: 20, npmVersion: 'latest' },
6-
{ codeName: 'jod', versionNumber: 22, npmVersion: 'latest' },
6+
{ codeName: 'jod', versionNumber: 22, npmVersion: 'latest' }
77
];
88
const NODE_VERSIONS = versions.map(({ versionNumber }) => versionNumber).sort();
99
const LOWEST_LTS = NODE_VERSIONS[0];

‎.evergreen/config.in.yml

Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ functions:
143143
working_dir: src
144144
binary: bash
145145
env:
146-
AUTH: 'auth'
147-
SSL: 'ssl'
146+
AUTH: "auth"
147+
SSL: "ssl"
148148
add_expansions_to_env: true
149149
args:
150150
- .evergreen/run-serverless-tests.sh
@@ -454,6 +454,9 @@ functions:
454454
- MONGODB_URI
455455
- DRIVERS_TOOLS
456456
- MONGODB_AWS_SDK
457+
- AWS_ACCESS_KEY_ID
458+
- AWS_SECRET_ACCESS_KEY
459+
- AWS_SESSION_TOKEN
457460
env:
458461
AWS_CREDENTIAL_TYPE: regular
459462
working_dir: "src"
@@ -469,6 +472,9 @@ functions:
469472
- MONGODB_URI
470473
- DRIVERS_TOOLS
471474
- MONGODB_AWS_SDK
475+
- AWS_ACCESS_KEY_ID
476+
- AWS_SECRET_ACCESS_KEY
477+
- AWS_SESSION_TOKEN
472478
env:
473479
AWS_CREDENTIAL_TYPE: assume-role
474480
working_dir: "src"
@@ -484,9 +490,12 @@ functions:
484490
- MONGODB_URI
485491
- DRIVERS_TOOLS
486492
- MONGODB_AWS_SDK
493+
- AWS_ACCESS_KEY_ID
494+
- AWS_SECRET_ACCESS_KEY
495+
- AWS_SESSION_TOKEN
487496
env:
488497
AWS_CREDENTIAL_TYPE: ec2
489-
IS_EC2: 'true'
498+
IS_EC2: "true"
490499
working_dir: src
491500
binary: bash
492501
args:
@@ -500,6 +509,9 @@ functions:
500509
- MONGODB_URI
501510
- DRIVERS_TOOLS
502511
- MONGODB_AWS_SDK
512+
- AWS_ACCESS_KEY_ID
513+
- AWS_SECRET_ACCESS_KEY
514+
- AWS_SESSION_TOKEN
503515
env:
504516
AWS_CREDENTIAL_TYPE: env-creds
505517
working_dir: "src"
@@ -515,6 +527,9 @@ functions:
515527
- MONGODB_URI
516528
- DRIVERS_TOOLS
517529
- MONGODB_AWS_SDK
530+
- AWS_ACCESS_KEY_ID
531+
- AWS_SECRET_ACCESS_KEY
532+
- AWS_SESSION_TOKEN
518533
env:
519534
AWS_CREDENTIAL_TYPE: session-creds
520535
working_dir: "src"
@@ -530,6 +545,9 @@ functions:
530545
- MONGODB_URI
531546
- DRIVERS_TOOLS
532547
- MONGODB_AWS_SDK
548+
- AWS_ACCESS_KEY_ID
549+
- AWS_SECRET_ACCESS_KEY
550+
- AWS_SESSION_TOKEN
533551
env:
534552
AWS_CREDENTIAL_TYPE: web-identity
535553
AWS_ROLE_SESSION_NAME: test
@@ -546,6 +564,9 @@ functions:
546564
- MONGODB_URI
547565
- DRIVERS_TOOLS
548566
- MONGODB_AWS_SDK
567+
- AWS_ACCESS_KEY_ID
568+
- AWS_SECRET_ACCESS_KEY
569+
- AWS_SESSION_TOKEN
549570
env:
550571
AWS_CREDENTIAL_TYPE: web-identity
551572
working_dir: "src"
@@ -562,6 +583,9 @@ functions:
562583
- MONGODB_AWS_SDK
563584
- PROJECT_DIRECTORY
564585
- MONGODB_BINARIES
586+
- AWS_ACCESS_KEY_ID
587+
- AWS_SECRET_ACCESS_KEY
588+
- AWS_SESSION_TOKEN
565589
env:
566590
AWS_CREDENTIAL_TYPE: web-identity
567591
working_dir: "src"
@@ -601,7 +625,7 @@ functions:
601625
- DRIVERS_TOOLS
602626
env:
603627
AWS_CREDENTIAL_TYPE: env-creds
604-
MONGODB_AWS_SDK: 'true'
628+
MONGODB_AWS_SDK: "true"
605629
working_dir: "src"
606630
binary: bash
607631
args:
@@ -650,6 +674,7 @@ functions:
650674
# compression tests.
651675
aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ \
652676
coverage/ \
677+
--exclude "results.*.json" \
653678
--exclude "*rhel80-large*" \
654679
--include "*fermiun"
655680
@@ -734,12 +759,12 @@ functions:
734759
- .evergreen/docker/alpine.sh
735760

736761
tasks:
737-
- name: 'test-atlas-data-lake'
762+
- name: "test-atlas-data-lake"
738763
tags: ["datalake", "mongohouse"]
739764
commands:
740-
- func: 'install dependencies'
741-
- func: 'bootstrap mongohoused'
742-
- func: 'run data lake tests'
765+
- func: "install dependencies"
766+
- func: "bootstrap mongohoused"
767+
- func: "run data lake tests"
743768

744769
- name: "test-serverless"
745770
tags: ["serverless"]
@@ -840,7 +865,8 @@ tasks:
840865
ENVIRONMENT: k8s
841866
K8S_VARIANT: eks
842867
SCRIPT: run-oidc-prose-tests.sh
843-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
868+
include_expansions_in_env:
869+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
844870
args:
845871
- .evergreen/run-oidc-tests-k8s.sh
846872

@@ -858,7 +884,8 @@ tasks:
858884
ENVIRONMENT: k8s
859885
K8S_VARIANT: gke
860886
SCRIPT: run-oidc-prose-tests.sh
861-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
887+
include_expansions_in_env:
888+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
862889
args:
863890
- .evergreen/run-oidc-tests-k8s.sh
864891

@@ -876,7 +903,8 @@ tasks:
876903
ENVIRONMENT: k8s
877904
K8S_VARIANT: aks
878905
SCRIPT: run-oidc-prose-tests.sh
879-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
906+
include_expansions_in_env:
907+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
880908
args:
881909
- .evergreen/run-oidc-tests-k8s.sh
882910

@@ -1143,11 +1171,12 @@ task_groups:
11431171
- command: subprocess.exec
11441172
params:
11451173
binary: bash
1146-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1174+
include_expansions_in_env:
1175+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
11471176
env:
11481177
MONGODB_VERSION: "8.0"
11491178
args:
1150-
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
1179+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
11511180
setup_group_can_fail_task: true
11521181
setup_group_timeout_secs: 1800
11531182
tasks:

‎.evergreen/config.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ functions:
397397
- MONGODB_URI
398398
- DRIVERS_TOOLS
399399
- MONGODB_AWS_SDK
400+
- AWS_ACCESS_KEY_ID
401+
- AWS_SECRET_ACCESS_KEY
402+
- AWS_SESSION_TOKEN
400403
env:
401404
AWS_CREDENTIAL_TYPE: regular
402405
working_dir: src
@@ -411,6 +414,9 @@ functions:
411414
- MONGODB_URI
412415
- DRIVERS_TOOLS
413416
- MONGODB_AWS_SDK
417+
- AWS_ACCESS_KEY_ID
418+
- AWS_SECRET_ACCESS_KEY
419+
- AWS_SESSION_TOKEN
414420
env:
415421
AWS_CREDENTIAL_TYPE: assume-role
416422
working_dir: src
@@ -425,6 +431,9 @@ functions:
425431
- MONGODB_URI
426432
- DRIVERS_TOOLS
427433
- MONGODB_AWS_SDK
434+
- AWS_ACCESS_KEY_ID
435+
- AWS_SECRET_ACCESS_KEY
436+
- AWS_SESSION_TOKEN
428437
env:
429438
AWS_CREDENTIAL_TYPE: ec2
430439
IS_EC2: 'true'
@@ -440,6 +449,9 @@ functions:
440449
- MONGODB_URI
441450
- DRIVERS_TOOLS
442451
- MONGODB_AWS_SDK
452+
- AWS_ACCESS_KEY_ID
453+
- AWS_SECRET_ACCESS_KEY
454+
- AWS_SESSION_TOKEN
443455
env:
444456
AWS_CREDENTIAL_TYPE: env-creds
445457
working_dir: src
@@ -454,6 +466,9 @@ functions:
454466
- MONGODB_URI
455467
- DRIVERS_TOOLS
456468
- MONGODB_AWS_SDK
469+
- AWS_ACCESS_KEY_ID
470+
- AWS_SECRET_ACCESS_KEY
471+
- AWS_SESSION_TOKEN
457472
env:
458473
AWS_CREDENTIAL_TYPE: session-creds
459474
working_dir: src
@@ -468,6 +483,9 @@ functions:
468483
- MONGODB_URI
469484
- DRIVERS_TOOLS
470485
- MONGODB_AWS_SDK
486+
- AWS_ACCESS_KEY_ID
487+
- AWS_SECRET_ACCESS_KEY
488+
- AWS_SESSION_TOKEN
471489
env:
472490
AWS_CREDENTIAL_TYPE: web-identity
473491
AWS_ROLE_SESSION_NAME: test
@@ -483,6 +501,9 @@ functions:
483501
- MONGODB_URI
484502
- DRIVERS_TOOLS
485503
- MONGODB_AWS_SDK
504+
- AWS_ACCESS_KEY_ID
505+
- AWS_SECRET_ACCESS_KEY
506+
- AWS_SESSION_TOKEN
486507
env:
487508
AWS_CREDENTIAL_TYPE: web-identity
488509
working_dir: src
@@ -498,6 +519,9 @@ functions:
498519
- MONGODB_AWS_SDK
499520
- PROJECT_DIRECTORY
500521
- MONGODB_BINARIES
522+
- AWS_ACCESS_KEY_ID
523+
- AWS_SECRET_ACCESS_KEY
524+
- AWS_SESSION_TOKEN
501525
env:
502526
AWS_CREDENTIAL_TYPE: web-identity
503527
working_dir: src
@@ -576,6 +600,7 @@ functions:
576600
# compression tests.
577601
aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ \
578602
coverage/ \
603+
--exclude "results.*.json" \
579604
--exclude "*rhel80-large*" \
580605
--include "*fermiun"
581606
@@ -1345,7 +1370,7 @@ tasks:
13451370
params:
13461371
updates:
13471372
- {key: VERSION, value: latest}
1348-
- {key: TOPOLOGY, value: sharded_cluster}
1373+
- {key: TOPOLOGY, value: server}
13491374
- {key: AUTH, value: noauth}
13501375
- {key: SSL, value: ssl}
13511376
- func: install dependencies
@@ -2752,7 +2777,6 @@ tasks:
27522777
- {key: VERSION, value: latest}
27532778
- {key: TOPOLOGY, value: sharded_cluster}
27542779
- {key: AUTH, value: auth}
2755-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
27562780
- func: install dependencies
27572781
- func: bootstrap mongo-orchestration
27582782
- func: run tests
@@ -2768,7 +2792,6 @@ tasks:
27682792
- {key: VERSION, value: rapid}
27692793
- {key: TOPOLOGY, value: sharded_cluster}
27702794
- {key: AUTH, value: auth}
2771-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
27722795
- func: install dependencies
27732796
- func: bootstrap mongo-orchestration
27742797
- func: run tests
@@ -2784,7 +2807,6 @@ tasks:
27842807
- {key: VERSION, value: '8.0'}
27852808
- {key: TOPOLOGY, value: sharded_cluster}
27862809
- {key: AUTH, value: auth}
2787-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
27882810
- func: install dependencies
27892811
- func: bootstrap mongo-orchestration
27902812
- func: run tests
@@ -2800,7 +2822,6 @@ tasks:
28002822
- {key: VERSION, value: '7.0'}
28012823
- {key: TOPOLOGY, value: sharded_cluster}
28022824
- {key: AUTH, value: auth}
2803-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
28042825
- func: install dependencies
28052826
- func: bootstrap mongo-orchestration
28062827
- func: run tests
@@ -2816,7 +2837,6 @@ tasks:
28162837
- {key: VERSION, value: '6.0'}
28172838
- {key: TOPOLOGY, value: sharded_cluster}
28182839
- {key: AUTH, value: auth}
2819-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
28202840
- func: install dependencies
28212841
- func: bootstrap mongo-orchestration
28222842
- func: run tests
@@ -2832,7 +2852,6 @@ tasks:
28322852
- {key: VERSION, value: '5.0'}
28332853
- {key: TOPOLOGY, value: sharded_cluster}
28342854
- {key: AUTH, value: auth}
2835-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
28362855
- func: install dependencies
28372856
- func: bootstrap mongo-orchestration
28382857
- func: run tests
@@ -2848,7 +2867,6 @@ tasks:
28482867
- {key: VERSION, value: '4.4'}
28492868
- {key: TOPOLOGY, value: sharded_cluster}
28502869
- {key: AUTH, value: auth}
2851-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
28522870
- func: install dependencies
28532871
- func: bootstrap mongo-orchestration
28542872
- func: run tests
@@ -2864,7 +2882,6 @@ tasks:
28642882
- {key: VERSION, value: '4.2'}
28652883
- {key: TOPOLOGY, value: sharded_cluster}
28662884
- {key: AUTH, value: auth}
2867-
- {key: TEST_NPM_SCRIPT, value: check:csfle}
28682885
- func: install dependencies
28692886
- func: bootstrap mongo-orchestration
28702887
- func: run tests

0 commit comments

Comments
 (0)