Merge branch 'mongodb:main' into docs-update

Author: PavelSafronov

.evergreen/config.in.yml

@@ -617,6 +617,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the

.evergreen/config.yml

@@ -556,6 +556,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the
@@ -1400,6 +1403,19 @@ tasks:
       - func: start-load-balancer
       - func: run-lb-tests
       - func: stop-load-balancer
+  - name: test-auth-kerberos
+    tags:
+      - auth
+      - kerberos
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - {key: NATIVE, value: 'true'}
+      - func: install dependencies
+      - func: assume secrets manager role
+      - func: run kerberos tests
   - name: test-auth-ldap
     tags:
       - auth
@@ -1465,28 +1481,7 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run-compression-tests
-  - name: test-zstd-1.x-compression
-    tags:
-      - latest
-      - zstd
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: VERSION, value: latest}
-            - {key: TOPOLOGY, value: replica_set}
-            - {key: AUTH, value: auth}
-            - {key: COMPRESSOR, value: zstd}
-            - {key: CLIENT_ENCRYPTION, value: 'false'}
-            - {key: TEST_CSFLE, value: 'false'}
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-      - func: install package
-        vars:
-          PACKAGE: '@mongodb-js/[email protected]'
-      - func: run-compression-tests
-  - name: test-zstd-2.x-compression
+  - name: test-zstd-compression
     tags:
       - latest
       - zstd
@@ -1857,17 +1852,6 @@ tasks:
             - {key: NODE_LTS_VERSION, value: '22'}
       - func: install dependencies
       - func: run lint checks
-  - name: run-resource-management-async-dispose
-    tags:
-      - resource-management
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: '22'}
-      - func: install dependencies
-      - func: check resource management
   - name: test-explicit-resource-management-feature-integration
     tags:
       - resource-management
@@ -1994,24 +1978,6 @@ tasks:
       - func: install mongodb-client-encryption from source
       - func: assume secrets manager role
       - func: run custom csfle tests
-  - name: test-latest-driver-mongodb-client-encryption-6.0.0
-    tags:
-      - run-custom-dependency-tests
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: 20.19.0}
-            - {key: VERSION, value: '7.0'}
-            - {key: TOPOLOGY, value: replica_set}
-            - {key: CLIENT_ENCRYPTION, value: 'true'}
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-      - func: install package
-        vars:
-          PACKAGE: [email protected]
-      - func: run tests
   - name: test-alpine-fle
     tags:
       - alpine-fle
@@ -2908,13 +2874,13 @@ buildvariants:
       - test-8.0-load-balanced
       - test-rapid-load-balanced
       - test-latest-load-balanced
+      - test-auth-kerberos
       - test-auth-ldap
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
       - test-snappy-compression
-      - test-zstd-1.x-compression
-      - test-zstd-2.x-compression
+      - test-zstd-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -2963,13 +2929,13 @@ buildvariants:
       - test-8.0-load-balanced
       - test-rapid-load-balanced
       - test-latest-load-balanced
+      - test-auth-kerberos
       - test-auth-ldap
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
       - test-snappy-compression
-      - test-zstd-1.x-compression
-      - test-zstd-2.x-compression
+      - test-zstd-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -3017,12 +2983,12 @@ buildvariants:
       - test-8.0-load-balanced
       - test-rapid-load-balanced
       - test-latest-load-balanced
+      - test-auth-kerberos
       - test-auth-ldap
       - test-socks5-csfle
       - test-socks5-tls
       - test-snappy-compression
-      - test-zstd-1.x-compression
-      - test-zstd-2.x-compression
+      - test-zstd-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -3066,8 +3032,7 @@ buildvariants:
       - test-socks5
       - test-socks5-tls
       - test-snappy-compression
-      - test-zstd-1.x-compression
-      - test-zstd-2.x-compression
+      - test-zstd-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -3111,8 +3076,7 @@ buildvariants:
       - test-socks5
       - test-socks5-tls
       - test-snappy-compression
-      - test-zstd-1.x-compression
-      - test-zstd-2.x-compression
+      - test-zstd-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -3205,7 +3169,6 @@ buildvariants:
       - run-custom-csfle-tests-5.0
       - run-custom-csfle-tests-rapid
       - run-custom-csfle-tests-latest
-      - test-latest-driver-mongodb-client-encryption-6.0.0
   - name: rhel8-test-gcp-kms
     display_name: GCP KMS Test
     run_on: debian11-small

.evergreen/generate_evergreen_tasks.js

@@ -158,19 +158,18 @@ TASKS.push(
         { func: 'stop-load-balancer' }
       ]
     })),
