Skip to content

Commit 4e8386f

Browse files
authored
test(NODE-5198): fix kms request failure (#3701)
1 parent 8e24ea5 commit 4e8386f

File tree

5 files changed

+65
-6
lines changed

5 files changed

+65
-6
lines changed

.evergreen/activate-kms-venv.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -o errexit # Exit the script with error if any of the commands fail
3+
4+
cd ${DRIVERS_TOOLS}/.evergreen/csfle
5+
. ./activate-kmstlsvenv.sh
6+
7+
if [ "Windows_NT" = "$OS" ]; then
8+
echo "export PYTHON_EXEC='kmstlsvenv/Scripts/python.exe'" > prepare-kmsvenv.sh
9+
else
10+
echo "export PYTHON_EXEC='./kmstlsvenv/bin/python3'" > prepare-kmsvenv.sh
11+
fi

.evergreen/config.in.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,28 @@ functions:
9494
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
9595
9696
"bootstrap kms servers":
97+
- command: subprocess.exec
98+
params:
99+
binary: bash
100+
working_dir: src
101+
args:
102+
- .evergreen/activate-kms-venv.sh
103+
env:
104+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
97105
- command: subprocess.exec
98106
params:
99107
background: true
108+
binary: bash
100109
working_dir: src
110+
args:
111+
- .evergreen/run-kmip-server.sh
112+
env:
113+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
114+
- command: subprocess.exec
115+
params:
116+
background: true
101117
binary: bash
118+
working_dir: src
102119
args:
103120
- .evergreen/run-kms-servers.sh
104121
env:

.evergreen/config.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,28 @@ functions:
6767
${PREPARE_SHELL}
6868
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
6969
bootstrap kms servers:
70+
- command: subprocess.exec
71+
params:
72+
binary: bash
73+
working_dir: src
74+
args:
75+
- .evergreen/activate-kms-venv.sh
76+
env:
77+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
7078
- command: subprocess.exec
7179
params:
7280
background: true
81+
binary: bash
7382
working_dir: src
83+
args:
84+
- .evergreen/run-kmip-server.sh
85+
env:
86+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
87+
- command: subprocess.exec
88+
params:
89+
background: true
7490
binary: bash
91+
working_dir: src
7592
args:
7693
- .evergreen/run-kms-servers.sh
7794
env:

.evergreen/run-kmip-server.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -o errexit # Exit the script with error if any of the commands fail
3+
4+
cd ${DRIVERS_TOOLS}/.evergreen/csfle
5+
. ./prepare-kmsvenv.sh
6+
7+
echo "$PYTHON_EXEC"
8+
9+
$PYTHON_EXEC -u kms_kmip_server.py \
10+
--ca_file ../x509gen/ca.pem \
11+
--cert_file ../x509gen/server.pem \
12+
--port 5698

.evergreen/run-kms-servers.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/bash
2+
set -o errexit # Exit the script with error if any of the commands fail
23

34
cd ${DRIVERS_TOOLS}/.evergreen/csfle
4-
. ./activate-kmstlsvenv.sh
5-
# by default it always runs on port 5698
6-
python -u kms_kmip_server.py &
7-
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
8-
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
9-
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &
5+
. ./prepare-kmsvenv.sh
6+
7+
echo "$PYTHON_EXEC"
8+
9+
$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
10+
$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
11+
$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &

0 commit comments

Comments
 (0)