Merge branch 'main' into type-templates-auto-encryption

Author: baileympearson

.eslintrc.json

@@ -2,7 +2,7 @@
   "root": true,
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaVersion": 2020
+    "ecmaVersion": 2023
   },
   "plugins": [
     "simple-import-sort",
@@ -178,7 +178,6 @@
           {
             "patterns": [
               "**/../lib/**",
-              "**/../src/**",
               "mongodb-mock-server"
             ]
           }
@@ -217,7 +216,6 @@
           {
             "patterns": [
               "**/../lib/**",
-              "**/../src/**",
               "mongodb-mock-server"
             ]
           }
@@ -320,4 +318,4 @@
       }
     }
   ]
-}
+}

.evergreen/ci_matrix_constants.js

@@ -1,9 +1,7 @@
 const MONGODB_VERSIONS = ['latest', 'rapid', '8.0', '7.0', '6.0', '5.0', '4.4', '4.2'];
 const versions = [
-  { codeName: 'gallium', versionNumber: 16, npmVersion: 9 },
-  { codeName: 'hydrogen', versionNumber: 18, npmVersion: 10 },
-  { codeName: 'iron', versionNumber: 20, npmVersion: 'latest' },
-  { codeName: 'jod', versionNumber: 22, npmVersion: 'latest' }
+  { codeName: 'iron', versionNumber: '20.19.0' },
+  { codeName: 'jod', versionNumber: 22 }
 ];
 const NODE_VERSIONS = versions.map(({ versionNumber }) => versionNumber).sort();
 const LOWEST_LTS = NODE_VERSIONS[0];

.evergreen/config.in.yml

@@ -388,20 +388,6 @@ functions:
         args:
           - .evergreen/run-ldap-tests.sh
 
-  "run data lake tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        working_dir: src
-        binary: bash
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-          MONGODB_URI: "mongodb://mhuser:pencil@localhost"
-          NODE_LTS_VERSION: ${NODE_LTS_VERSION}
-        args:
-          - .evergreen/run-data-lake-tests.sh
-
   "run tls tests":
     - command: shell.exec
       type: test
@@ -422,7 +408,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -440,7 +425,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -458,7 +442,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -477,7 +460,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -495,7 +477,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -513,7 +494,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -532,7 +512,6 @@ functions:
         include_expansions_in_env:
           - MONGODB_URI
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - AWS_ACCESS_KEY_ID
           - AWS_SECRET_ACCESS_KEY
           - AWS_SESSION_TOKEN
@@ -549,7 +528,6 @@ functions:
       params:
         include_expansions_in_env:
           - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
           - PROJECT_DIRECTORY
           - MONGODB_BINARIES
           - AWS_ACCESS_KEY_ID
@@ -597,7 +575,6 @@ functions:
           - AWS_SESSION_TOKEN
         env:
           AWS_CREDENTIAL_TYPE: env-creds
-          MONGODB_AWS_SDK: "true"
         working_dir: "src"
         binary: bash
         args:
@@ -724,20 +701,13 @@ functions:
           - .evergreen/docker/alpine.sh
 
 tasks:
-  - name: "test-atlas-data-lake"
-    tags: ["datalake", "mongohouse"]
-    commands:
-      - func: "install dependencies"
-      - func: "bootstrap mongohoused"
-      - func: "run data lake tests"
-
   - name: "test-gcpkms-task"
     commands:
       - command: expansions.update
         type: setup
         params:
           updates:
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: "20.19.0" }
       - func: assume secrets manager role
       - func: "install dependencies"
       # Upload node driver to a GCP instance
@@ -757,7 +727,7 @@ tasks:
         type: setup
         params:
           updates:
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: "20.19.0" }
             - { key: VERSION, value: latest }
             - { key: TOPOLOGY, value: server }
             - { key: AUTH, value: noauth }
@@ -769,6 +739,7 @@ tasks:
           binary: bash
           env:
             EXPECTED_GCPKMS_OUTCOME: "failure"
+            NODE_LTS_VERSION: ${NODE_LTS_VERSION}
           args:
             - src/.evergreen/run-gcp-kms-tests.sh
 
@@ -778,7 +749,7 @@ tasks:
         type: setup
         params:
           updates:
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: "20.19.0" }
       - func: "install dependencies"
       - func: assume secrets manager role
       - command: subprocess.exec
@@ -795,7 +766,7 @@ tasks:
         type: setup
         params:
           updates:
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: "20.19.0" }
             - { key: VERSION, value: latest }
             - { key: TOPOLOGY, value: server }
             - { key: AUTH, value: noauth }
@@ -807,6 +778,7 @@ tasks:
           binary: bash
           env:
             EXPECTED_AZUREKMS_OUTCOME: "failure"
+            NODE_LTS_VERSION: ${NODE_LTS_VERSION}
           args:
             - src/.evergreen/run-azure-kms-tests.sh
 
@@ -945,7 +917,7 @@ tasks:
         type: setup
         params:
           updates:
-            - { key: NPM_VERSION, value: "9" }
+            - { key: NODE_LTS_VERSION, value: "20.19.0" }
       - func: "install dependencies"
       - command: ec2.assume_role
         params: