Skip to content

Commit 1f4d1e1

Browse files
W-A-JamesW-A-James
authored
Merge branch 'main' into NODE-6678 
2 parents b555f7e + 58572de commit 1f4d1e1

File tree

9 files changed

+120
-265
lines changed

9 files changed

+120
-265
lines changed

‎.evergreen/config.in.yml

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -752,65 +752,6 @@ functions:
752752
export PROJECT_DIRECTORY=$ECS_SRC_DIR;
753753
python aws_tester.py ecs
754754
755-
"run-ocsp-test":
756-
- command: shell.exec
757-
type: test
758-
params:
759-
working_dir: "src"
760-
script: |
761-
${PREPARE_SHELL}
762-
763-
CA_FILE="$DRIVERS_TOOLS/.evergreen/ocsp/rsa/ca.pem" \
764-
OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
765-
bash ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-tests.sh
766-
767-
"run-valid-ocsp-server":
768-
- command: shell.exec
769-
params:
770-
script: |
771-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
772-
export PYTHON_BINARY=$([ "Windows_NT" = "$OS" ] && echo "/cygdrive/c/python/python38/python.exe" || echo "/opt/mongodbtoolchain/v3/bin/python3")
773-
export PYTHON_VENV_PATH=$([ "Windows_NT" = "$OS" ] && echo "./venv/Scripts" || echo "./venv/bin")
774-
775-
$PYTHON_BINARY -m venv ./venv
776-
$PYTHON_VENV_PATH/pip3 install -r ${DRIVERS_TOOLS}/.evergreen/ocsp/mock-ocsp-responder-requirements.txt
777-
778-
- command: shell.exec
779-
params:
780-
background: true
781-
script: |
782-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
783-
nohup $PYTHON_VENV_PATH/python3 ocsp_mock.py \
784-
--ca_file rsa/ca.pem \
785-
--ocsp_responder_cert rsa/ca.crt \
786-
--ocsp_responder_key rsa/ca.key \
787-
-p 8100 -v
788-
789-
"run-revoked-ocsp-server":
790-
- command: shell.exec
791-
params:
792-
script: |
793-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
794-
795-
export PYTHON_BINARY=$([ "Windows_NT" = "$OS" ] && echo "/cygdrive/c/python/python38/python.exe" || echo "/opt/mongodbtoolchain/v3/bin/python3")
796-
export PYTHON_VENV_PATH=$([ "Windows_NT" = "$OS" ] && echo "./venv/Scripts" || echo "./venv/bin")
797-
798-
$PYTHON_BINARY -m venv ./venv
799-
$PYTHON_VENV_PATH/pip3 install -r ${DRIVERS_TOOLS}/.evergreen/ocsp/mock-ocsp-responder-requirements.txt
800-
801-
- command: shell.exec
802-
params:
803-
background: true
804-
script: |
805-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
806-
nohup $PYTHON_VENV_PATH/python3 ocsp_mock.py \
807-
--ca_file rsa/ca.pem \
808-
--ocsp_responder_cert rsa/ca.crt \
809-
--ocsp_responder_key rsa/ca.key \
810-
-p 8100 \
811-
-v \
812-
--fault revoked
813-
814755
"run custom csfle tests":
815756
- command: ec2.assume_role
816757
params:

