mongodb-data-service 21.13.0 → 21.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,21 +26,29 @@ async function connectMongoClient(connectionOptions, setupListeners, tunnelLocal
26
26
  }
27
27
  try {
28
28
  debug('waiting for MongoClient to connect ...');
29
- const client = (await Promise.race([
30
- mongoClient.connect(),
29
+ await Promise.race([
30
+ (async () => {
31
+ await mongoClient.connect();
32
+ await mongoClient.db('admin').command({ ping: 1 });
33
+ })(),
31
34
  ssh_tunnel_1.waitForTunnelError(tunnel),
32
- ]));
35
+ ]);
33
36
  log.info(mongoLogId(1001000012), 'Connect', 'Connection established', {
34
37
  driver: (_b = (_a = mongoClient.options) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.driver,
35
38
  url: redact_1.redactConnectionString(urlWithSshTunnel),
36
39
  });
37
- return [client, tunnel, { url: urlWithSshTunnel, options: driverOptions }];
40
+ return [
41
+ mongoClient,
42
+ tunnel,
43
+ { url: urlWithSshTunnel, options: driverOptions },
44
+ ];
38
45
  }
39
46
  catch (err) {
40
47
  log.error(mongoLogId(1001000013), 'Connect', 'Connection attempt failed', { error: err.message });
41
48
  debug('connection error', err);
42
49
  debug('force shutting down ssh tunnel ...');
43
- await ssh_tunnel_1.forceCloseTunnel(tunnel);
50
+ await Promise.all([ssh_tunnel_1.forceCloseTunnel(tunnel), mongoClient.close()]).catch(() => {
51
+ });
44
52
  throw err;
45
53
  }
46
54
  }
