RUST-2219 Cherrypick domain name parsing fix into 3.2.x (#1404)

Co-authored-by: Isabel Atkinson <[email protected]>

Author: abr-egn

.evergreen/MSRV-Cargo.toml.diff

@@ -5,7 +5,7 @@ set -o errexit
 source ./.evergreen/env.sh
 
 # Pin clippy to the latest version. This should be updated when new versions of Rust are released.
-CLIPPY_VERSION=1.83.0
+CLIPPY_VERSION=1.85.0
 
 rustup install $CLIPPY_VERSION
 

.evergreen/check-clippy.sh

@@ -5,11 +5,11 @@ set -o xtrace
 
 source ./.evergreen/env.sh
 
-# Install the MSRV and pin dependencies who have bumped their MSRVs to > ours in recent releases.
+# Install the MSRV and generate a new lockfile with MSRV-compatible dependencies.
 if [ "$RUST_VERSION" != "" ]; then
   rustup toolchain install $RUST_VERSION
   TOOLCHAIN="+${RUST_VERSION}"
-  patch Cargo.toml .evergreen/MSRV-Cargo.toml.diff
+  CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS=fallback cargo +nightly -Zmsrv-policy generate-lockfile
 fi
 
 # Test with default features.

.evergreen/compile-only.sh

@@ -271,16 +271,16 @@ buildvariants:
     tasks:
       - test-plain-auth
 
-  - name: serverless
-    display_name: "Serverless"
-    run_on:
-      - rhel80-small
-    expansions:
-      LIBMONGOCRYPT_OS: rhel-80-64-bit
-      AUTH: auth
-      SSL: ssl
-    tasks:
-      - serverless-task-group
+  # - name: serverless
+  #   display_name: "Serverless"
+  #   run_on:
+  #     - rhel80-small
+  #   expansions:
+  #     LIBMONGOCRYPT_OS: rhel-80-64-bit
+  #     AUTH: auth
+  #     SSL: ssl
+  #   tasks:
+  #     - serverless-task-group
 
   - name: oidc-linux
     display_name: "OIDC Linux"
@@ -675,13 +675,21 @@ task_groups:
       - func: init test-results
       - func: make files executable
       - func: install rust
+      - command: ec2.assume_role
+        params:
+          role_arn: ${aws_test_secrets_role}
+          duration_seconds: 3600
       - command: subprocess.exec
         params:
           binary: bash
           env:
             AZUREOIDC_VMNAME_PREFIX: "RUST_DRIVER"
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
+          include_expansions_in_env:
+            - AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY
+            - AWS_SESSION_TOKEN
     teardown_task:
       - command: subprocess.exec
         params:
@@ -702,13 +710,21 @@ task_groups:
       - func: init test-results
       - func: make files executable
       - func: install rust
+      - command: ec2.assume_role
+        params:
+          role_arn: ${aws_test_secrets_role}
+          duration_seconds: 3600
       - command: subprocess.exec
         params:
           binary: bash
           env:
             GCPOIDC_VMNAME_PREFIX: "RUST_DRIVER"
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/gcp/setup.sh
+          include_expansions_in_env:
+            - AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY
+            - AWS_SESSION_TOKEN
     teardown_task:
       - command: subprocess.exec
         params:
@@ -729,11 +745,19 @@ task_groups:
       - func: init test-results
       - func: make files executable
       - func: install rust
+      - command: ec2.assume_role
+        params:
+          role_arn: ${aws_test_secrets_role}
+          duration_seconds: 3600
       - command: subprocess.exec
         params:
           binary: bash
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
+          include_expansions_in_env:
+            - AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY
+            - AWS_SESSION_TOKEN
     teardown_task:
       - command: subprocess.exec
         params:

.evergreen/config.yml

@@ -21,6 +21,15 @@ for arg; do
   if [ $arg == "rust" ]; then
     curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path $DEFAULT_HOST_OPTIONS
 
+    # Cygwin has a bug with reporting symlink paths that breaks rustup; see 
+    # https://github.com/rust-lang/rustup/issues/4239.  This works around it by replacing the
+    # symlinks with copies.
+    if [ "Windows_NT" == "$OS" ]; then
+      pushd ${CARGO_HOME}/bin
+      python3 ../../.evergreen/unsymlink.py
+      popd
+    fi
+
     # This file is not created by default on Windows
     echo 'export PATH="$PATH:${CARGO_HOME}/bin"' >>${CARGO_HOME}/env
     echo "export CARGO_NET_GIT_FETCH_WITH_CLI=true" >>${CARGO_HOME}/env

.evergreen/install-dependencies.sh

@@ -0,0 +1,19 @@
+import os
+import shutil
+
+found = []
+for entry in os.scandir():
+    if not entry.is_symlink():
+        print(f"Skipping {entry.name}: not a symlink")
+        continue
+    target = os.readlink(entry.name)
+    if target != "rustup.exe":
+        print(f"Skipping {entry.name}: not rustup.exe")
+        continue
+    print(f"Found {entry.name}")
+    found.append(entry.name)
+
+for name in found:
+    print(f"Replacing {name} symlink with copy")
+    os.remove(name)
+    shutil.copy2("rustup.exe", name)

.evergreen/unsymlink.py

@@ -4,7 +4,6 @@
 *~
 /target/
 **/*.rs.bk
-Cargo.lock
 .idea
 *.iml
 .vscode
@@ -14,4 +13,4 @@ Cargo.lock
 .rustup
 mongocryptd.pid
 semgrep/
-sarif.json
+sarif.json