Various corrections and simplifications

Author: papafe

build.cake

@@ -261,6 +261,8 @@ Task("TestX509")
         action: (BuildConfig buildConfig, Path testProject) =>
             RunTests(buildConfig, testProject, filter: "Category=\"X509\""));
 
+Task("TestX509Net60").IsDependentOn("TestX509");
+
 Task("Package")
     .IsDependentOn("PackageNugetPackages");
 

evergreen/convert-client-cert-to-pkcs12.sh

@@ -2,19 +2,29 @@
 
 set -o errexit  # Exit the script with an error if any of the commands fail
 
-# Input environment variables
-: "${CLIENT_PEM_VAR_NAME:="CLIENT_PEM"}"      # Name of the input variable for the client.pem file
-: "${OUTPUT_VAR_PREFIX:="MONGO_X509_CLIENT"}"        # Prefix for output environment variables
-: "${FRIENDLY_NAME:="Drivers Client Certificate"}" # Friendly name for the exported certificate
+# Environment variables used as input:
+#   CLIENT_PEM                      Path to mongo client.pem: must be set
+#   P12_FILENAME                    Filename for client certificate in p12 format
+#   P12_PASSWORD                    Password for client certificate in p12 format
+#   FRIENDLY_NAME                   Friendly name for client certificate in p12 format
+#   OUT_CLIENT_PATH_VAR             Name of the output variable containing the path of the p12 certificate
+#   OUT_CLIENT_PASSWORD_VAR         Name of the output variable containing the password for the p12 certificate
+#
+# Environment variables produced as output:
+#   {!OUT_CLIENT_PATH_VAR}          Absolute path to client certificate in p12 format (OUT_CLIENT_PATH_VAR contains the actual variable being exported)
+#   {!OUT_CLIENT_PASSWORD_VAR}      Password for client certificate (OUT_CLIENT_PASSWORD_VAR contains the actual variable being exported)
+
+
+# Input environment variables and default values
+: "${CLIENT_PEM:=nil}"
+: "${FRIENDLY_NAME:="Drivers Client Certificate"}"
 : "${P12_FILENAME:="client.p12"}"
 : "${P12_PASSWORD:="Picard-Alpha-Alpha-3-0-5"}"
-: "${OUT_CLIENT_PASSWORD_VAR:="MONGO_X509_CLIENT_CERTIFICATE_PASSWORD"}"
 : "${OUT_CLIENT_PATH_VAR:="MONGO_X509_CLIENT_CERTIFICATE_PATH"}"
-
-CLIENT_PEM=${!CLIENT_PEM_VAR_NAME:-nil}
+: "${OUT_CLIENT_PASSWORD_VAR:="MONGO_X509_CLIENT_CERTIFICATE_PASSWORD"}"
 
 if [[ "$CLIENT_PEM" == "nil" ]]; then
-  echo "Error: ${CLIENT_PEM_VAR_NAME} must be set."
+  echo "Error: CLIENT_PEM must be set."
   exit 1
 fi
 
@@ -46,6 +56,7 @@ if [[ "$OS" =~ Windows|windows ]]; then
   CERT_PATH=$(cygpath -w "${CERT_PATH}")
 fi
 
+# Output environment variables
 export "${OUT_CLIENT_PASSWORD_VAR}"="${P12_PASSWORD}"
 export "${OUT_CLIENT_PATH_VAR}"="${CERT_PATH}"
 

evergreen/evergreen.yml

@@ -359,48 +359,6 @@ functions:
           cd ${DRIVERS_TOOLS}/.evergreen
           DRIVERS_TOOLS=${DRIVERS_TOOLS} MONGODB_URI=${MONGODB_URI} bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
 
