feat: bump driver to 4.1.0 MONGOSH-868 (#1055)

addaleax · web-flow · commit c3ec0c79418f · 2021-08-04T15:02:23.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "karma-typescript": "^5.5.1",
     "lerna": "^4.0.0",
     "mocha": "^7.1.2",
-    "mongodb": "addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28",
+    "mongodb": "^4.1.0",
     "mongodb-download-url": "^1.0.3",
     "mongodb-js-precommit": "^2.0.0",
     "nock": "^13.0.11",
diff --git a/packages/i18n/src/locales/en_US.ts b/packages/i18n/src/locales/en_US.ts
@@ -1668,7 +1668,7 @@ const translations: Catalog = {
               description: 'Aborts the session’s transaction.'
             },
             advanceClusterTime: {
-              description: 'advanceClusterTime is not currently supported due it not being supported in the driver, see NODE-2843.'
+              description: 'Advances the clusterTime for a Session to the provided clusterTime.'
             }
           }
         }
diff --git a/packages/java-shell/package-lock.json b/packages/java-shell/package-lock.json
diff --git a/packages/service-provider-core/package-lock.json b/packages/service-provider-core/package-lock.json
diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json
@@ -33,7 +33,7 @@
     "@mongosh/errors": "0.0.0-dev.0",
     "@mongosh/i18n": "0.0.0-dev.0",
     "bson": "^4.4.1",
-    "mongodb": "addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28",
+    "mongodb": "^4.1.0",
     "mongodb-build-info": "^1.2.0",
     "mongodb-connection-string-url": "^1.0.0"
   },
diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json
diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json
@@ -42,7 +42,7 @@
     "@mongosh/service-provider-core": "0.0.0-dev.0",
     "@mongosh/types": "0.0.0-dev.0",
     "@types/sinon-chai": "^3.2.3",
-    "mongodb": "addaleax/node-mongodb-native#71d4c39e5c858f49d10e840df626eca4da653e28",
+    "mongodb": "^4.1.0",
     "saslprep": "mongodb-js/saslprep#v1.0.4",
     "mongodb-connection-string-url": "^1.0.0"
   },
diff --git a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts b/packages/service-provider-server/src/cli-service-provider.integration.spec.ts
@@ -76,7 +76,7 @@ describe('CliServiceProvider [integration]', function() {
         await serviceProvider.runCommandWithCheck('admin', { ping: 1 });
         expect.fail('missed exception');
       } catch (err) {
-        expect(err.name).to.equal('MongoDriverError');
+        expect(err.name).to.equal('MongoNotConnectedError');
       }
       await reconnect();
       await serviceProvider.runCommandWithCheck('admin', { ping: 1 });
diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-server/src/cli-service-provider.ts
@@ -286,15 +286,6 @@ export async function connectMongoClient(uri: string, clientOptions: MongoClient
     }
   }
   uri = await resolveMongodbSrv(uri, bus);
-  if (uri.startsWith('mongodb://') || uri.startsWith('mongodb+srv://')) {
-    // Hack for Load Balancer support until the driver side is finished:
-    const cs = new ConnectionString(uri);
-    if (cs.searchParams.get('loadBalanced') === 'true' &&
-        !cs.searchParams.has('maxPoolSize')) {
-      cs.searchParams.set('maxPoolSize', '1');
-      uri = cs.href;
-    }
-  }
   const client = new MClient(uri, clientOptions);
   await connectWithFailFast(client, bus);
   return client;
