Merge branch 'main' into 1.29-releases

mcasimir · mcasimir · commit c4e56d5b3d4b · 2021-11-19T11:24:32.000+01:00
diff --git a/.github/workflows/connectivity-tests.yaml b/.github/workflows/connectivity-tests.yaml
@@ -67,7 +67,7 @@ jobs:
         run: |
           git clone https://github.com/mongodb-js/devtools-docker-test-envs.git
           cd devtools-docker-test-envs
-          git checkout v1.2.0
+          git checkout v1.2.1
           docker-compose -f docker/enterprise/docker-compose.yaml up -d
           docker-compose -f docker/ldap/docker-compose.yaml up -d
           docker-compose -f docker/scram/docker-compose.yaml up -d
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Wed Nov 17 2021.
+This document was automatically generated on Fri Nov 19 2021.
 
 ## List of dependencies
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "bootstrap": "npm install && lerna run bootstrap --stream",
     "bootstrap-ci": "npm ci && lerna run bootstrap",
     "precheck": "npm run depcheck && npm run check-logids",
+    "changed": "node ./scripts/changed.js",
     "check": "lerna run check --stream",
     "check-changed": "npm run check -- --since origin/HEAD --exclude-dependents",
     "precheck-ci": "npm run depcheck && npm run check-logids",
diff --git a/packages/compass-crud/src/stores/crud-store.js b/packages/compass-crud/src/stores/crud-store.js
@@ -1150,7 +1150,7 @@ const configureStore = (options = {}) => {
       }
       this.setState({ sessions: null });
       try {
-        await this.dataService.killSession(sessions);
+        await this.dataService.killSessions(sessions);
       } catch (err) {
         log.warn(mongoLogId(1001000096), 'Documents', 'Attempting to kill the session failed');
       }
diff --git a/packages/compass-crud/src/utils/cancellable-queries.spec.js b/packages/compass-crud/src/utils/cancellable-queries.spec.js
@@ -116,7 +116,7 @@ describe('cancellable-queries', function() {
       await expect(promise).to.be.rejectedWith(Error, OPERATION_CANCELLED_MESSAGE);
 
       // kill the session
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
 
       // give it enough time to be killed
       await delay(100);
@@ -180,7 +180,7 @@ describe('cancellable-queries', function() {
       // kill the session
       // (unfortunately I can't think of a way to slow the query down enough so
       //  we can make sure the operation appeared and then disappeared)
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
     });
   });
 
@@ -204,7 +204,7 @@ describe('cancellable-queries', function() {
 
       // kill the session
       // (same problem with testing that this actually worked as for count queries above)
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
     });
 
     // TODO: if (configDocs && configDocs.length) { implies that configDocs could be empty?
diff --git a/packages/data-service/package.json b/packages/data-service/package.json
@@ -71,7 +71,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@mongodb-js/devtools-docker-test-envs": "^1.2.0",
+    "@mongodb-js/devtools-docker-test-envs": "^1.2.1",
     "@mongodb-js/eslint-config-compass": "^0.3.0",
     "@mongodb-js/mocha-config-compass": "^0.4.0",
     "@mongodb-js/prettier-config-compass": "^0.2.0",
diff --git a/packages/data-service/src/connect-mongo-client.ts b/packages/data-service/src/connect-mongo-client.ts
@@ -101,6 +101,13 @@ function connectionOptionsToMongoClientParams(
     monitorCommands: true,
   };
 
+  if (connectionOptions.tlsCertificateFile) {
+    // NOTE: this property should not be confused with the 'tlsCertificateFile' url parameter
+    // that had to be specified for the Node.js driver instead of 'tlsCertificateKeyFile'
+    // before version 4.2.0 (https://jira.mongodb.org/browse/NODE-3591).
+    options.tlsCertificateFile = connectionOptions.tlsCertificateFile;
+  }
+
   // adds directConnection=true unless is explicitly a replica set
   const isLoadBalanced = url.searchParams.get('loadBalanced') === 'true';
   const isReplicaSet =
diff --git a/packages/data-service/src/connect.spec.ts b/packages/data-service/src/connect.spec.ts
@@ -516,6 +516,13 @@ describe('connect', function () {
         );
       });
 