-
-  setup-x509-tests:
-    - command: shell.exec
-      params:
-        shell: "bash"
-        include_expansions_in_env:
-          - "AWS_ACCESS_KEY_ID"
-          - "AWS_SECRET_ACCESS_KEY"
-          - "AWS_SESSION_TOKEN"
-        script: |
-          ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
-          source secrets-export.sh
-
-          echo $ATLAS_X509_DEV_CERT_BASE64 | base64 --decode > ${DRIVERS_TOOLS}/CLIENT_CERT.pem
-          echo $ATLAS_X509_DEV_CERT_NOUSER_BASE64 | base64 --decode > ${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem
-
-  run-x509-tests:
-    - command: shell.exec
-      type: test
-      params:
-        shell: "bash"
-        working_dir: mongo-csharp-driver
-        script: |
-          source ../secrets-export.sh
-          ${PREPARE_SHELL}
-          OS=${OS} \
-            evergreen/add-ca-certs.sh
-          CLIENT_PEM_VAR_NAME="CLIENT_NO_USER_PEM" \
-          FRIENDLY_NAME="Drivers No-User Client Certificate" \
-          P12_FILENAME="client_no_user.p12" \
-          OUT_CLIENT_PASSWORD_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PASSWORD" \
-          OUT_CLIENT_PATH_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PATH" \
-          CLIENT_NO_USER_PEM=${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem \
-            source evergreen/convert-client-cert-to-pkcs12.sh
-          MONGODB_URI="$ATLAS_X509_DEV" \
-          CLIENT_PEM=${DRIVERS_TOOLS}/CLIENT_CERT.pem \
-          TOPOLOGY=${TOPOLOGY} \
-          OS=${OS} \
-          FRAMEWORK=${FRAMEWORK} \
-          TARGET="TestX509" \
-            evergreen/run-tests.sh
-
   run-unit-tests:
     - command: shell.exec
       type: test
@@ -1071,6 +1029,46 @@ functions:
           bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-driver-test.sh
           bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/teardown-pod.sh
 
+  setup-x509-tests:
+    - command: shell.exec
+      params:
+        shell: "bash"
+        include_expansions_in_env:
+          - "AWS_ACCESS_KEY_ID"
+          - "AWS_SECRET_ACCESS_KEY"
+          - "AWS_SESSION_TOKEN"
+        script: |
+          ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
+          source secrets-export.sh
+
+          echo $ATLAS_X509_DEV_CERT_BASE64 | base64 --decode > ${DRIVERS_TOOLS}/CLIENT_CERT.pem
+          echo $ATLAS_X509_DEV_CERT_NOUSER_BASE64 | base64 --decode > ${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem
+
+  run-x509-tests:
+    - command: shell.exec
+      type: test
+      params:
+        shell: "bash"
+        working_dir: mongo-csharp-driver
+        script: |
+          source ../secrets-export.sh
+          ${PREPARE_SHELL}
+          OS=${OS} \
+            evergreen/add-ca-certs.sh
+          FRIENDLY_NAME="Drivers No-User Client Certificate" \
+          P12_FILENAME="client_no_user.p12" \
+          OUT_CLIENT_PASSWORD_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PASSWORD" \
+          OUT_CLIENT_PATH_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PATH" \
+          CLIENT_PEM=${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem \
+            source evergreen/convert-client-cert-to-pkcs12.sh
+          MONGODB_URI="$ATLAS_X509_DEV" \
+          CLIENT_PEM=${DRIVERS_TOOLS}/CLIENT_CERT.pem \
+          TOPOLOGY=${TOPOLOGY} \
+          OS=${OS} \
+          FRAMEWORK=${FRAMEWORK} \
+          TARGET="TestX509" \
+            evergreen/run-tests.sh
+
 pre:
   - func: fetch-source
   - func: prepare-resources
@@ -1261,12 +1259,6 @@ tasks:
         - func: run-aws-auth-test-with-aws-ECS-credentials
         - func: run-aws-auth-test-with-aws-web-identity-credentials
 
-    - name: x509-auth-tests
-      commands:
-        - func: assume-ec2-role
-        - func: setup-x509-tests
-        - func: run-x509-tests
-
     - name: stable-api-tests-net472
       commands:
         - func: setup-csfle-secrets
@@ -1765,6 +1757,14 @@ tasks:
               ${PREPARE_SHELL}
               CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" DRIVER_VERSION="${PACKAGE_VERSION}" MONGODB_VERSION="${VERSION}" bash ./evergreen/run-tests.sh
 
+    - name: x509-auth-tests
+      commands:
+        - func: assume-ec2-role
+        - func: setup-x509-tests
+        - func: run-x509-tests
+          vars:
+            FRAMEWORK: net60
+
 axes:
   - id: version
     display_name: MongoDB Version