diff --git a/packages/shell-api/src/integration.spec.ts b/packages/shell-api/src/integration.spec.ts
@@ -1829,7 +1829,7 @@ describe('Shell API (integration)', function() {
             try {
               await bulk.execute();
             } catch (err) {
-              expect(err.name).to.equal('MongoDriverError');
+              expect(err.name).to.equal('MongoBatchReExecutionError');
               return;
             }
             expect.fail('Error not thrown');
diff --git a/packages/shell-api/src/session.spec.ts b/packages/shell-api/src/session.spec.ts
@@ -16,7 +16,7 @@ import { CliServiceProvider } from '../../service-provider-server';
 import { startTestCluster, skipIfApiStrict } from '../../../testing/integration-testing-hooks';
 import { ensureMaster, ensureSessionExists } from '../../../testing/helpers';
 import Database from './database';
-import { CommonErrors, MongoshInvalidInputError, MongoshUnimplementedError } from '@mongosh/errors';
+import { CommonErrors, MongoshInvalidInputError } from '@mongosh/errors';
 import { EventEmitter } from 'events';
 
 describe('Session', () => {
@@ -102,16 +102,9 @@ describe('Session', () => {
       expect(serviceProviderSession.advanceOperationTime).to.have.been.calledOnceWith(ts);
     });
     it('advanceClusterTime', () => {
-      try {
-        session.advanceClusterTime();
-      } catch (e) {
-        expect(e).to.be.instanceOf(MongoshUnimplementedError);
-        expect(e.code).to.equal(CommonErrors.NotImplemented);
-        expect(e.metadata?.driverCaused).to.equal(true);
-        expect(e.metadata?.api).to.equal('Session.advanceClusterTime');
-        return;
-      }
-      expect.fail('Error not thrown');
+      const ct = { clusterTime: { ts: 1 } } as any;
+      session.advanceClusterTime(ct);
+      expect(serviceProviderSession.advanceClusterTime).to.have.been.calledOnceWith(ct);
     });
     it('endSession', async() => {
       await session.endSession();
diff --git a/packages/shell-api/src/session.ts b/packages/shell-api/src/session.ts
@@ -17,8 +17,7 @@ import {
 import { asPrintable } from './enums';
 import Mongo from './mongo';
 import Database from './database';
-import { CommonErrors, MongoshInvalidInputError, MongoshUnimplementedError } from '@mongosh/errors';
-import { blockedByDriverMetadata } from './error-codes';
+import { CommonErrors, MongoshInvalidInputError } from '@mongosh/errors';
 import { assertArgsDefinedType, isValidDatabaseName } from './helpers';
 
 @shellApiClassDefault
@@ -63,12 +62,8 @@ export default class Session extends ShellApiWithMongoClass {
     this._session.advanceOperationTime(ts);
   }
 
-  advanceClusterTime(): void {
-    throw new MongoshUnimplementedError(
-      'Calling advanceClusterTime is not currently supported due it not being supported in the driver, see NODE-2843.',
-      CommonErrors.NotImplemented,
-      blockedByDriverMetadata('Session.advanceClusterTime')
-    );
+  advanceClusterTime(clusterTime: ClusterTime): void {
+    this._session.advanceClusterTime(clusterTime);
   }
 
   @returnsPromise
@@ -81,11 +76,11 @@ export default class Session extends ShellApiWithMongoClass {
   }
 
   getClusterTime(): ClusterTime | undefined {
-    return (this._session as any).clusterTime;
+    return this._session.clusterTime;
   }
 
   getOperationTime(): TimestampType | undefined {
-    return (this._session as any).operationTime;
+    return this._session.operationTime;
   }
 
   getOptions(): ClientSessionOptions {

Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ const translations: Catalog = {`
`1668`	`1668`	`description: 'Aborts the session’s transaction.'`
`1669`	`1669`	`},`
`1670`	`1670`	`advanceClusterTime: {`
`1671`		`- description: 'advanceClusterTime is not currently supported due it not being supported in the driver, see NODE-2843.'`
	`1671`	`+ description: 'Advances the clusterTime for a Session to the provided clusterTime.'`
`1672`	`1672`	`}`
`1673`	`1673`	`}`
`1674`	`1674`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ describe('CliServiceProvider [integration]', function() {`
`76`	`76`	`await serviceProvider.runCommandWithCheck('admin', { ping: 1 });`
`77`	`77`	`expect.fail('missed exception');`
`78`	`78`	`} catch (err) {`
`79`		`- expect(err.name).to.equal('MongoDriverError');`
	`79`	`+ expect(err.name).to.equal('MongoNotConnectedError');`
`80`	`80`	`}`
`81`	`81`	`await reconnect();`
`82`	`82`	`await serviceProvider.runCommandWithCheck('admin', { ping: 1 });`