‎.evergreen/config.yml

Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -705,70 +705,6 @@ functions:
705705
export PROJECT_DIRECTORY=$ECS_SRC_DIR;
706706
707707
python aws_tester.py ecs
708-
run-ocsp-test:
709-
- command: shell.exec
710-
type: test
711-
params:
712-
working_dir: src
713-
script: |
714-
${PREPARE_SHELL}
715-
716-
CA_FILE="$DRIVERS_TOOLS/.evergreen/ocsp/rsa/ca.pem" \
717-
OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
718-
bash ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-tests.sh
719-
run-valid-ocsp-server:
720-
- command: shell.exec
721-
params:
722-
script: >
723-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
724-
725-
export PYTHON_BINARY=$([ "Windows_NT" = "$OS" ] && echo "/cygdrive/c/python/python38/python.exe" || echo
726-
"/opt/mongodbtoolchain/v3/bin/python3")
727-
728-
export PYTHON_VENV_PATH=$([ "Windows_NT" = "$OS" ] && echo "./venv/Scripts" || echo "./venv/bin")
729-
730-
731-
$PYTHON_BINARY -m venv ./venv
732-
733-
$PYTHON_VENV_PATH/pip3 install -r ${DRIVERS_TOOLS}/.evergreen/ocsp/mock-ocsp-responder-requirements.txt
734-
- command: shell.exec
735-
params:
736-
background: true
737-
script: |
738-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
739-
nohup $PYTHON_VENV_PATH/python3 ocsp_mock.py \
740-
--ca_file rsa/ca.pem \
741-
--ocsp_responder_cert rsa/ca.crt \
742-
--ocsp_responder_key rsa/ca.key \
743-
-p 8100 -v
744-
run-revoked-ocsp-server:
745-
- command: shell.exec
746-
params:
747-
script: >
748-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
749-
750-
751-
export PYTHON_BINARY=$([ "Windows_NT" = "$OS" ] && echo "/cygdrive/c/python/python38/python.exe" || echo
752-
"/opt/mongodbtoolchain/v3/bin/python3")
753-
754-
export PYTHON_VENV_PATH=$([ "Windows_NT" = "$OS" ] && echo "./venv/Scripts" || echo "./venv/bin")
755-
756-
757-
$PYTHON_BINARY -m venv ./venv
758-
759-
$PYTHON_VENV_PATH/pip3 install -r ${DRIVERS_TOOLS}/.evergreen/ocsp/mock-ocsp-responder-requirements.txt
760-
- command: shell.exec
761-
params:
762-
background: true
763-
script: |
764-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
765-
nohup $PYTHON_VENV_PATH/python3 ocsp_mock.py \
766-
--ca_file rsa/ca.pem \
767-
--ocsp_responder_cert rsa/ca.crt \
768-
--ocsp_responder_key rsa/ca.key \
769-
-p 8100 \
770-
-v \
771-
--fault revoked
772708
run custom csfle tests:
773709
- command: ec2.assume_role
774710
params:
@@ -3473,7 +3409,7 @@ tasks:
34733409
- func: install dependencies
34743410
- func: bootstrap mongo-orchestration
34753411
- func: check resource management feature integration
3476-
- name: check-types-typescript-next-node-types-22.9.0
3412+
- name: check-types-typescript-next-node-types-22.13.0
34773413
tags:
34783414
- check-types-typescript-next
34793415
- typescript-compilation
@@ -3485,10 +3421,10 @@ tasks:
34853421
- {key: NODE_LTS_VERSION, value: '16'}
34863422
- {key: NPM_VERSION, value: '9'}
34873423
- {key: TS_VERSION, value: next}
3488-
- {key: TYPES_VERSION, value: 22.9.0}
3424+
- {key: TYPES_VERSION, value: 22.13.0}
34893425
- func: install dependencies
34903426
- func: check types
3491-
- name: check-types-typescript-current-node-types-22.9.0
3427+
- name: check-types-typescript-current-node-types-22.13.0
34923428
tags:
34933429
- check-types-typescript-current
34943430
- typescript-compilation
@@ -3500,7 +3436,7 @@ tasks:
35003436
- {key: NODE_LTS_VERSION, value: '16'}
35013437
- {key: NPM_VERSION, value: '9'}
35023438
- {key: TS_VERSION, value: current}
3503-
- {key: TYPES_VERSION, value: 22.9.0}
3439+
- {key: TYPES_VERSION, value: 22.13.0}
35043440
- func: install dependencies
35053441
- func: check types
35063442
- name: check-types-typescript-next-node-types-16.x
@@ -3548,7 +3484,7 @@ tasks:
35483484
- {key: TYPES_VERSION, value: 18.11.9}
35493485
- func: install dependencies
35503486
- func: check types
3551-
- name: compile-driver-typescript-current-node-types-22.9.0
3487+
- name: compile-driver-typescript-current-node-types-22.13.0
35523488
tags:
35533489
- compile-driver-typescript-current
35543490
- typescript-compilation
@@ -3560,7 +3496,7 @@ tasks:
35603496
- {key: NODE_LTS_VERSION, value: '16'}
35613497
- {key: NPM_VERSION, value: '9'}
35623498
- {key: TS_VERSION, value: current}
3563-
- {key: TYPES_VERSION, value: 22.9.0}
3499+
- {key: TYPES_VERSION, value: 22.13.0}
35643500
- func: install dependencies
35653501
- func: compile driver
35663502
- name: download-and-merge-coverage

‎.evergreen/run-ocsp-tests.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎package-lock.json

Lines changed: 93 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)