Merge branch 'master' into reinterpret-latest

blink1073 · web-flow · commit 90dd65d1b874 · 2025-02-20T06:20:35.000-06:00
diff --git a/.evergreen/auth_oidc/azure/create-and-setup-vm.sh b/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
@@ -33,7 +33,7 @@ echo "${AZUREOIDC_CERT}" | base64 --decode > $AZUREKMS_CERTFILE
 chmod 600 $AZUREKMS_CERTFILE
 
 export AZUREKMS_TENANTID=$AZUREOIDC_TENANTID
-export AZUREKMS_SECRET=$AZUREKMS_CERTFILE
+export AZUREKMS_SECRET=$AZUREOIDC_SECRET
 export AZUREKMS_CLIENTID=$AZUREOIDC_APPID
 
 # Login.
diff --git a/.evergreen/auth_oidc/oidc_get_tokens.sh b/.evergreen/auth_oidc/oidc_get_tokens.sh
@@ -2,7 +2,7 @@
 #
 # Get the set of OIDC tokens in the OIDC_TOKEN_DIR.
 #
-set -ex
+set -eu
 SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
 . $SCRIPT_DIR/../handle-paths.sh
 
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -361,7 +361,7 @@ functions:
         include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         working_dir: "src"
         script: |
-          set -ex
+          set -eu
           bash ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
           test -f /tmp/tokens/test_user1
           test -f /tmp/tokens/test_user2
@@ -380,7 +380,7 @@ functions:
         include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         working_dir: "src"
         script: |
-          set -ex
+          set -eu
           cd ${DRIVERS_TOOLS}/.evergreen/auth_oidc
           ENTRYPOINT=/root/docker_entry_base.sh bash start_local_server.sh
           test -f /tmp/tokens/test_user1
diff --git a/.evergreen/csfle/stop-servers.sh b/.evergreen/csfle/stop-servers.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
 # Clean up CSFLE kmip servers
-set -ex
+set -eu
 
 SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
 . $SCRIPT_DIR/../handle-paths.sh
 pushd $SCRIPT_DIR
 rm -f pykmip.db
 if [ -f "kmip_pids.pid" ]; then
   while read p; do
-    kill -9 "$p" || true
+    kill -9 "$p" 2> /dev/null || true
   done <kmip_pids.pid
   rm kmip_pids.pid
 fi
diff --git a/.evergreen/download-mongodb.sh b/.evergreen/download-mongodb.sh
@@ -100,7 +100,6 @@ download_and_extract_package ()
    $EXTRACT mongodb-binaries.tgz
    echo "Installing server binaries... done."
 
-   set -x
    rm -f mongodb-binaries.tgz
    mv mongodb* mongodb
    chmod -R +x mongodb
diff --git a/.evergreen/init-node-and-npm-env.sh b/.evergreen/init-node-and-npm-env.sh
@@ -21,8 +21,3 @@ export PATH="$npm_global_prefix/bin:$NODE_ARTIFACTS_PATH/nodejs/bin:$PATH"
 hash -r
 
 export NODE_OPTIONS="--trace-deprecation --trace-warnings"
-
-# https://github.com/nodejs/node-gyp#configuring-python-dependency
-. $SCRIPT_DIR/find-python3.sh
-NODE_GYP_FORCE_PYTHON=$(find_python3)
-export NODE_GYP_FORCE_PYTHON
diff --git a/.evergreen/k8s/configure-pod.sh b/.evergreen/k8s/configure-pod.sh
@@ -34,12 +34,10 @@ echo "Waiting for pod to be ready... done."
 
 # Run the setup script and ensure git was installed.
 echo "Configuring pod $POD_NAME..."
-set -x
 # Account for initial error in connecting to pod.
 TIMEOUT=5 ../retry-with-backoff.sh kubectl cp ./remote-scripts/setup-pod.sh ${POD_NAME}:/tmp/setup-pod.sh
 kubectl exec ${POD_NAME} -- /tmp/setup-pod.sh
 kubectl exec ${POD_NAME} -- git --version
-set +x
 echo "Configuring pod $POD_NAME... done."
 
 popd
diff --git a/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json b/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-disableStapling.json b/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-disableStapling.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json b/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json b/.evergreen/orchestration/configs/servers/ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json b/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-disableStapling.json b/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-disableStapling.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json b/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-mustStaple-disableStapling.json b/.evergreen/orchestration/configs/servers/rsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -6,7 +6,7 @@
       "bind_ip": "127.0.0.1,::1",
       "logappend": true,
       "port": 27017,
-      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}}"}
+      "setParameter": {"failpoint.disableStapling":"{\"mode\":\"alwaysOn\"}"}
    },
    "sslParams": {
       "sslOnNormalPorts": true,
diff --git a/.evergreen/orchestration/drivers_orchestration.py b/.evergreen/orchestration/drivers_orchestration.py
@@ -209,6 +209,8 @@ def run(opts):
         LOGGER.info(f"Using existing mongod binaries dir: {opts.existing_binaries_dir}")
         shutil.copytree(opts.existing_binaries_dir, mdb_binaries)
 
+    subprocess.run([f"{mdb_binaries_str}/mongod", "--version"], check=True)
+
     # Download legacy shell.
     if opts.install_legacy_shell:
         args = f"{default_args} --version 5.0"
diff --git a/.evergreen/process-utils.sh b/.evergreen/process-utils.sh
@@ -26,20 +26,20 @@ killport() {
   if [[ "${OSTYPE:?}" == cygwin || "${OSTYPE:?}" == msys ]]; then
     for pid in $(netstat -ano | grep ":$port .* LISTENING" | awk '{print $5}' | tr -d '[:space:]'); do
       echo "Killing pid $pid for port $port using taskkill" 1>&2
-      taskkill /F /T /PID "$pid" || true
+      taskkill /F /T /PID "$pid" 2>/dev/null || true
     done
   elif [ -x "$(command -v lsof)" ]; then
     for pid in $(lsof -t "-i:$port" || true); do
       echo "Killing pid $pid for port $port using kill" 1>&2
-      kill -SIGKILL "$pid" || true
+      kill -SIGKILL "$pid" 2>/dev/null|| true
     done
   elif [ -x "$(command -v fuser)" ]; then
     echo "Killing process using port $port using fuser" 1>&2
     fuser --kill "$port/tcp" || true
   elif [ -x "$(command -v ss)" ]; then
     for pid in $(ss -tlnp "sport = :$port" | awk 'NR>1 {split($7,a,","); print a[1]}' | tr -d '[:space:]'); do
       echo "Killing pid $pid for port $port using kill" 1>&2
-      kill -SIGKILL "$pid" || true
+      kill -SIGKILL "$pid" 2>/dev/null || true
     done
   else
     echo "Unable to identify the OS (${OSTYPE:?}) or find necessary utilities (fuser/lsof/ss) to kill the process."
diff --git a/.evergreen/run-orchestration.sh b/.evergreen/run-orchestration.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=sh
-set -o errexit  # Exit the script with error if any of the commands fail
-set -x
+set -eu
+
 # See https://stackoverflow.com/questions/35006457/choosing-between-0-and-bash-source/35006505#35006505
 # Why we need this syntax when sh is not aliased to bash (this script must be able to be called from sh)
 # shellcheck disable=SC3028

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Get the set of OIDC tokens in the OIDC_TOKEN_DIR.`
`4`	`4`	`#`
`5`		`-set -ex`
	`5`	`+set -eu`
`6`	`6`	`SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})`
`7`	`7`	`. $SCRIPT_DIR/../handle-paths.sh`
`8`	`8`