@@ -50,12 +58,10 @@ function connectionOptionsToMongoClientParams(connectionOptions) {
50
58
  const options = {
51
59
  monitorCommands: true,
52
60
  };
53
- if (connectionOptions.tlsCertificateFile) {
54
- options.tlsCertificateFile = connectionOptions.tlsCertificateFile;
55
- }
56
61
  const isLoadBalanced = url.searchParams.get('loadBalanced') === 'true';
57
62
  const isReplicaSet = url.isSRV || url.hosts.length > 1 || url.searchParams.has('replicaSet');
58
- if (!isReplicaSet && !isLoadBalanced) {
63
+ const hasDirectConnection = url.searchParams.has('directConnection');
64
+ if (!isReplicaSet && !isLoadBalanced && !hasDirectConnection) {
59
65
  url.searchParams.set('directConnection', 'true');
60
66
  }
61
67
  if (!url.searchParams.has('tlsCertificateFile') &&
@@ -1 +1 @@
1
- {"version":3,"file":"connect-mongo-client.js","sourceRoot":"","sources":["../src/connect-mongo-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connect-mongo-client.js","sourceRoot":"","sources":["../src/connect-mongo-client.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { ConnectionOptions } from './connection-options';
2
2
  export interface ConnectionInfo {
3
- readonly id?: string;
3
+ readonly id: string;
4
4
  lastUsed?: Date;
5
5
  favorite?: ConnectionFavoriteOptions;
6
6
  connectionOptions: ConnectionOptions;
@@ -1,6 +1,5 @@
1
1
  export interface ConnectionOptions {
2
2
  connectionString: string;
3
- tlsCertificateFile?: string;
4
3
  sshTunnel?: ConnectionSshOptions;
5
4
  }
6
5
  export interface ConnectionSshOptions {
@@ -4,6 +4,7 @@ export interface ConnectionSecrets {
4
4
  sshTunnelPassphrase?: string;
5
5
  awsSessionToken?: string;
6
6
  tlsCertificateKeyFilePassword?: string;
7
+ proxyPassword?: string;
7
8
  }
8
9
  export declare function mergeSecrets(connectionInfo: Readonly<ConnectionInfo>, secrets: ConnectionSecrets | undefined): ConnectionInfo;
9
10
  export declare function extractSecrets(connectionInfo: Readonly<ConnectionInfo>): {
@@ -25,9 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.extractSecrets = exports.mergeSecrets = void 0;
26
26
  const lodash_1 = __importDefault(require("lodash"));
27
27
  const mongodb_connection_string_url_1 = __importStar(require("mongodb-connection-string-url"));
28
- const AWS_SESSION_TOKEN_PROPERTY = 'AWS_SESSION_TOKEN';
29
- const AUTH_MECHANISM_PROPERTIES_PARAM = 'authMechanismProperties';
30
- const TLS_CERTIFICATE_KEY_FILE_PASSWORD_PARAM = 'tlsCertificateKeyFilePassword';
31
28
  function mergeSecrets(connectionInfo, secrets) {
32
29
  const connectionInfoWithSecrets = lodash_1.default.cloneDeep(connectionInfo);
33
30
  if (!secrets) {
@@ -43,12 +40,15 @@ function mergeSecrets(connectionInfo, secrets) {
43
40
  secrets.sshTunnelPassphrase;
44
41
  }
45
42
  if (secrets.tlsCertificateKeyFilePassword) {
46
- uri.searchParams.set(TLS_CERTIFICATE_KEY_FILE_PASSWORD_PARAM, secrets.tlsCertificateKeyFilePassword);
43
+ uri.searchParams.set('tlsCertificateKeyFilePassword', secrets.tlsCertificateKeyFilePassword);
44
+ }
45
+ if (secrets.proxyPassword) {
46
+ uri.searchParams.set('proxyPassword', secrets.proxyPassword);
47
47
  }
48
48
  if (secrets.awsSessionToken) {
49
- const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get(AUTH_MECHANISM_PROPERTIES_PARAM));
50
- authMechanismProperties.set(AWS_SESSION_TOKEN_PROPERTY, secrets.awsSessionToken);
51
- uri.searchParams.set(AUTH_MECHANISM_PROPERTIES_PARAM, authMechanismProperties.toString());
49
+ const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get('authMechanismProperties'));
50
+ authMechanismProperties.set('AWS_SESSION_TOKEN', secrets.awsSessionToken);
51
+ uri.searchParams.set('authMechanismProperties', authMechanismProperties.toString());
52
52
  }
53
53
  connectionInfoWithSecrets.connectionOptions.connectionString = uri.href;
54
54
  return connectionInfoWithSecrets;
@@ -69,21 +69,24 @@ function extractSecrets(connectionInfo) {
69
69
  connectionOptions.sshTunnel.identityKeyPassphrase;
70
70
  delete connectionOptions.sshTunnel.identityKeyPassphrase;
71
71
  }
72
- if (uri.searchParams.has(TLS_CERTIFICATE_KEY_FILE_PASSWORD_PARAM)) {
72
+ if (uri.searchParams.has('tlsCertificateKeyFilePassword')) {
73
73
  secrets.tlsCertificateKeyFilePassword =
74
- uri.searchParams.get(TLS_CERTIFICATE_KEY_FILE_PASSWORD_PARAM) ||
75
- undefined;
76
- uri.searchParams.delete(TLS_CERTIFICATE_KEY_FILE_PASSWORD_PARAM);
74
+ uri.searchParams.get('tlsCertificateKeyFilePassword') || undefined;
75
+ uri.searchParams.delete('tlsCertificateKeyFilePassword');
76
+ }
77
+ if (uri.searchParams.has('proxyPassword')) {
78
+ secrets.proxyPassword = uri.searchParams.get('proxyPassword') || undefined;
79
+ uri.searchParams.delete('proxyPassword');
77
80
  }
78
- const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get(AUTH_MECHANISM_PROPERTIES_PARAM));
79
- if (authMechanismProperties.has(AWS_SESSION_TOKEN_PROPERTY)) {
80
- secrets.awsSessionToken = authMechanismProperties.get(AWS_SESSION_TOKEN_PROPERTY);
81
- authMechanismProperties.delete(AWS_SESSION_TOKEN_PROPERTY);
81
+ const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get('authMechanismProperties'));
82
+ if (authMechanismProperties.has('AWS_SESSION_TOKEN')) {
83
+ secrets.awsSessionToken = authMechanismProperties.get('AWS_SESSION_TOKEN');
84
+ authMechanismProperties.delete('AWS_SESSION_TOKEN');
82
85
  if (authMechanismProperties.toString()) {
83
- uri.searchParams.set(AUTH_MECHANISM_PROPERTIES_PARAM, authMechanismProperties.toString());
86
+ uri.searchParams.set('authMechanismProperties', authMechanismProperties.toString());
84
87
  }
85
88
  else {
86
- uri.searchParams.delete(AUTH_MECHANISM_PROPERTIES_PARAM);
89
+ uri.searchParams.delete('authMechanismProperties');
87
90
  }
88
91
  }
89
92
  connectionInfoWithoutSecrets.connectionOptions.connectionString = uri.href;
@@ -1 +1 @@
1
- {"version":3,"file":"connection-secrets.js","sourceRoot":"","sources":["../src/connection-secrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection-secrets.js","sourceRoot":"","sources":["../src/connection-secrets.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,6 @@
1
1
  import { ConnectionInfo } from './connection-info';
2
- declare type ConnectionInfoWithRequiredId = ConnectionInfo & Required<Pick<ConnectionInfo, 'id'>>;
3
2
  export declare class ConnectionStorage {
4
3
  loadAll(): Promise<ConnectionInfo[]>;
5
- save(connectionInfo: ConnectionInfoWithRequiredId): Promise<void>;
6
- delete(connectionOptions: ConnectionInfoWithRequiredId): Promise<void>;
4
+ save(connectionInfo: ConnectionInfo): Promise<void>;
5
+ delete(connectionOptions: ConnectionInfo): Promise<void>;
7
6
  }
8
- export {};
@@ -1 +1 @@
1
- {"version":3,"file":"connection-storage.js","sourceRoot":"","sources":["../src/connection-storage.ts"],"names":[],"mappings":";;;AAKA,+BAAgD;AAChD,8EAI0C;AAE1C,MAAa,iBAAiB;IAM5B,KAAK,CAAC,OAAO;QAEX,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;QACrE,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACxD,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACtD,CAAC;QAEF,MAAM,qBAAqB,EAAE,CAAC;QAC9B,OAAO,oBAAoB,CAAC,GAAG,CAAC,sDAA4B,CAAC,CAAC;IAChE,CAAC;IAUD,KAAK,CAAC,IAAI,CAAC,cAA4C;QACrD,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,eAAY,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,cAAc,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,EAAE,CAAC;IACf,CAAC;IAaD,KAAK,CAAC,MAAM,CAAC,iBAA+C;QAC1D,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE;YAGzB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,iBAAiB,CAAC,CAAC;QACpE,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AA5DD,8CA4DC;AAED,SAAS,wBAAwB,CAC/B,EAAgD;IAEhD,OAAO,GAAG,EAAE,CACV,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,EAAE,CAAC;YACD,OAAO,EAAE,CAAC,KAAQ,EAAE,EAAE;gBACpB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;YACD,KAAK,EAAE,CAAC,KAAQ,EAAE,KAAY,EAAE,EAAE;gBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"connection-storage.js","sourceRoot":"","sources":["../src/connection-storage.ts"],"names":[],"mappings":";;;AAEA,+BAAgD;AAChD,8EAI0C;AAE1C,MAAa,iBAAiB;IAM5B,KAAK,CAAC,OAAO;QAEX,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;QACrE,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACxD,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACtD,CAAC;QAEF,MAAM,qBAAqB,EAAE,CAAC;QAC9B,OAAO,oBAAoB,CAAC,GAAG,CAAC,sDAA4B,CAAC,CAAC;IAChE,CAAC;IAUD,KAAK,CAAC,IAAI,CAAC,cAA8B;QACvC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,eAAY,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,cAAc,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,EAAE,CAAC;IACf,CAAC;IAaD,KAAK,CAAC,MAAM,CAAC,iBAAiC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE;YAGzB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,iBAAiB,CAAC,CAAC;QACpE,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AA5DD,8CA4DC;AAED,SAAS,wBAAwB,CAC/B,EAAgD;IAEhD,OAAO,GAAG,EAAE,CACV,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,EAAE,CAAC;YACD,OAAO,EAAE,CAAC,KAAQ,EAAE,EAAE;gBACpB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;YACD,KAAK,EAAE,CAAC,KAAQ,EAAE,KAAY,EAAE,EAAE;gBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -5,6 +5,7 @@ import ConnectionStringUrl from 'mongodb-connection-string-url';
5
5
  import { ConnectionOptions } from './connection-options';
6
6
  import { adaptCollectionInfo, adaptDatabaseInfo, InstanceDetails } from './instance-detail-helper';
7
7
  import { Callback, CollectionStats } from './types';
8
+ import { ConnectionStatusWithPrivileges } from './run-command';
8
9
  declare class DataService extends EventEmitter {
9
10
  private readonly _connectionOptions;
10
11
  private _isConnecting;
@@ -31,11 +32,15 @@ declare class DataService extends EventEmitter {
31
32
  command(databaseName: string, comm: Document, callback: Callback<Document>): void;
32
33
  isWritable(): boolean;
33
34
  isMongos(): boolean;
34
- listCollections(databaseName: string, filter?: Document, { nameOnly }?: {
35
+ connectionStatus(): Promise<ConnectionStatusWithPrivileges>;
36
+ private _getPrivilegesOrFallback;
37
+ listCollections(databaseName: string, filter?: Document, { nameOnly, privileges, }?: {
35
38
  nameOnly?: true;
39
+ privileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null;
36
40
  }): Promise<ReturnType<typeof adaptCollectionInfo>[]>;
37
- listDatabases({ nameOnly, }?: {
41
+ listDatabases({ nameOnly, privileges, }?: {
38
42
  nameOnly?: true;
43
+ privileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null;
39
44
  }): Promise<ReturnType<typeof adaptDatabaseInfo>[]>;
40
45
  connect(): Promise<void>;
41
46
  estimatedCount(ns: string, options: EstimatedDocumentCountOptions, callback: Callback<number>): void;
@@ -107,25 +107,51 @@ class DataService extends events_1.EventEmitter {
107
107
  isMongos() {
108
108
  return this._isMongos;
109
109
  }
110
- async listCollections(databaseName, filter = {}, { nameOnly } = {}) {
111
- const db = this._initializedClient.db(databaseName);
110
+ async connectionStatus() {
111
+ const logop = this._startLogOp(mongoLogId(1001000100), 'Running connectionStatus');
112
+ try {
113
+ const adminDb = this._initializedClient.db('admin');
114
+ const result = await run_command_1.runCommand(adminDb, {
115
+ connectionStatus: 1,
116
+ showPrivileges: true,
117
+ });
118
+ logop(null);
119
+ return result;
120
+ }
121
+ catch (e) {
122
+ logop(e);
123
+ throw e;
124
+ }
125
+ }
126
+ async _getPrivilegesOrFallback(privileges = null) {
127
+ if (privileges) {
128
+ return privileges;
129
+ }
130
+ const { authInfo: { authenticatedUserPrivileges }, } = await this.connectionStatus();
131
+ return authenticatedUserPrivileges;
132
+ }
133
+ async listCollections(databaseName, filter = {}, { nameOnly, privileges = null, } = {}) {
112
134
  const logop = this._startLogOp(mongoLogId(1001000032), 'Running listCollections', { db: databaseName, nameOnly: nameOnly !== null && nameOnly !== void 0 ? nameOnly : false });
135
+ const db = this._initializedClient.db(databaseName);
136
+ const listCollections = async () => {
137
+ try {
138
+ return await db.listCollections(filter, { nameOnly }).toArray();
139
+ }
140
+ catch (err) {
141
+ log.warn(mongoLogId(1001000099), this._logCtx(), 'Failed to run listCollections', { message: err.message });
142
+ return [];
143
+ }
144
+ };
145
+ const getCollectionsFromPrivileges = async () => {
146
+ const databases = instance_detail_helper_1.getPrivilegesByDatabaseAndCollection(await this._getPrivilegesOrFallback(privileges), ['find']);
147
+ return Object.keys(databases[databaseName] || {})
148
+ .filter(Boolean)
149
+ .map((name) => ({ name }));
150
+ };
113
151
  try {
114
152
  const [listedCollections, collectionsFromPrivileges] = await Promise.all([
115
- db
116
- .listCollections(filter, { nameOnly })
117
- .toArray()
118
- .catch((err) => {
119
- log.warn(mongoLogId(1001000099), this._logCtx(), 'Failed to run listCollections', { message: err.message });
120
- return [];
121
- }),
122
- instance_detail_helper_1.getDatabasesAndCollectionsFromPrivileges(this._initializedClient, [
123
- 'find',
124
- ]).then((databases) => {
125
- return Object.keys(databases[databaseName] || {})
126
- .filter(Boolean)
127
- .map((name) => ({ name }));
128
- }),
153
+ listCollections(),
154
+ getCollectionsFromPrivileges(),
129
155
  ]);
130
156
  const collections = uniqueBy([...collectionsFromPrivileges, ...listedCollections], 'name').map((coll) => instance_detail_helper_1.adaptCollectionInfo({ db: databaseName, ...coll }));
131
157
  logop(null, { collectionsCount: collections.length });
@@ -136,26 +162,34 @@ class DataService extends events_1.EventEmitter {
136
162
  throw err;
137
163
  }
138
164
  }
139
- async listDatabases({ nameOnly, } = {}) {
165
+ async listDatabases({ nameOnly, privileges = null, } = {}) {
140
166
  const logop = this._startLogOp(mongoLogId(1001000033), 'Running listDatabases', { nameOnly: nameOnly !== null && nameOnly !== void 0 ? nameOnly : false });
141
167
  const adminDb = this._initializedClient.db('admin');
168
+ const listDatabases = async () => {
169
+ try {
170
+ const { databases } = await run_command_1.runCommand(adminDb, {
171
+ listDatabases: 1,
172
+ nameOnly,
173
+ });
174
+ return databases;
175
+ }
176
+ catch (err) {
177
+ log.warn(mongoLogId(1001000098), this._logCtx(), 'Failed to run listDatabases', { message: err.message });
178
+ return [];
179
+ }
180
+ };
181
+ const getDatabasesFromPrivileges = async () => {
182
+ const databases = instance_detail_helper_1.getPrivilegesByDatabaseAndCollection(await this._getPrivilegesOrFallback(privileges), ['find']);
183
+ return Object.keys(databases)
184
+ .filter(Boolean)
185
+ .map((name) => ({ name }));
186
+ };
142
187
  try {
143
188
  const [listedDatabases, databasesFromPrivileges] = await Promise.all([
144
- run_command_1.runCommand(adminDb, { listDatabases: 1, nameOnly }).catch((err) => {
145
- log.warn(mongoLogId(1001000098), this._logCtx(), 'Failed to run listDatabases', { message: err.message });
146
- return { databases: [] };
147
- }),
148
- instance_detail_helper_1.getDatabasesAndCollectionsFromPrivileges(this._initializedClient, [
149
- 'find',
150
- ]).then((databases) => {
151
- return {
152
- databases: Object.keys(databases)
153
- .filter(Boolean)
154
- .map((name) => ({ name })),
155
- };
156
- }),
189
+ listDatabases(),
190
+ getDatabasesFromPrivileges(),
157
191
  ]);
158
- const databases = uniqueBy([...databasesFromPrivileges.databases, ...listedDatabases.databases], 'name').map((db) => instance_detail_helper_1.adaptDatabaseInfo({ db: db.name, ...db }));
192
+ const databases = uniqueBy([...databasesFromPrivileges, ...listedDatabases], 'name').map((db) => instance_detail_helper_1.adaptDatabaseInfo({ db: db.name, ...db }));
159
193
  logop(null, { databasesCount: databases.length });
160
194
  return databases;
161
195
  }
@@ -179,7 +213,9 @@ class DataService extends events_1.EventEmitter {
179
213
  url: redact_1.redactConnectionString(this._connectionOptions.connectionString),
180
214
  });
181
215
  try {
182
- const tunnelLocalPort = await get_port_1.default();
216
+ const tunnelLocalPort = this._connectionOptions.sshTunnel
217
+ ? await get_port_1.default()
218
+ : 0;
183
219
  const [client, tunnel, connectionOptions] = await connect_mongo_client_1.default(this._connectionOptions, this.setupListeners.bind(this), tunnelLocalPort);
184
220
  const attr = {
185
221
  isWritable: this.isWritable(),
@@ -1 +1 @@
1
- {"version":3,"file":"data-service.js","sourceRoot":"","sources":["../src/data-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-service.js","sourceRoot":"","sources":["../src/data-service.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -5,4 +5,5 @@ import { ConnectionStorage } from './connection-storage';
5
5
  import { getConnectionTitle } from './connection-title';
6
6
  import DataService from './data-service';
7
7
  import { convertConnectionModelToInfo, convertConnectionInfoToModel } from './legacy/legacy-connection-model';
8
- export { ConnectionInfo, ConnectionOptions, ConnectionStorage, DataService, connect, getConnectionTitle, convertConnectionModelToInfo, convertConnectionInfoToModel, };
8
+ import { ConnectionSecrets, extractSecrets, mergeSecrets } from './connection-secrets';
9
+ export { ConnectionInfo, ConnectionOptions, ConnectionStorage, DataService, connect, getConnectionTitle, convertConnectionModelToInfo, convertConnectionInfoToModel, ConnectionSecrets, extractSecrets, mergeSecrets, };
package/lib/index.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.convertConnectionInfoToModel = exports.convertConnectionModelToInfo = exports.getConnectionTitle = exports.connect = exports.DataService = exports.ConnectionStorage = void 0;
6
+ exports.mergeSecrets = exports.extractSecrets = exports.convertConnectionInfoToModel = exports.convertConnectionModelToInfo = exports.getConnectionTitle = exports.connect = exports.DataService = exports.ConnectionStorage = void 0;
7
7
  const connect_1 = __importDefault(require("./connect"));
8
8
  exports.connect = connect_1.default;
9
9
  const connection_storage_1 = require("./connection-storage");
@@ -15,4 +15,7 @@ exports.DataService = data_service_1.default;
15
15
  const legacy_connection_model_1 = require("./legacy/legacy-connection-model");
16
16
  Object.defineProperty(exports, "convertConnectionModelToInfo", { enumerable: true, get: function () { return legacy_connection_model_1.convertConnectionModelToInfo; } });
17
17
  Object.defineProperty(exports, "convertConnectionInfoToModel", { enumerable: true, get: function () { return legacy_connection_model_1.convertConnectionInfoToModel; } });
18
+ const connection_secrets_1 = require("./connection-secrets");
19
+ Object.defineProperty(exports, "extractSecrets", { enumerable: true, get: function () { return connection_secrets_1.extractSecrets; } });
20
+ Object.defineProperty(exports, "mergeSecrets", { enumerable: true, get: function () { return connection_secrets_1.mergeSecrets; } });
18
21
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAgB9B,kBAhBK,iBAAO,CAgBL;AAbT,6DAAyD;AAWvD,kGAXO,sCAAiB,OAWP;AAVnB,yDAAwD;AAatD,mGAbO,qCAAkB,OAaP;AAZpB,kEAAyC;AAUvC,sBAVK,sBAAW,CAUL;AATb,8EAG0C;AASxC,6GAXA,sDAA4B,OAWA;AAC5B,6GAXA,sDAA4B,OAWA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAqB9B,kBArBK,iBAAO,CAqBL;AAlBT,6DAAyD;AAgBvD,kGAhBO,sCAAiB,OAgBP;AAfnB,yDAAwD;AAkBtD,mGAlBO,qCAAkB,OAkBP;AAjBpB,kEAAyC;AAevC,sBAfK,sBAAW,CAeL;AAdb,8EAG0C;AAcxC,6GAhBA,sDAA4B,OAgBA;AAC5B,6GAhBA,sDAA4B,OAgBA;AAd9B,6DAI8B;AAY5B,+FAdA,mCAAc,OAcA;AACd,6FAdA,iCAAY,OAcA"}
@@ -54,17 +54,21 @@ declare type DatabaseDetails = {
54
54
  collections: CollectionDetails[];
55
55
  };
56
56
  export declare type InstanceDetails = {
57
+ auth: {
58
+ user: ConnectionStatusWithPrivileges['authInfo']['authenticatedUsers'][number] | null;
59
+ roles: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserRoles'];
60
+ privileges: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'];
61
+ };
57
62
  build: BuildInfoDetails;
58
63
  host: HostInfoDetails;
59
64
  genuineMongoDB: GenuineMongoDBDetails;
60
65
  dataLake: DataLakeDetails;
61
66
  featureCompatibilityVersion: string | null;
67
+ isAtlas: boolean;
62
68
  };
63
69
  export declare function getInstance(client: MongoClient): Promise<InstanceDetails>;
64
70
  declare type DatabaseCollectionPrivileges = Record<string, Record<string, string[]>>;
65
- export declare function extractPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null, requiredActions?: string[] | null): DatabaseCollectionPrivileges;
66
- declare type DatabasesAndCollectionsNames = Record<string, Record<string, string[]>>;
67
- export declare function getDatabasesAndCollectionsFromPrivileges(client: MongoClient, requiredActions?: string[] | null): Promise<DatabasesAndCollectionsNames>;
71
+ export declare function getPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null, requiredActions?: string[] | null): DatabaseCollectionPrivileges;
68
72
  export declare function adaptDatabaseInfo(databaseStats: {
69
73
  db: string;
70
74
  } & Partial<DbStats> & Partial<DatabaseInfo>): Omit<DatabaseDetails, 'collections'>;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.adaptCollectionInfo = exports.adaptDatabaseInfo = exports.getDatabasesAndCollectionsFromPrivileges = exports.extractPrivilegesByDatabaseAndCollection = exports.getInstance = void 0;
6
+ exports.adaptCollectionInfo = exports.adaptDatabaseInfo = exports.getPrivilegesByDatabaseAndCollection = exports.getInstance = void 0;
7
7
  const mongodb_build_info_1 = require("mongodb-build-info");
8
8
  const mongodb_ns_1 = __importDefault(require("mongodb-ns"));
9
9
  const compass_logging_1 = __importDefault(require("@mongodb-js/compass-logging"));
@@ -12,7 +12,8 @@ const { debug } = compass_logging_1.default('COMPASS-CONNECT');
12
12
  async function getInstance(client) {
13
13
  var _a;
14
14
  const adminDb = client.db('admin');
15
- const [getCmdLineOptsResult, hostInfoResult, buildInfoResult, getParameterResult,] = await Promise.all([
15
+ const [connectionStatus, getCmdLineOptsResult, hostInfoResult, buildInfoResult, getParameterResult, atlasVersionResult,] = await Promise.all([
16
+ run_command_1.runCommand(adminDb, { connectionStatus: 1, showPrivileges: true }).catch(ignoreNotAuthorized(null)),
16
17
  run_command_1.runCommand(adminDb, { getCmdLineOpts: 1 }).catch((err) => {
17
18
  return { errmsg: err.message };
18
19
  }),
@@ -22,16 +23,29 @@ async function getInstance(client) {
22
23
  getParameter: 1,
23
24
  featureCompatibilityVersion: 1,
24
25
  }).catch(() => null),
26
+ run_command_1.runCommand(adminDb, { atlasVersion: 1 }).catch((err) => {
27
+ return { version: '', gitVersion: '' };
28
+ }),
25
29
  ]);
26
30
  return {
31
+ auth: adaptAuthInfo(connectionStatus),
27
32
  build: adaptBuildInfo(buildInfoResult),
28
33
  host: adaptHostInfo(hostInfoResult),
29
34
  genuineMongoDB: buildGenuineMongoDBInfo(buildInfoResult, getCmdLineOptsResult),
30
35
  dataLake: buildDataLakeInfo(buildInfoResult),
31
36
  featureCompatibilityVersion: (_a = getParameterResult === null || getParameterResult === void 0 ? void 0 : getParameterResult.featureCompatibilityVersion.version) !== null && _a !== void 0 ? _a : null,
37
+ isAtlas: checkIsAtlas(client, atlasVersionResult),
32
38
  };
33
39
  }
34
40
  exports.getInstance = getInstance;
41
+ function checkIsAtlas(client, atlasVersionInfo) {
42
+ var _a;
43
+ const firstHost = ((_a = client.options.hosts[0]) === null || _a === void 0 ? void 0 : _a.host) || '';
44
+ if (atlasVersionInfo.version === '') {
45
+ return /mongodb(-dev)?\.net$/i.test(firstHost);
46
+ }
47
+ return true;
48
+ }
35
49
  function buildGenuineMongoDBInfo(buildInfo, cmdLineOpts) {
36
50
  const { isGenuine, serverName } = mongodb_build_info_1.getGenuineMongoDB(buildInfo, cmdLineOpts);
37
51
  return {
@@ -46,7 +60,19 @@ function buildDataLakeInfo(buildInfo) {
46
60
  version: dlVersion,
47
61
  };
48
62
  }
49
- function extractPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null, requiredActions = null) {
63
+ function adaptAuthInfo(connectionStatus) {
64
+ var _a;
65
+ if (connectionStatus === null) {
66
+ return { user: null, roles: [], privileges: [] };
67
+ }
68
+ const { authenticatedUsers, authenticatedUserRoles, authenticatedUserPrivileges, } = connectionStatus.authInfo;
69
+ return {
70
+ user: (_a = authenticatedUsers[0]) !== null && _a !== void 0 ? _a : null,
71
+ roles: authenticatedUserRoles,
72
+ privileges: authenticatedUserPrivileges,
73
+ };
74
+ }
75
+ function getPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null, requiredActions = null) {
50
76
  const privileges = authenticatedUserPrivileges !== null && authenticatedUserPrivileges !== void 0 ? authenticatedUserPrivileges : [];
51
77
  const filteredPrivileges = requiredActions && requiredActions.length > 0
52
78
  ? privileges.filter(({ actions }) => {
@@ -68,16 +94,7 @@ function extractPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges =
68
94
  }
69
95
  return result;
70
96
  }
71
- exports.extractPrivilegesByDatabaseAndCollection = extractPrivilegesByDatabaseAndCollection;
72
- async function getDatabasesAndCollectionsFromPrivileges(client, requiredActions = null) {
73
- const adminDb = client.db('admin');
74
- const connectionStatus = await run_command_1.runCommand(adminDb, {
75
- connectionStatus: 1,
76
- showPrivileges: true,
77
- }).catch(ignoreNotAuthorized(null));
78
- return extractPrivilegesByDatabaseAndCollection(connectionStatus === null || connectionStatus === void 0 ? void 0 : connectionStatus.authInfo.authenticatedUserPrivileges, requiredActions);
79
- }
80
- exports.getDatabasesAndCollectionsFromPrivileges = getDatabasesAndCollectionsFromPrivileges;
97
+ exports.getPrivilegesByDatabaseAndCollection = getPrivilegesByDatabaseAndCollection;
81
98
  function isNotAuthorized(err) {
82
99
  if (!err) {
83
100
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}
@@ -93,6 +93,6 @@ export interface LegacyConnectionModel extends LegacyConnectionModelProperties {
93
93
  destroy: (options?: AmpersandMethodOptions<LegacyConnectionModel>) => void;
94
94
  once: (event: string, handler: () => void) => void;
95
95
  }
96
- export declare function convertConnectionModelToInfo(model: LegacyConnectionModel): ConnectionInfo;
96
+ export declare function convertConnectionModelToInfo(model: LegacyConnectionModelProperties): ConnectionInfo;
97
97
  export declare function convertConnectionInfoToModel(connectionInfo: ConnectionInfo): Promise<LegacyConnectionModel>;
98
98
  export {};
@@ -10,40 +10,41 @@ const connection_secrets_1 = require("../connection-secrets");
10
10
  const ConnectionModel = require('mongodb-connection-model');
11
11
  function convertConnectionModelToInfo(model) {
12
12
  var _a;
13
- if (model.connectionInfo) {
14
- const connectionInfo = connection_secrets_1.mergeSecrets(model.connectionInfo, (_a = model.secrets) !== null && _a !== void 0 ? _a : {});
13
+ const legacyModel = model instanceof ConnectionModel ? model : new ConnectionModel(model);
14
+ if (legacyModel.connectionInfo) {
15
+ const connectionInfo = connection_secrets_1.mergeSecrets(legacyModel.connectionInfo, (_a = legacyModel.secrets) !== null && _a !== void 0 ? _a : {});
15
16
  if (connectionInfo.lastUsed) {
16
17
  connectionInfo.lastUsed = new Date(connectionInfo.lastUsed);
17
18
  }
18
19
  return connectionInfo;
19
20
  }
20
21
  const info = {
21
- id: model._id,
22
+ id: legacyModel._id,
22
23
  connectionOptions: {
23
- connectionString: model.driverUrl,
24
+ connectionString: legacyModel.driverUrl,
24
25
  },
25
26
  };
26
- modelSslPropertiesToConnectionOptions(model.driverOptions, info.connectionOptions);
27
- const sshTunnel = modelTunnelToConnectionOptions(model);
27
+ modelSslPropertiesToConnectionOptions(legacyModel.driverOptions, info.connectionOptions);
28
+ const sshTunnel = modelTunnelToConnectionOptions(legacyModel);
28
29
  if (sshTunnel) {
29
30
  info.connectionOptions.sshTunnel = sshTunnel;
30
31
  }
31
- if (model.driverOptions.directConnection !== undefined) {
32
- setConnectionStringParam(info.connectionOptions, 'directConnection', model.driverOptions.directConnection ? 'true' : 'false');
32
+ if (legacyModel.driverOptions.directConnection !== undefined) {
33
+ setConnectionStringParam(info.connectionOptions, 'directConnection', legacyModel.driverOptions.directConnection ? 'true' : 'false');
33
34
  }
34
- if (model.driverOptions.readPreference !== undefined) {
35
- setConnectionStringParam(info.connectionOptions, 'readPreference', typeof model.driverOptions.readPreference === 'string'
36
- ? model.driverOptions.readPreference
37
- : model.driverOptions.readPreference.preference);
35
+ if (legacyModel.driverOptions.readPreference !== undefined) {
36
+ setConnectionStringParam(info.connectionOptions, 'readPreference', typeof legacyModel.driverOptions.readPreference === 'string'
37
+ ? legacyModel.driverOptions.readPreference
38
+ : legacyModel.driverOptions.readPreference.preference);
38
39
  }
39
- if (model.isFavorite) {
40
+ if (legacyModel.isFavorite) {
40
41
  info.favorite = {
41
- name: model.name,
42
- color: model.color,
42
+ name: legacyModel.name,
43
+ color: legacyModel.color,
43
44
  };
44
45
  }
45
- if (model.lastUsed) {
46
- info.lastUsed = model.lastUsed;
46
+ if (legacyModel.lastUsed) {
47
+ info.lastUsed = legacyModel.lastUsed;
47
48
  }
48
49
  return info;
49
50
  }
@@ -68,7 +69,7 @@ function modelSslPropertiesToConnectionOptions(driverOptions, connectionOptions)
68
69
  url.searchParams.set('tlsCAFile', sslCA);
69
70
  }
70
71
  if (sslCert && sslCert !== sslKey) {
71
- connectionOptions.tlsCertificateFile = sslCert;
72
+ url.searchParams.set('tlsCertificateFile', sslCert);
72
73
  }
73
74
  if (sslKey) {
74
75
  url.searchParams.set('tlsCertificateKeyFile', sslKey);
@@ -152,6 +153,7 @@ function convertSslOptionsToLegacyProperties(options, properties) {
152
153
  const tlsCAFile = url.searchParams.get('tlsCAFile');
153
154
  const tlsCertificateKeyFile = url.searchParams.get('tlsCertificateKeyFile');
154
155
  const tlsCertificateKeyFilePassword = url.searchParams.get('tlsCertificateKeyFilePassword');
156
+ const tlsCertificateFile = url.searchParams.get('tlsCertificateFile');
155
157
  if (tlsCAFile) {
156
158
  properties.sslCA = [tlsCAFile];
157
159
  }
@@ -161,8 +163,8 @@ function convertSslOptionsToLegacyProperties(options, properties) {
161
163
  if (tlsCertificateKeyFilePassword) {
162
164
  properties.sslPass = tlsCertificateKeyFilePassword;
163
165
  }
164
- if (options.tlsCertificateFile) {
165
- properties.sslCert = options.tlsCertificateFile;
166
+ if (tlsCertificateFile) {
167
+ properties.sslCert = tlsCertificateFile;
166
168
  }
167
169
  properties.sslMethod = optionsToSslMethod(options);
168
170
  }
@@ -177,7 +179,7 @@ function optionsToSslMethod(options) {
177
179
  if (tls === 'false') {
178
180
  return 'NONE';
179
181
  }
180
- if (tlsCertificateKeyFile || options.tlsCertificateFile) {
182
+ if (tlsCertificateKeyFile) {
181
183
  return 'ALL';
182
184
  }
183
185
  if (tlsCAFile) {
@@ -1 +1 @@
1
- {"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":";;;;;;AAMA,kGAA6D;AAC7D,gDAAwB;AAGxB,8DAI+B;AAG/B,MAAM,eAAe,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AA2I5D,SAAgB,4BAA4B,CAC1C,KAAsC;;IAEtC,MAAM,WAAW,GACf,KAAK,YAAY,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;IAGxE,IAAI,WAAW,CAAC,cAAc,EAAE;QAC9B,MAAM,cAAc,GAAG,iCAAY,CACjC,WAAW,CAAC,cAAc,EAC1B,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAC1B,CAAC;QAEF,IAAI,cAAc,CAAC,QAAQ,EAAE;YAE3B,cAAc,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;SAC7D;QAED,OAAO,cAAc,CAAC;KACvB;IAGD,MAAM,IAAI,GAAmB;QAC3B,EAAE,EAAE,WAAW,CAAC,GAAG;QACnB,iBAAiB,EAAE;YACjB,gBAAgB,EAAE,WAAW,CAAC,SAAS;SACxC;KACF,CAAC;IAEF,qCAAqC,CACnC,WAAW,CAAC,aAAa,EACzB,IAAI,CAAC,iBAAiB,CACvB,CAAC;IAEF,MAAM,SAAS,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,SAAS,EAAE;QACb,IAAI,CAAC,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;KAC9C;IAED,IAAI,WAAW,CAAC,aAAa,CAAC,gBAAgB,KAAK,SAAS,EAAE;QAC5D,wBAAwB,CACtB,IAAI,CAAC,iBAAiB,EACtB,kBAAkB,EAClB,WAAW,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAC9D,CAAC;KACH;IAED,IAAI,WAAW,CAAC,aAAa,CAAC,cAAc,KAAK,SAAS,EAAE;QAC1D,wBAAwB,CACtB,IAAI,CAAC,iBAAiB,EACtB,gBAAgB,EAChB,OAAO,WAAW,CAAC,aAAa,CAAC,cAAc,KAAK,QAAQ;YAC1D,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,cAAc;YAC1C,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,cAAc,CAAC,UAAU,CACxD,CAAC;KACH;IAED,IAAI,WAAW,CAAC,UAAU,EAAE;QAC1B,IAAI,CAAC,QAAQ,GAAG;YACd,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;SACzB,CAAC;KACH;IAED,IAAI,WAAW,CAAC,QAAQ,EAAE;QACxB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;KACtC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AArED,oEAqEC;AAED,SAAS,wBAAwB,CAC/B,iBAAoC,EACpC,KAAa,EACb,KAAa;IAEb,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACrE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACnC,iBAAiB,CAAC,gBAAgB,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,qCAAqC,CAC5C,aAAiC,EACjC,iBAAoC;IAEpC,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAErE,IAAI,aAAa,CAAC,WAAW,KAAK,KAAK,EAAE;QACvC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;KAC7D;IAED,IAAI,aAAa,CAAC,wBAAwB,EAAE;QAC1C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;KAC1D;IAED,MAAM,KAAK,GAAG,uBAAuB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,uBAAuB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,uBAAuB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,KAAK,EAAE;QACT,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;KAC1C;IAID,IAAI,OAAO,IAAI,OAAO,KAAK,MAAM,EAAE;QACjC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,IAAI,MAAM,EAAE;QACV,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;KACvD;IAED,IAAI,aAAa,CAAC,OAAO,EAAE;QACzB,GAAG,CAAC,YAAY,CAAC,GAAG,CAClB,+BAA+B,EAC/B,aAAa,CAAC,OAAO,CACtB,CAAC;KACH;IAED,IACE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM;QACtC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,EACtC;QACA,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAChC;IAED,iBAAiB,CAAC,gBAAgB,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAoC;IAEpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,8BAA8B,CACrC,KAA4B;IAE5B,IACE,KAAK,CAAC,SAAS,KAAK,MAAM;QAC1B,CAAC,KAAK,CAAC,iBAAiB;QACxB,CAAC,KAAK,CAAC,iBAAiB,EACxB;QACA,OAAO;KACR;IAED,MAAM,SAAS,GAAyB;QACtC,IAAI,EAAE,KAAK,CAAC,iBAAiB;QAC7B,IAAI,EAAE,KAAK,CAAC,aAAa;QACzB,QAAQ,EAAE,KAAK,CAAC,iBAAiB;KAClC,CAAC;IAEF,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;QACzC,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC;KAC9C;IAED,IAAI,KAAK,CAAC,qBAAqB,KAAK,SAAS,EAAE;QAC7C,SAAS,CAAC,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC;YACpE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC;KACjC;IAED,IAAI,KAAK,CAAC,mBAAmB,KAAK,SAAS,EAAE;QAC3C,SAAS,CAAC,qBAAqB,GAAG,KAAK,CAAC,mBAAmB,CAAC;KAC7D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAEM,KAAK,UAAU,4BAA4B,CAChD,cAA8B;IAE9B,MAAM,UAAU,GAA0B,MAAM,cAAI,CAAC,SAAS,CAC5D,eAAe,CAAC,IAAI,CACrB,CAAC,eAAe,CAAC,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEtE,MAAM,iBAAiB,GAA6C;QAClE,GAAG,EAAE,cAAc,CAAC,EAAE;KACvB,CAAC;IAEF,mCAAmC,CACjC,cAAc,CAAC,iBAAiB,EAChC,iBAAiB,CAClB,CAAC;IAEF,MAAM,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;IAE3D,IAAI,iBAAiB,CAAC,SAAS,EAAE;QAC/B,iBAAiB,CAAC,SAAS,GAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,eAAe;YACxE,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,eAAe,CAAC;QACpB,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC;QACnE,iBAAiB,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC;QACvE,iBAAiB,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC3E,iBAAiB,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC3E,iBAAiB,CAAC,qBAAqB;YACrC,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC;QAC9C,iBAAiB,CAAC,mBAAmB;YACnC,iBAAiB,CAAC,SAAS,CAAC,qBAAqB,CAAC;KACrD;IAED,IAAI,cAAc,CAAC,QAAQ,EAAE;QAC3B,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC;QACpC,iBAAiB,CAAC,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;QACtD,iBAAiB,CAAC,KAAK,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;KACzD;IAED,IAAI,cAAc,CAAC,QAAQ,EAAE;QAC3B,iBAAiB,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;KACtD;IAED,OAAO,IAAI,eAAe,CAAC;QACzB,GAAG,UAAU,CAAC,MAAM,EAAE;QACtB,GAAG,iBAAiB;QACpB,GAAG,mCAAc,CAAC,cAAc,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AA/CD,oEA+CC;AAED,SAAS,mCAAmC,CAC1C,OAA0B,EAC1B,UAAoD;IAEpD,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC5E,MAAM,6BAA6B,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CACxD,+BAA+B,CAChC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAEtE,IAAI,SAAS,EAAE;QACb,UAAU,CAAC,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC;KAChC;IAED,IAAI,qBAAqB,EAAE;QACzB,UAAU,CAAC,MAAM,GAAG,qBAAqB,CAAC;KAC3C;IAED,IAAI,6BAA6B,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,6BAA6B,CAAC;KACpD;IAED,IAAI,kBAAkB,EAAE;QACtB,UAAU,CAAC,OAAO,GAAG,kBAAkB,CAAC;KACzC;IAED,UAAU,CAAC,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,kBAAkB,CAAC,OAA0B;IACpD,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEvE,MAAM,2BAA2B,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CACtD,6BAA6B,CAC9B,CAAC;IACF,MAAM,wBAAwB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CACnD,0BAA0B,CAC3B,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAE5E,IAAI,GAAG,KAAK,OAAO,EAAE;QACnB,OAAO,MAAM,CAAC;KACf;IAED,IAAI,qBAAqB,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,SAAS,EAAE;QACb,OAAO,QAAQ,CAAC;KACjB;IAED,IACE,WAAW,KAAK,MAAM;QACtB,CAAC,2BAA2B,KAAK,MAAM;YACrC,wBAAwB,KAAK,MAAM,CAAC,EACtC;QACA,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAMD,SAAS,eAAe,CAAC,gBAAwB;IAC/C,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,gBAAgB,CAAC,CAAC;IAEnD,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,aAAa,EAAE;QAC3D,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;KACpD;IAED,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC"}
package/lib/redact.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
2
2
  import { ConnectionOptions } from './connection-options';
3
- export declare function redactConnectionString(uri: string): string;
3
+ import { redactConnectionString } from 'mongodb-connection-string-url';
4
+ export { redactConnectionString };
4
5
  export declare function redactConnectionOptions(options: ConnectionOptions): ConnectionOptions;
5
6
  export declare function redactSshTunnelOptions(options: SshTunnelConfig): SshTunnelConfig;
package/lib/redact.js CHANGED
@@ -1,17 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.redactSshTunnelOptions = exports.redactConnectionOptions = exports.redactConnectionString = void 0;
4
- function redactConnectionString(uri) {
5
- const regexes = [
6
- /(?<=\/\/)(.*)(?=@)/g,
7
- /(?<=AWS_SESSION_TOKEN(:|%3A))([^,&]+)/,
8
- ];
9
- regexes.forEach((r) => {
10
- uri = uri.replace(r, '<credentials>');
11
- });
12
- return uri;
13
- }
14
- exports.redactConnectionString = redactConnectionString;
4
+ const mongodb_connection_string_url_1 = require("mongodb-connection-string-url");
5
+ Object.defineProperty(exports, "redactConnectionString", { enumerable: true, get: function () { return mongodb_connection_string_url_1.redactConnectionString; } });
15
6
  function redactConnectionOptions(options) {
16
7
  var _a, _b;
17
8
  const redactedTunnelOptions = options.sshTunnel
@@ -23,7 +14,7 @@ function redactConnectionOptions(options) {
23
14
  ...options,
24
15
  sshTunnel: redactedTunnelOptions,
25
16
  };
26
- redacted.connectionString = redactConnectionString(options.connectionString);
17
+ redacted.connectionString = mongodb_connection_string_url_1.redactConnectionString(options.connectionString);
27
18
  if ((_a = redacted.sshTunnel) === null || _a === void 0 ? void 0 : _a.password) {
28
19
  redacted.sshTunnel.password = '<redacted>';
29
20
  }
package/lib/redact.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"redact.js","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":";;;AAGA,SAAgB,sBAAsB,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG;QAEd,qBAAqB;QAErB,uCAAuC;KACxC,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAXD,wDAWC;AAED,SAAgB,uBAAuB,CACrC,OAA0B;;IAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC,SAAS;QAC7C,CAAC,CAAC;YACE,GAAG,OAAO,CAAC,SAAS;SACrB;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,QAAQ,GAAsB;QAClC,GAAG,OAAO;QACV,SAAS,EAAE,qBAAqB;KACjC,CAAC;IAEF,QAAQ,CAAC,gBAAgB,GAAG,sBAAsB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7E,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,QAAQ,EAAE;QAChC,QAAQ,CAAC,SAAS,CAAC,QAAQ,GAAG,YAAY,CAAC;KAC5C;IAED,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,qBAAqB,EAAE;QAC7C,QAAQ,CAAC,SAAS,CAAC,qBAAqB,GAAG,YAAY,CAAC;KACzD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAzBD,0DAyBC;AAED,SAAgB,sBAAsB,CACpC,OAAwB;IAExB,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAEhC,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC;KAClC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAlBD,wDAkBC"}
1
+ {"version":3,"file":"redact.js","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":";;;AAEA,iFAAuE;AAC9D,uGADA,sDAAsB,OACA;AAE/B,SAAgB,uBAAuB,CACrC,OAA0B;;IAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC,SAAS;QAC7C,CAAC,CAAC;YACE,GAAG,OAAO,CAAC,SAAS;SACrB;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,QAAQ,GAAsB;QAClC,GAAG,OAAO;QACV,SAAS,EAAE,qBAAqB;KACjC,CAAC;IAEF,QAAQ,CAAC,gBAAgB,GAAG,sDAAsB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7E,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,QAAQ,EAAE;QAChC,QAAQ,CAAC,SAAS,CAAC,QAAQ,GAAG,YAAY,CAAC;KAC5C;IAED,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,qBAAqB,EAAE;QAC7C,QAAQ,CAAC,SAAS,CAAC,qBAAqB,GAAG,YAAY,CAAC;KACzD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAzBD,0DAyBC;AAED,SAAgB,sBAAsB,CACpC,OAAwB;IAExB,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAEhC,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC;KAClC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAlBD,wDAkBC"}
@@ -119,6 +119,9 @@ interface RunDiagnosticsCommand {
119
119
  dbStats: 1;
120
120
  scale?: number;
121
121
  }, options?: RunCommandOptions): Promise<DbStats>;
122
+ (db: Db, spec: {
123
+ atlasVersion: 1;
124
+ }, options?: RunCommandOptions): Promise<AtlasVersionInfo>;
122
125
  }
123
126
  export declare type ListDatabasesOptions = {
124
127
  nameOnly?: never;
@@ -169,6 +172,10 @@ export declare type ListCollectionsOptions = {
169
172
  export declare type ListCollectionsOptionsNamesOnly = Omit<ListCollectionsOptions, 'nameOnly'> & {
170
173
  nameOnly: true;
171
174
  };
175
+ export declare type AtlasVersionInfo = {
176
+ version: string;
177
+ gitVersion: string;
178
+ };
172
179
  export declare type ListCollectionsResult<CollectionType> = {
173
180
  cursor: {
174
181
  firstBatch: CollectionType;
@@ -1 +1 @@
1
- {"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AA4PnE,MAAM,UAAU,GAAe,CACpC,EAAM,EACN,IAAc,EACd,OAA2B,EAC3B,EAAE;;IAUF,MAAM,cAAc,GAAG,MAAA,EAAE,CAAC,cAAc,mCAAI,wBAAc,CAAC,iBAAiB,CAAC;IAE7E,OAAO,EAAE,CAAC,OAAO,CACf,EAAE,GAAG,IAAI,EAAE,EACX,EAAE,cAAc,EAAE,GAAG,OAAO,EAAuB,CAI7C,CAAC;AACX,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB"}
1
+ {"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AAsQnE,MAAM,UAAU,GAAe,CACpC,EAAM,EACN,IAAc,EACd,OAA2B,EAC3B,EAAE;;IAUF,MAAM,cAAc,GAAG,MAAA,EAAE,CAAC,cAAc,mCAAI,wBAAc,CAAC,iBAAiB,CAAC;IAE7E,OAAO,EAAE,CAAC,OAAO,CACf,EAAE,GAAG,IAAI,EAAE,EACX,EAAE,cAAc,EAAE,GAAG,OAAO,EAAuB,CAI7C,CAAC;AACX,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB"}
@@ -2,4 +2,4 @@ import SSHTunnel from '@mongodb-js/ssh-tunnel';
2
2
  import { ConnectionSshOptions } from './connection-options';
3
3
  export declare function openSshTunnel(srvResolvedConnectionString: string, sshTunnelOptions: ConnectionSshOptions | undefined, localPort: number): Promise<[SSHTunnel | undefined, string]>;
4
4
  export declare function forceCloseTunnel(tunnelToClose?: SSHTunnel | void): Promise<void>;
5
- export declare function waitForTunnelError(tunnel: SSHTunnel | void): Promise<void>;
5
+ export declare function waitForTunnelError(tunnel: SSHTunnel | void): Promise<never>;
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "email": "compass@mongodb.com"
8
8
  },
9
9
  "homepage": "https://github.com/mongodb-js/compass",
10
- "version": "21.13.0",
10
+ "version": "21.14.0",
11
11
  "repository": {
12
12
  "type": "git",
13
13
  "url": "https://github.com/mongodb-js/compass.git"
@@ -53,29 +53,29 @@
53
53
  "reformat": "npm run prettier -- --write ."
54
54
  },
55
55
  "peerDependencies": {
56
- "mongodb": "^4.1.0",
56
+ "mongodb": "^4.2.2",
57
57
  "mongodb-connection-model": "*"
58
58
  },
59
59
  "dependencies": {
60
- "@mongodb-js/compass-logging": "^0.4.0",
60
+ "@mongodb-js/compass-logging": "^0.5.0",
61
61
  "@mongodb-js/ssh-tunnel": "^1.2.1",
62
62
  "async": "^3.2.0",
63
63
  "debug": "4.3.0",
64
64
  "get-port": "^5.1.1",
65
65
  "lodash": "^4.17.20",
66
- "mongodb-build-info": "^1.1.1",
67
- "mongodb-connection-string-url": "^2.1.0",
68
- "mongodb-index-model": "^3.6.0",
66
+ "mongodb-build-info": "^1.3.0",
67
+ "mongodb-connection-string-url": "^2.3.2",
68
+ "mongodb-index-model": "^3.7.0",
69
69
  "mongodb-ns": "^2.2.0",
70
- "resolve-mongodb-srv": "^1.1.0",
70
+ "resolve-mongodb-srv": "^1.1.1",
71
71
  "uuid": "^8.3.2"
72
72
  },
73
73
  "devDependencies": {
74
- "@mongodb-js/devtools-docker-test-envs": "^1.2.1",
75
- "@mongodb-js/eslint-config-compass": "^0.4.0",
76
- "@mongodb-js/mocha-config-compass": "^0.5.0",
77
- "@mongodb-js/prettier-config-compass": "^0.3.0",
78
- "@mongodb-js/tsconfig-compass": "^0.3.0",
74
+ "@mongodb-js/devtools-docker-test-envs": "^1.2.2",
75
+ "@mongodb-js/eslint-config-compass": "^0.5.0",
76
+ "@mongodb-js/mocha-config-compass": "^0.6.0",
77
+ "@mongodb-js/prettier-config-compass": "^0.4.0",
78
+ "@mongodb-js/tsconfig-compass": "^0.4.0",
79
79
  "@types/async": "^3.2.7",
80
80
  "@types/debug": "^4.1.7",
81
81
  "@types/lodash": "^4.14.172",
@@ -87,15 +87,15 @@
87
87
  "eslint": "^7.25.0",
88
88
  "kerberos": "^2.0.0-beta.0",
89
89
  "mocha": "^8.4.0",
90
- "mongodb": "^4.1.0",
91
- "mongodb-connection-model": "^21.9.0",
90
+ "mongodb": "^4.2.1",
91
+ "mongodb-connection-model": "^21.10.0",
92
92
  "mongodb-runner": "^4.8.3",
93
93
  "nyc": "^15.0.0",
94
94
  "prettier": "2.3.2",
95
95
  "rimraf": "^3.0.2",
96
96
  "sinon": "^9.2.3",
97
- "storage-mixin": "^4.8.0",
97
+ "storage-mixin": "^4.9.0",
98
98
  "typescript": "^4.3.5"
99
99
  },
100
- "gitHead": "8ef2cccaaab6d84a5fcd633ea8dfc4c7a4db551f"
100
+ "gitHead": "77166e3754e36e95c7ff7efb5a0ce5e0990b0ff7"
101
101
  }