-    // TODO(NODE-7178): Unskip kerberos tests.
-    // {
-    //   name: 'test-auth-kerberos',
-    //   tags: ['auth', 'kerberos'],
-    //   commands: [
-    //     updateExpansions({
-    //       NATIVE: 'true'
-    //     }),
-    //     { func: 'install dependencies' },
-    //     { func: 'assume secrets manager role' },
-    //     { func: 'run kerberos tests' }
-    //   ]
-    // },
+    {
+      name: 'test-auth-kerberos',
+      tags: ['auth', 'kerberos'],
+      commands: [
+        updateExpansions({
+          NATIVE: 'true'
+        }),
+        { func: 'install dependencies' },
+        { func: 'assume secrets manager role' },
+        { func: 'run kerberos tests' }
+      ]
+    },
     {
       name: 'test-auth-ldap',
       tags: ['auth', 'ldap'],
@@ -243,31 +242,7 @@ TASKS.push({
 });
 
 TASKS.push({
-  name: `test-zstd-1.x-compression`,
-  tags: ['latest', 'zstd'],
-  commands: [
-    updateExpansions({
-      VERSION: 'latest',
-      TOPOLOGY: 'replica_set',
-      AUTH: 'auth',
-      COMPRESSOR: 'zstd',
-      CLIENT_ENCRYPTION: 'false',
-      TEST_CSFLE: 'false'
-    }),
-    { func: 'install dependencies' },
-    { func: 'bootstrap mongo-orchestration' },
-    {
-      func: 'install package',
-      vars: {
-        PACKAGE: '@mongodb-js/[email protected]'
-      }
-    },
-    { func: 'run-compression-tests' }
-  ]
-});
-
-TASKS.push({
-  name: `test-zstd-2.x-compression`,
+  name: `test-zstd-compression`,
   tags: ['latest', 'zstd'],
   commands: [
     updateExpansions({
@@ -280,7 +255,6 @@ TASKS.push({
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
-    // no need to manually install zstd - we specify 2.x as a dev dependency in package.json
     { func: 'run-compression-tests' }
   ]
 });
@@ -510,17 +484,6 @@ SINGLETON_TASKS.push(
         { func: 'run lint checks' }
       ]
     },
-    {
-      name: 'run-resource-management-async-dispose',
-      tags: ['resource-management'],
-      commands: [
-        updateExpansions({
-          NODE_LTS_VERSION: LATEST_LTS
-        }),
-        { func: 'install dependencies' },
-        { func: 'check resource management' }
-      ]
-    },
     {
       name: 'test-explicit-resource-management-feature-integration',
       tags: ['resource-management'],
@@ -623,27 +586,28 @@ for (const serverVersion of ['5.0', 'rapid', 'latest']) {
   });
 }
 
-customDependencyTests.push({
-  name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
-  tags: ['run-custom-dependency-tests'],
-  commands: [
-    updateExpansions({
-      NODE_LTS_VERSION: LOWEST_LTS,
-      VERSION: '7.0',
-      TOPOLOGY: 'replica_set',
-      CLIENT_ENCRYPTION: true
-    }),
-    { func: 'install dependencies' },
-    { func: 'bootstrap mongo-orchestration' },
-    {
-      func: 'install package',
-      vars: {
-        PACKAGE: '[email protected]'
-      }
-    },
-    { func: 'run tests' }
-  ]
-});
+// TODO(NODE-6997): update to 7.0.0 after release
+// customDependencyTests.push({
+//   name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
+//   tags: ['run-custom-dependency-tests'],
+//   commands: [
+//     updateExpansions({
+//       NODE_LTS_VERSION: LOWEST_LTS,
+//       VERSION: '7.0',
+//       TOPOLOGY: 'replica_set',
+//       CLIENT_ENCRYPTION: true
+//     }),
+//     { func: 'install dependencies' },
+//     { func: 'bootstrap mongo-orchestration' },
+//     {
+//       func: 'install package',
+//       vars: {
+//         PACKAGE: '[email protected]'
+//       }
+//     },
+//     { func: 'run tests' }
+//   ]
+// });
 
 const coverageTask = {
   name: 'download and merge coverage'.split(' ').join('-'),

.evergreen/install-mongodb-client-encryption.sh

@@ -12,6 +12,8 @@ rm -rf mongodb-client-encryption
 git clone https://github.com/mongodb-js/mongodb-client-encryption.git
 pushd mongodb-client-encryption
 
+git checkout main
+
 node --version
 npm --version
 

.evergreen/run-resource-management.sh

@@ -18,7 +18,7 @@ cd $DRIVERS_TOOLS/.evergreen/auth_aws
 # Create a python virtual environment.
 . ./activate-authawsvenv.sh
 # Source the environment variables. Configure the environment and the server.
-. aws_setup.sh $AWS_CREDENTIAL_TYPE
+. aws_setup.sh --nouri $AWS_CREDENTIAL_TYPE
 
 cd $BEFORE
 

.evergreen/setup-mongodb-aws-auth-tests.sh

@@ -27,21 +27,24 @@ updates:
       # chai-subset requires @types/chai 4.x.
       - dependency-name: "@types/chai"
         versions: [">=4.0.0"]
-      # nyc is Node18+ only starting on [email protected].
-      - dependency-name: "nyc"
-        versions: [">=16.0.0"]
       # mocha-plugin-eslint breaks our lint configuration
       - dependency-name: "mocha-plugin-eslint"
         versions: [">=10.0.0"]
       # we ignore TS as a part of quarterly dependency updates.
       - dependency-name: "typescript"
-      # stay on the supported major version of gcp-metadata
-      - dependency-name: "gcp-metadata"
-        versions: [">=6.0.0"]
       # NODE-3773: sinon 19+ breaks the srv polling unit tests
       - dependency-name: "sinon"
         versions: ["18.x"]
 
+      # ignore all peer dependencies
+      - dependency-name: "@aws-sdk/credential-providers"
+      - dependency-name: "@mongodb-js/zstd"
+      - dependency-name: "gcp-metadata"
+      - dependency-name: "kerberos"
+      - dependency-name: "mongodb-client-encryption"
+      - dependency-name: "snappy"
+      - dependency-name: "socks"
+
     versioning-strategy: increase
 
     groups:

.github/dependabot.yml

@@ -34,13 +34,13 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         source-root: "./src"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"