test: remove mongosh integration tests

nbbeeken · nbbeeken · commit c389d2d70f02 · 2023-08-11T14:58:02.000-04:00
diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
@@ -404,44 +404,6 @@ functions:
         args:
           - "${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh"
 
-  ###########################################
-  #       mongosh functions
-  ###########################################
-  "compile mongosh":
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-        binary: bash
-        args:
-          - "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
-
-  "run mongosh tests for package":
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-          MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
-        binary: bash
-        args:
-          - "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
-
-  "run mongosh package scope test":
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-        binary: bash
-        args:
-          - "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh"
-
-
   "reset aws instance profile":
     - command: shell.exec
       params:
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -364,37 +364,6 @@ functions:
         binary: bash
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh
-  compile mongosh:
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-        binary: bash
-        args:
-          - ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
-  run mongosh tests for package:
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-          MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
-        binary: bash
-        args:
-          - ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
-  run mongosh package scope test:
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        env:
-          PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-          TASK_ID: ${task_id}
-        binary: bash
-        args:
-          - ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh
   reset aws instance profile:
     - command: shell.exec
       params:
@@ -3254,88 +3223,6 @@ tasks:
       - func: run tests
         vars:
           TEST_NPM_SCRIPT: check:csfle
-  - name: run-mongosh-browser-runtime-electron
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: browser-runtime-electron
-  - name: run-mongosh-cli-repl
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: cli-repl
-  - name: run-mongosh-connectivity-tests
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: connectivity-tests
-  - name: run-mongosh-mongosh
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: mongosh
-  - name: run-mongosh-node-runtime-worker-thread
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: node-runtime-worker-thread
-  - name: run-mongosh-service-provider-server
-    tags:
-      - run-mongosh-integration-tests
-    depends_on: compile-mongosh
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh tests for package
-        vars:
-          mongosh_package: service-provider-server
-  - name: compile-mongosh
-    tags:
-      - run-mongosh-integration-tests
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: compile mongosh
-  - name: verify-mongosh-scopes
-    tags:
-      - run-mongosh-integration-tests
-    commands:
-      - func: install dependencies
-        vars:
-          NODE_LTS_VERSION: 16
-      - func: run mongosh package scope test
 task_groups:
   - name: serverless_task_group
     setup_group_can_fail_task: true
@@ -3911,18 +3798,6 @@ buildvariants:
     run_on: rhel80-large
     tasks:
       - download-and-merge-coverage
-  - name: mongosh_integration_tests
-    display_name: mongosh integration tests
-    run_on: ubuntu1804-large
-    tasks:
-      - run-mongosh-browser-runtime-electron
-      - run-mongosh-cli-repl
-      - run-mongosh-connectivity-tests
-      - run-mongosh-mongosh
-      - run-mongosh-node-runtime-worker-thread
-      - run-mongosh-service-provider-server
-      - compile-mongosh
-      - verify-mongosh-scopes
   - name: ubuntu1804-test-mongodb-aws
     display_name: MONGODB-AWS Auth test
     run_on: ubuntu1804-large
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -1,7 +1,6 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
 const semver = require('semver');
-const { mongoshTasks } = require('./generate_mongosh_tasks');
 
 const {
   MONGODB_VERSIONS,
@@ -40,7 +39,13 @@ const OPERATING_SYSTEMS = [
 }));
 
 // TODO: NODE-3060: enable skipped tests on windows except oidc (not supported)
-const WINDOWS_SKIP_TAGS = new Set(['atlas-connect', 'auth', 'load_balancer', 'socks5-csfle', 'oidc']);
+const WINDOWS_SKIP_TAGS = new Set([
+  'atlas-connect',
+  'auth',
+  'load_balancer',
+  'socks5-csfle',
+  'oidc'
+]);
 
 const TASKS = [];
 const SINGLETON_TASKS = [];
