chore: update node driver to 4.0.0-beta.5 MONGOSH-795 (#912)

rose-m · web-flow · commit ab925de2898a · 2021-05-27T14:10:05.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "karma-typescript": "^4.1.1",
     "lerna": "^3.10.7",
     "mocha": "^7.1.2",
-    "mongodb": "4.0.0-beta.4",
+    "mongodb": "4.0.0-beta.5",
     "mongodb-download-url": "^1.0.1",
     "mongodb-js-precommit": "^2.0.0",
     "nock": "^13.0.11",
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
@@ -30,7 +30,7 @@
     "@mongosh/errors": "0.0.0-dev.0",
     "@mongosh/i18n": "0.0.0-dev.0",
     "bson": "^4.4.0",
-    "mongodb": "4.0.0-beta.4",
+    "mongodb": "4.0.0-beta.5",
     "mongodb-build-info": "^1.1.1",
     "whatwg-url": "^8.4.0"
   },
diff --git a/packages/service-provider-core/src/all-transport-types.ts b/packages/service-provider-core/src/all-transport-types.ts
@@ -51,11 +51,11 @@ export type {
   OrderedBulkOperation,
   ReadConcern,
   ReadConcernLike,
-  ReadConcernLevelId,
+  ReadConcernLevel,
   ReadPreference,
   ReadPreferenceLike,
   ReadPreferenceFromOptions,
-  ReadPreferenceModeId,
+  ReadPreferenceMode,
   RenameOptions,
   ReplaceOptions,
   ResumeToken,
@@ -70,12 +70,11 @@ export type {
   ObjectId as ObjectIdType,
   Timestamp as TimestampType,
   Binary as BinaryType,
-  Topology,
   TopologyDescription,
-  TopologyTypeId,
-  ServerTypeId,
+  TopologyType,
+  ServerType,
   AutoEncryptionOptions,
   ServerApi,
-  ServerApiVersionId,
+  ServerApiVersion,
   MongoClient // mostly for testing
 } from 'mongodb';
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
@@ -43,7 +43,7 @@
     "@types/sinon": "^7.5.1",
     "@types/sinon-chai": "^3.2.3",
     "aws4": "^1.11.0",
-    "mongodb": "4.0.0-beta.4",
+    "mongodb": "4.0.0-beta.5",
     "saslprep": "mongodb-js/saslprep#v1.0.4"
   },
   "devDependencies": {
diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-server/src/cli-service-provider.ts
@@ -1,6 +1,6 @@
 import {
   Auth,
-  AuthMechanismId,
+  AuthMechanism,
   MongoClient,
   ReadPreference,
   Binary,
@@ -16,7 +16,6 @@ import {
   Decimal128,
   BSONSymbol,
   ClientMetadata,
-  Topology,
   ReadPreferenceFromOptions,
   ReadPreferenceLike,
   OperationOptions,
@@ -110,7 +109,7 @@ type DropDatabaseResult = {
 
 type ConnectionInfo = {
   buildInfo: any;
-  topology: Topology;
+  topology: any;
   extraInfo: ExtraConnectionInfo;
 };
 type ExtraConnectionInfo = ReturnType<typeof getConnectInfo>;
@@ -315,7 +314,7 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
         }
       }
     }
-    const topology = this.getTopology() as Topology;
+    const topology = this.getTopology();
     const { version } = require('../package.json');
     const [cmdLineOpts = null, atlasVersion = null] = await Promise.all([
       this.runCommandWithCheck('admin', { getCmdLineOpts: 1 }, this.baseCmdOptions).catch(() => {}),
@@ -972,8 +971,8 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
   /**
    * Get currently known topology information.
    */
-  getTopology(): Topology | undefined {
-    return this.mongoClient.topology;
+  getTopology(): any | undefined {
+    return (this.mongoClient as any).topology;
   }
 
   /**
@@ -1120,7 +1119,7 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
     const auth: Auth = { username: authDoc.user, password: authDoc.pwd };
     await this.resetConnectionOptions({
       auth,
-      ...(authDoc.mechanism ? { authMechanism: authDoc.mechanism as AuthMechanismId } : {}),
+      ...(authDoc.mechanism ? { authMechanism: authDoc.mechanism as AuthMechanism } : {}),
       ...(authDoc.authDb ? { authSource: authDoc.authDb } : {})
     });
     return { ok: 1 };
diff --git a/packages/service-provider-server/src/mongodb-patches.ts b/packages/service-provider-server/src/mongodb-patches.ts
@@ -1,5 +1,9 @@
 import { MongoshInternalError } from '@mongosh/errors';
-import { Callback, CloseOptions, Connection, ConnectionPool } from 'mongodb';
+import { Callback, CloseOptions } from 'mongodb';
+
+// We "rename" any here for more clarity below
+type ConnectionPool = any;
+type Connection = any;
 
 let alreadyPatched = false;
 
@@ -26,7 +30,7 @@ function patchConnectionPoolTracking(): void {
   const newCheckOut: typeof originalCheckOut = function(this: ConnectionPool, cb: Callback<Connection>): void {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const pool = this;
-    originalCheckOut.call(this, function(this: any, error, connection) {
+    originalCheckOut.call(this, function(this: any, error: any, connection: Connection) {
       if (connection) {
         let connections = poolToConnections.get(pool);
         if (!connections) {
diff --git a/packages/shell-api/src/cursor.ts b/packages/shell-api/src/cursor.ts
@@ -16,7 +16,7 @@ import type {
   Document,
   CollationOptions,
   ReadPreferenceLike,
-  ReadConcernLevelId,
+  ReadConcernLevel,
   TagSet,
   HedgeOptions
 } from '@mongosh/service-provider-core';
@@ -225,7 +225,7 @@ export default class Cursor extends AbstractCursor {
   }
 
   @returnType('Cursor')
-  readConcern(level: ReadConcernLevelId): Cursor {
+  readConcern(level: ReadConcernLevel): Cursor {
     this._cursor = this._cursor.withReadConcern({ level });
     return this;
   }
diff --git a/packages/shell-api/src/mongo.ts b/packages/shell-api/src/mongo.ts
@@ -24,17 +24,17 @@ import {
   Document,
   generateUri,
   ListDatabasesOptions,
-  ReadConcernLevelId,
+  ReadConcernLevel,
   ReadPreference,
   ReadPreferenceLike,
-  ReadPreferenceModeId,
+  ReadPreferenceMode,
   ReplPlatform,
   ServiceProvider,
   TransactionOptions,
   MongoClientOptions,
   AutoEncryptionOptions as SPAutoEncryption,
   ServerApi,
-  ServerApiVersionId,
+  ServerApiVersion,
   WriteConcern
 } from '@mongosh/service-provider-core';
 import type Collection from './collection';
@@ -74,7 +74,7 @@ export default class Mongo extends ShellApiClass {
     internalState: ShellInternalState,
     uri?: string,
     fleOptions?: ClientSideFieldLevelEncryptionOptions,
-    otherOptions?: { api?: ServerApi | ServerApiVersionId },
+    otherOptions?: { api?: ServerApi | ServerApiVersion },
     sp?: ServiceProvider
   ) {
     super();
@@ -325,7 +325,7 @@ export default class Mongo extends ShellApiClass {
     return await this._serviceProvider.suspend();
   }
 
-  getReadPrefMode(): ReadPreferenceModeId {
+  getReadPrefMode(): ReadPreferenceMode {
     return this._serviceProvider.getReadPreference().mode;
   }
 
@@ -373,7 +373,7 @@ export default class Mongo extends ShellApiClass {
   }
 
   @returnsPromise
-  async setReadConcern(level: ReadConcernLevelId): Promise<void> {
+  async setReadConcern(level: ReadConcernLevel): Promise<void> {
     await this._serviceProvider.resetConnectionOptions({ readConcern: { level: level } });
   }
 
diff --git a/packages/shell-api/src/session.spec.ts b/packages/shell-api/src/session.spec.ts
@@ -116,11 +116,11 @@ describe('Session', () => {
       expect(serviceProviderSession.endSession).to.have.been.calledOnceWith();
     });
     it('getClusterTime', () => {
-      serviceProviderSession.clusterTime = 100 as any;
+      (serviceProviderSession as any).clusterTime = 100 as any;
       expect(session.getClusterTime()).to.equal(100);
     });
     it('getOperationTime', () => {
-      serviceProviderSession.operationTime = 200 as any;
+      (serviceProviderSession as any).operationTime = 200 as any;
       expect(session.getOperationTime()).to.equal(200);
     });
     it('hasEnded', () => {
diff --git a/packages/shell-api/src/session.ts b/packages/shell-api/src/session.ts
@@ -83,11 +83,11 @@ export default class Session extends ShellApiWithMongoClass {
   }
 
   getClusterTime(): ClusterTime | undefined {
-    return this._session.clusterTime;
+    return (this._session as any).clusterTime;
   }
 
   getOperationTime(): TimestampType | undefined {
-    return this._session.operationTime;
+    return (this._session as any).operationTime;
   }
 
   getOptions(): ClientSessionOptions {
diff --git a/packages/shell-api/src/shell-api.ts b/packages/shell-api/src/shell-api.ts
@@ -16,7 +16,7 @@ import Database from './database';
 import { CommandResult, CursorIterationResult } from './result';
 import type ShellInternalState from './shell-internal-state';
 import { assertArgsDefinedType, assertCLI } from './helpers';
-import { DEFAULT_DB, ReplPlatform, ServerApi, ServerApiVersionId } from '@mongosh/service-provider-core';
+import { DEFAULT_DB, ReplPlatform, ServerApi, ServerApiVersion } from '@mongosh/service-provider-core';
 import { CommonErrors, MongoshUnimplementedError, MongoshInternalError } from '@mongosh/errors';
 import { DBQuery } from './dbquery';
 import { promisify } from 'util';
@@ -162,7 +162,7 @@ export default class ShellApi extends ShellApiClass {
   public async Mongo(
     uri?: string,
     fleOptions?: ClientSideFieldLevelEncryptionOptions,
-    otherOptions?: { api?: ServerApi | ServerApiVersionId }): Promise<Mongo> {
+    otherOptions?: { api?: ServerApi | ServerApiVersion }): Promise<Mongo> {
     assertCLI(this._internalState.initialServiceProvider.platform, 'new Mongo connections');
     const mongo = new Mongo(this._internalState, uri, fleOptions, otherOptions);
     await mongo.connect();
diff --git a/packages/shell-api/src/shell-internal-state.spec.ts b/packages/shell-api/src/shell-internal-state.spec.ts
@@ -1,4 +1,4 @@
-import { bson, ServiceProvider, Topology } from '@mongosh/service-provider-core';
+import { bson, ServiceProvider } from '@mongosh/service-provider-core';
 import { expect } from 'chai';
 import { EventEmitter } from 'events';
 import { StubbedInstance, stubInterface } from 'ts-sinon';
@@ -59,7 +59,7 @@ describe('ShellInternalState', () => {
   });
 
   describe('default prompt', () => {
-    const setupServiceProviderWithTopology = (topology: Topology) => {
+    const setupServiceProviderWithTopology = (topology: any) => {
       serviceProvider.getConnectionInfo.resolves({ extraInfo: { uri: 'mongodb://localhost/' } });
       serviceProvider.getTopology.returns(topology);
     };
@@ -152,7 +152,7 @@ describe('ShellInternalState', () => {
               setName: null, // This was observed behavior - the set was not updated even the single server had the set
               servers: servers
             }
-          } as Topology;
+          };
           setupServiceProviderWithTopology(topology);
 
           const prompt = await internalState.getDefaultPrompt();
@@ -182,7 +182,7 @@ describe('ShellInternalState', () => {
               setName: null,
               servers: servers
             }
-          } as Topology;
+          };
           setupServiceProviderWithTopology(topology);
 
           const prompt = await internalState.getDefaultPrompt();
@@ -199,7 +199,7 @@ describe('ShellInternalState', () => {
             type: 'ReplicaSetNoPrimary',
             setName: 'leSet'
           }
-        } as Topology;
+        };
         setupServiceProviderWithTopology(topology);
 
         const prompt = await internalState.getDefaultPrompt();
@@ -213,7 +213,7 @@ describe('ShellInternalState', () => {
             type: 'ReplicaSetWithPrimary',
             setName: 'leSet'
           }
-        } as Topology;
+        };
         setupServiceProviderWithTopology(topology);
 
         const prompt = await internalState.getDefaultPrompt();
@@ -228,7 +228,7 @@ describe('ShellInternalState', () => {
             // TODO: replace with TopologyType.Sharded - NODE-2973
             type: 'Sharded'
           }
-        } as Topology;
+        };
         setupServiceProviderWithTopology(topology);
 
         const prompt = await internalState.getDefaultPrompt();
@@ -241,7 +241,7 @@ describe('ShellInternalState', () => {
             type: 'Sharded',
             setName: 'leSet'
           }
-        } as Topology;
+        };
         setupServiceProviderWithTopology(topology);
 
         const prompt = await internalState.getDefaultPrompt();
@@ -287,7 +287,7 @@ describe('ShellInternalState', () => {
             setName: 'unknown',
             servers: servers
           }
-        } as Topology;
+        };
         setupServiceProviderWithTopology(topology);
 
         const prompt = await internalState.getDefaultPrompt();
diff --git a/packages/shell-api/src/shell-internal-state.ts b/packages/shell-api/src/shell-internal-state.ts
@@ -6,7 +6,7 @@ import {
   ReplPlatform,
   ServiceProvider,
   TopologyDescription,
-  TopologyTypeId
+  TopologyType
 } from '@mongosh/service-provider-core';
 import type { ApiEvent, ConfigProvider, MongoshBus, ShellUserConfig } from '@mongosh/types';
 import { EventEmitter } from 'events';
@@ -258,7 +258,7 @@ export default class ShellInternalState {
       topology: () => {
         let topology: Topologies;
         const topologyDescription = this.currentServiceProvider.getTopology()?.description as TopologyDescription;
-        const topologyType: TopologyTypeId | undefined = topologyDescription?.type;
+        const topologyType: TopologyType | undefined = topologyDescription?.type;
         switch (topologyType) {
           case 'ReplicaSetNoPrimary':
           case 'ReplicaSetWithPrimary':