+      it('connects with tls (tlsServerAndClientValidationKeyCrt)', async function () {
+        await testConnection(
+          envs.getConnectionOptions('tlsServerAndClientValidationKeyCrt'),
+          { authenticatedUserRoles: [], authenticatedUsers: [] }
+        );
+      });
+
       it('connects with tls (tlsX509)', async function () {
         await testConnection(envs.getConnectionOptions('tlsX509'), {
           authenticatedUserRoles: [
diff --git a/packages/data-service/src/data-service.spec.ts b/packages/data-service/src/data-service.spec.ts
@@ -1313,16 +1313,16 @@ describe('DataService', function () {
           const session = dataService.startSession();
           expect(session.constructor.name).to.equal('ClientSession');
 
-          // used by killSession, must be a bson UUID in order to work
+          // used by killSessions, must be a bson UUID in order to work
           expect(session.id!.id._bsontype).to.equal('Binary');
           expect(session.id!.id.sub_type).to.equal(4);
         });
       });
 
-      describe('#killSession', function () {
+      describe('#killSessions', function () {
         it('does not throw if kill a non existing session', async function () {
           const session = dataService.startSession();
-          await dataService.killSession(session);
+          await dataService.killSessions(session);
         });
 
         it('kills a command with a session', async function () {
@@ -1337,7 +1337,7 @@ describe('DataService', function () {
           );
 
           const session = dataService.startSession();
-          await dataService.killSession(session);
+          await dataService.killSessions(session);
 
           expect(commandSpy.args[0][0]).to.deep.equal({
             killSessions: [session.id],
diff --git a/packages/data-service/src/data-service.ts b/packages/data-service/src/data-service.ts
@@ -1420,7 +1420,7 @@ class DataService extends EventEmitter {
    * Kill a session and terminate all in progress operations.
    * @param clientSession - a ClientSession (can be created with startSession())
    */
-  killSession(sessions: ClientSession | ClientSession[]): Promise<Document> {
+  killSessions(sessions: ClientSession | ClientSession[]): Promise<Document> {
     return this._initializedClient.db('admin').command({
       killSessions: Array.isArray(sessions)
         ? sessions.map((s) => s.id)
diff --git a/scripts/changed.js b/scripts/changed.js
@@ -0,0 +1,176 @@
+const { spawnSync } = require('child_process');
+const prompts = require('prompts');
+const { runInDir } = require('./run-in-dir');
+const { withProgress } = require('./monorepo/with-progress');
+
+async function runCommandForPackages(command, packages) {
+  packages = [...packages];
+
+  const passed = [];
+  const failed = [];
+
+  while (packages.length) {
+    console.log();
+
+    const pkg = packages[0];
+    const { status, signal } = spawnSync(
+      'npx',
+      ['lerna', 'run', command, '--scope', pkg.name, '--stream'],
+      {
+        cwd: process.cwd(),
+        stdio: 'inherit',
+        timeout: 1000 * 60 * 20
+      }
+    );
+
+    if (status === 0) {
+      passed.push(packages.shift());
+      continue;
+    }
+
+    if (signal) {
+      const err = new Error(`Child process killed with signal ${signal}`);
+      err.signal = signal;
+      throw err;
+    }
+
+    console.log();
+
+    let canceled = false;
+
+    const { action } = await prompts(
+      [
+        {
+          type: 'select',
+          name: 'action',
+          message: `Running ${command} for the package ${pkg.name} failed`,
+          choices: [
+            { title: 'Re-run', value: 'rerun' },
+            { title: 'Skip', value: 'skip' }
+          ],
+          initial: 0
+        }
+      ],
+      {
+        onCancel() {
+          canceled = true;
+        }
+      }
+    );
+
+    if (canceled) {
+      break;
+    }
+
+    if (action === 'skip') {
+      failed.push(packages.shift());
+      continue;
+    }
+
+    if (action === 'rerun') {
+      continue;
+    }
+
+    throw new Error(`Unsupported option "${action}"`);
+  }
+
+  return { passed, failed };
+}
+
+async function runUntilDone(command, packages) {
+  packages = [...packages];
+
+  while (true) {
+    const { passed, failed } = await runCommandForPackages(command, packages);
+
+    console.log();
+    console.log(
+      `Finished running ${command} command for ${packages.length} package${
+        packages.length === 1 ? '' : 's'
+      }`
+    );
+    console.log();
+    if (passed.length === packages.length) {
+      console.log('✔ All scripts passed!');
+      console.log();
+      break;
+    }
+    console.log(
+      `✔ ${passed.length} package${passed.length === 1 ? '' : 's'} passed`
+    );
+    console.log(
+      `✖ ${failed.length} package${failed.length === 1 ? '' : 's'} failed`
+    );
+    console.log();
+
+    const { shouldRerun } = await prompts({
+      type: 'confirm',
+      name: 'shouldRerun',
+      message: 'Do you want to rerun failed scripts?',
+      initial: true
+    });
+
+    if (shouldRerun === false) {
+      break;
+    }
+
+    packages = [...failed];
+  }
+}
+
+async function main() {
+  const args = process.argv.slice(2);
+  const interactive = args.includes('--interactive');
+  const command = args.find((arg) => !arg.startsWith('-'));
+
+  /** @type {{ name: string }[]} */
+  const changedPackages = await withProgress(
+    'Looking up packages changed since origin/HEAD',
+    async function () {
+      const spinner = this;
+      const { stdout } = await runInDir(
+        'npx lerna list --since origin/HEAD --json --exclude-dependents'
+      );
+      const result = JSON.parse(stdout);
+      spinner.text =
+        result.length > 0
+          ? `Found ${result.length} package${
+              result.length === 1 ? '' : 's'
+            } changed since origin/HEAD`
+          : `No packages changed since origin/HEAD`;
+      return result;
+    }
+  );
+
+  console.log();
+
+  if (!command) {
+    throw new Error(
+      'Command is required: npm run changed test [--interactive]'
+    );
+  }
+
+  if (interactive) {
+    return await runUntilDone(command, changedPackages);
+  }
+
+  spawnSync(
+    'npx',
+    [
+      'lerna',
+      'run',
+      '--stream',
+      command,
+      ...changedPackages.map((pkg) => ['--scope', pkg.name]).flat()
+    ],
+    { cwd: process.cwd(), stdio: 'inherit' }
+  );
+}
+
+process.on('unhandledRejection', (err) => {
+  console.error();
+  console.error(err.stack || err.message || err);
+  process.exitCode = 1;
+});
+
+main();

Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ const configureStore = (options = {}) => {`
`1150`	`1150`	`}`
`1151`	`1151`	`this.setState({ sessions: null });`
`1152`	`1152`	`try {`
`1153`		`- await this.dataService.killSession(sessions);`
	`1153`	`+ await this.dataService.killSessions(sessions);`
`1154`	`1154`	`} catch (err) {`
`1155`	`1155`	`log.warn(mongoLogId(1001000096), 'Documents', 'Attempting to kill the session failed');`
`1156`	`1156`	`}`