@@ -426,7 +431,9 @@ for (const {
   });
 
   for (const NODE_LTS_VERSION of testedNodeVersions) {
-    const nodeLTSCodeName = versions.find(({ versionNumber }) => versionNumber === NODE_LTS_VERSION).codeName;
+    const nodeLTSCodeName = versions.find(
+      ({ versionNumber }) => versionNumber === NODE_LTS_VERSION
+    ).codeName;
     const nodeLtsDisplayName = `Node${NODE_LTS_VERSION}`;
     const name = `${osName}-${NODE_LTS_VERSION >= 20 ? nodeLtsDisplayName : nodeLTSCodeName}`;
     const display_name = `${osDisplayName} ${nodeLtsDisplayName}`;
@@ -458,33 +465,33 @@ for (const {
 }
 
 // Running CSFLE tests with mongocryptd
-const MONGOCRYPTD_CSFLE_TASKS = MONGODB_VERSIONS
-  .filter(mongoVersion => ['latest', 'rapid'].includes(mongoVersion)
-    || semver.gte(`${mongoVersion}.0`, '4.2.0'))
-  .map((mongoVersion) => {
-    return {
-      name: `test-${mongoVersion}-csfle-mongocryptd`,
-      tags: [mongoVersion, 'sharded_cluster'],
-      commands: [
-        { func: 'install dependencies' },
-        {
-          func: 'bootstrap mongo-orchestration',
-          vars: {
-            VERSION: mongoVersion,
-            TOPOLOGY: 'sharded_cluster',
-            AUTH: 'auth'
-          }
-        },
-        { func: 'bootstrap kms servers' },
-        {
-          func: 'run tests',
-          vars: {
-            TEST_NPM_SCRIPT: 'check:csfle'
-          }
+const MONGOCRYPTD_CSFLE_TASKS = MONGODB_VERSIONS.filter(
+  mongoVersion =>
+    ['latest', 'rapid'].includes(mongoVersion) || semver.gte(`${mongoVersion}.0`, '4.2.0')
+).map(mongoVersion => {
+  return {
+    name: `test-${mongoVersion}-csfle-mongocryptd`,
+    tags: [mongoVersion, 'sharded_cluster'],
+    commands: [
+      { func: 'install dependencies' },
+      {
+        func: 'bootstrap mongo-orchestration',
+        vars: {
+          VERSION: mongoVersion,
+          TOPOLOGY: 'sharded_cluster',
+          AUTH: 'auth'
         }
-      ]
-    }
-  });
+      },
+      { func: 'bootstrap kms servers' },
+      {
+        func: 'run tests',
+        vars: {
+          TEST_NPM_SCRIPT: 'check:csfle'
+        }
+      }
+    ]
+  };
+});
 
 for (const nodeVersion of [LOWEST_LTS, LATEST_LTS]) {
   const name = `rhel8-node${nodeVersion}-test-csfle-mongocryptd`;
@@ -498,8 +505,7 @@ for (const nodeVersion of [LOWEST_LTS, LATEST_LTS]) {
       RUN_WITH_MONGOCRYPTD: true,
       NODE_LTS_VERSION: LOWEST_LTS
     },
-    tasks:
-      MONGOCRYPTD_CSFLE_TASKS.map(task => task.name)
+    tasks: MONGOCRYPTD_CSFLE_TASKS.map(task => task.name)
   });
 }
 
@@ -547,7 +553,6 @@ SINGLETON_TASKS.push(
   ]
 );
 
-
 function* makeTypescriptTasks() {
   for (const TS_VERSION of ['next', 'current', '4.1.6']) {
     // 4.1.6 can consume the public API but not compile the driver
@@ -624,13 +629,6 @@ BUILD_VARIANTS.push({
   tasks: ['download-and-merge-coverage']
 });
 
-BUILD_VARIANTS.push({
-  name: 'mongosh_integration_tests',
-  display_name: 'mongosh integration tests',
-  run_on: UBUNTU_OS,
-  tasks: mongoshTasks.map(({ name }) => name)
-});
-
 // special case for MONGODB-AWS authentication
 BUILD_VARIANTS.push({
   name: 'ubuntu1804-test-mongodb-aws',
@@ -765,9 +763,7 @@ BUILD_VARIANTS.push({
 
 // TODO(NODE-4575): unskip zstd and snappy on node 16
 for (const variant of BUILD_VARIANTS.filter(
-  variant =>
-    variant.expansions &&
-    [16, 18, 20].includes(variant.expansions.NODE_LTS_VERSION)
+  variant => variant.expansions && [16, 18, 20].includes(variant.expansions.NODE_LTS_VERSION)
 )) {
   variant.tasks = variant.tasks.filter(
     name => !['test-zstd-compression', 'test-snappy-compression'].includes(name)
@@ -784,7 +780,7 @@ for (const variant of BUILD_VARIANTS.filter(
 // TODO(NODE-5283): fix socks5 fle tests on node 20+
 for (const variant of BUILD_VARIANTS.filter(
   variant => variant.expansions && [20].includes(variant.expansions.NODE_LTS_VERSION)
-) ) {
+)) {
   variant.tasks = variant.tasks.filter(name => !['test-socks5-csfle'].includes(name));
 }
 
@@ -795,8 +791,7 @@ fileData.tasks = (fileData.tasks || [])
   .concat(SINGLETON_TASKS)
   .concat(AUTH_DISABLED_TASKS)
   .concat(AWS_LAMBDA_HANDLER_TASKS)
-  .concat(MONGOCRYPTD_CSFLE_TASKS)
-  .concat(mongoshTasks);
+  .concat(MONGOCRYPTD_CSFLE_TASKS);
 
 fileData.buildvariants = (fileData.buildvariants || []).concat(BUILD_VARIANTS);
 
diff --git a/.evergreen/generate_mongosh_tasks.js b/.evergreen/generate_mongosh_tasks.js
