mongodb-data-service 21.13.0 → 21.16.0

package/lib/instance-detail-helper.js

@@ -3,50 +3,76 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.adaptCollectionInfo = exports.adaptDatabaseInfo = exports.getDatabasesAndCollectionsFromPrivileges = exports.extractPrivilegesByDatabaseAndCollection = exports.getInstance = void 0;
+exports.adaptCollectionInfo = exports.adaptDatabaseInfo = exports.getPrivilegesByDatabaseAndCollection = exports.getInstance = void 0;
 const mongodb_build_info_1 = require("mongodb-build-info");
 const mongodb_ns_1 = __importDefault(require("mongodb-ns"));
 const compass_logging_1 = __importDefault(require("@mongodb-js/compass-logging"));
 const run_command_1 = require("./run-command");
-const { debug } = compass_logging_1.default('COMPASS-CONNECT');
+const { debug } = (0, compass_logging_1.default)('COMPASS-CONNECT');
 async function getInstance(client) {
     var _a;
     const adminDb = client.db('admin');
-    const [getCmdLineOptsResult, hostInfoResult, buildInfoResult, getParameterResult,] = await Promise.all([
-        run_command_1.runCommand(adminDb, { getCmdLineOpts: 1 }).catch((err) => {
+    const [connectionStatus, getCmdLineOptsResult, hostInfoResult, buildInfoResult, getParameterResult, atlasVersionResult,] = await Promise.all([
+        (0, run_command_1.runCommand)(adminDb, { connectionStatus: 1, showPrivileges: true }).catch(ignoreNotAuthorized(null)),
+        (0, run_command_1.runCommand)(adminDb, { getCmdLineOpts: 1 }).catch((err) => {
             return { errmsg: err.message };
         }),
-        run_command_1.runCommand(adminDb, { hostInfo: 1 }).catch(ignoreNotAuthorized({})),
-        run_command_1.runCommand(adminDb, { buildInfo: 1 }),
-        run_command_1.runCommand(adminDb, {
+        (0, run_command_1.runCommand)(adminDb, { hostInfo: 1 }).catch(ignoreNotAuthorized({})),
+        (0, run_command_1.runCommand)(adminDb, { buildInfo: 1 }),
+        (0, run_command_1.runCommand)(adminDb, {
             getParameter: 1,
             featureCompatibilityVersion: 1,
         }).catch(() => null),
+        (0, run_command_1.runCommand)(adminDb, { atlasVersion: 1 }).catch(() => {
+            return { version: '', gitVersion: '' };
+        }),
     ]);
     return {
+        auth: adaptAuthInfo(connectionStatus),
         build: adaptBuildInfo(buildInfoResult),
         host: adaptHostInfo(hostInfoResult),
         genuineMongoDB: buildGenuineMongoDBInfo(buildInfoResult, getCmdLineOptsResult),
         dataLake: buildDataLakeInfo(buildInfoResult),
         featureCompatibilityVersion: (_a = getParameterResult === null || getParameterResult === void 0 ? void 0 : getParameterResult.featureCompatibilityVersion.version) !== null && _a !== void 0 ? _a : null,
+        isAtlas: checkIsAtlas(client, atlasVersionResult),
     };
 }
 exports.getInstance = getInstance;
+function checkIsAtlas(client, atlasVersionInfo) {
+    var _a;
+    const firstHost = ((_a = client.options.hosts[0]) === null || _a === void 0 ? void 0 : _a.host) || '';
+    if (atlasVersionInfo.version === '') {
+        return /mongodb(-dev)?\.net$/i.test(firstHost);
+    }
+    return true;
+}
 function buildGenuineMongoDBInfo(buildInfo, cmdLineOpts) {
-    const { isGenuine, serverName } = mongodb_build_info_1.getGenuineMongoDB(buildInfo, cmdLineOpts);
+    const { isGenuine, serverName } = (0, mongodb_build_info_1.getGenuineMongoDB)(buildInfo, cmdLineOpts);
     return {
         isGenuine,
         dbType: serverName,
     };
 }
 function buildDataLakeInfo(buildInfo) {
-    const { isDataLake, dlVersion } = mongodb_build_info_1.getDataLake(buildInfo);
+    const { isDataLake, dlVersion } = (0, mongodb_build_info_1.getDataLake)(buildInfo);
     return {
         isDataLake,
         version: dlVersion,
     };
 }
-function extractPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null, requiredActions = null) {
+function adaptAuthInfo(connectionStatus) {
+    var _a;
+    if (connectionStatus === null) {
+        return { user: null, roles: [], privileges: [] };
+    }
+    const { authenticatedUsers, authenticatedUserRoles, authenticatedUserPrivileges, } = connectionStatus.authInfo;
+    return {
+        user: (_a = authenticatedUsers[0]) !== null && _a !== void 0 ? _a : null,
+        roles: authenticatedUserRoles,
+        privileges: authenticatedUserPrivileges,
+    };
+}
+function getPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null, requiredActions = null) {
     const privileges = authenticatedUserPrivileges !== null && authenticatedUserPrivileges !== void 0 ? authenticatedUserPrivileges : [];
     const filteredPrivileges = requiredActions && requiredActions.length > 0
         ? privileges.filter(({ actions }) => {
@@ -68,16 +94,7 @@ function extractPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges =
     }
     return result;
 }
-exports.extractPrivilegesByDatabaseAndCollection = extractPrivilegesByDatabaseAndCollection;
-async function getDatabasesAndCollectionsFromPrivileges(client, requiredActions = null) {
-    const adminDb = client.db('admin');
-    const connectionStatus = await run_command_1.runCommand(adminDb, {
-        connectionStatus: 1,
-        showPrivileges: true,
-    }).catch(ignoreNotAuthorized(null));
-    return extractPrivilegesByDatabaseAndCollection(connectionStatus === null || connectionStatus === void 0 ? void 0 : connectionStatus.authInfo.authenticatedUserPrivileges, requiredActions);
-}
-exports.getDatabasesAndCollectionsFromPrivileges = getDatabasesAndCollectionsFromPrivileges;
+exports.getPrivilegesByDatabaseAndCollection = getPrivilegesByDatabaseAndCollection;
 function isNotAuthorized(err) {
     if (!err) {
         return false;
@@ -116,24 +133,23 @@ function adaptBuildInfo(rawBuildInfo) {
     var _a;
     return {
         version: (_a = rawBuildInfo.version) !== null && _a !== void 0 ? _a : '',
-        isEnterprise: mongodb_build_info_1.isEnterprise(rawBuildInfo),
+        isEnterprise: (0, mongodb_build_info_1.isEnterprise)(rawBuildInfo),
     };
 }
 function adaptDatabaseInfo(databaseStats) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     return {
-        _id: databaseStats.db,
-        name: databaseStats.db,
         collection_count: (_a = databaseStats.collections) !== null && _a !== void 0 ? _a : 0,
         document_count: (_b = databaseStats.objects) !== null && _b !== void 0 ? _b : 0,
-        storage_size: (_c = databaseStats.storageSize) !== null && _c !== void 0 ? _c : 0,
-        index_count: (_d = databaseStats.indexes) !== null && _d !== void 0 ? _d : 0,
-        index_size: (_e = databaseStats.indexSize) !== null && _e !== void 0 ? _e : 0,
+        index_count: (_c = databaseStats.indexes) !== null && _c !== void 0 ? _c : 0,
+        storage_size: (_d = databaseStats.storageSize) !== null && _d !== void 0 ? _d : 0,
+        data_size: (_e = databaseStats.dataSize) !== null && _e !== void 0 ? _e : 0,
+        index_size: (_f = databaseStats.indexSize) !== null && _f !== void 0 ? _f : 0,
     };
 }
 exports.adaptDatabaseInfo = adaptDatabaseInfo;
 function adaptCollectionInfo({ db, name, info, options, type, }) {
-    const ns = mongodb_ns_1.default(`${db}.${name}`);
+    const ns = (0, mongodb_ns_1.default)(`${db}.${name}`);
     const { collection, database, system, oplog, command, special, specialish, normal, } = ns;
     const { readOnly } = info !== null && info !== void 0 ? info : {};
     const { collation, viewOn, pipeline, validator, validationAction, validationLevel, } = options !== null && options !== void 0 ? options : {};

package/lib/instance-detail-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}

package/lib/legacy/legacy-connection-model.d.ts

@@ -1,7 +1,8 @@
-import SSHTunnel, { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
+import type { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
+import type SSHTunnel from '@mongodb-js/ssh-tunnel';
 import type { MongoClient, MongoClientOptions, ReadPreferenceLike } from 'mongodb';
-import { ConnectionInfo } from '../connection-info';
-import { ConnectionSecrets } from '../connection-secrets';
+import type { ConnectionInfo } from '../connection-info';
+import type { ConnectionSecrets } from '../connection-secrets';
 declare type SslMethod = 'NONE' | 'SYSTEMCA' | 'IFAVAILABLE' | 'UNVALIDATED' | 'SERVER' | 'ALL';
 export interface LegacyConnectionModelProperties {
     _id: string;
@@ -54,7 +55,7 @@ export interface LegacyConnectionModelProperties {
     kerberosServiceName?: string;
     kerberosPrincipal?: string;
     kerberosServiceRealm?: string;
-    kerberosCanonicalizeHostname?: string;
+    kerberosCanonicalizeHostname: boolean;
     ldapUsername?: string;
     ldapPassword?: string;
     x509Username?: string;
@@ -93,6 +94,7 @@ export interface LegacyConnectionModel extends LegacyConnectionModelProperties {
     destroy: (options?: AmpersandMethodOptions<LegacyConnectionModel>) => void;
     once: (event: string, handler: () => void) => void;
 }
-export declare function convertConnectionModelToInfo(model: LegacyConnectionModel): ConnectionInfo;
+export declare function convertConnectionModelToInfo(model: LegacyConnectionModelProperties): ConnectionInfo;
 export declare function convertConnectionInfoToModel(connectionInfo: ConnectionInfo): Promise<LegacyConnectionModel>;
 export {};
+//# sourceMappingURL=legacy-connection-model.d.ts.map

package/lib/legacy/legacy-connection-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-connection-model.d.ts","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":"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"}

package/lib/legacy/legacy-connection-model.js

@@ -10,75 +10,77 @@ const connection_secrets_1 = require("../connection-secrets");
 const ConnectionModel = require('mongodb-connection-model');
 function convertConnectionModelToInfo(model) {
     var _a;
-    if (model.connectionInfo) {
-        const connectionInfo = connection_secrets_1.mergeSecrets(model.connectionInfo, (_a = model.secrets) !== null && _a !== void 0 ? _a : {});
+    const legacyModel = model instanceof ConnectionModel ? model : new ConnectionModel(model);
+    if (legacyModel.connectionInfo) {
+        const connectionInfo = (0, connection_secrets_1.mergeSecrets)(legacyModel.connectionInfo, (_a = legacyModel.secrets) !== null && _a !== void 0 ? _a : {});
         if (connectionInfo.lastUsed) {
             connectionInfo.lastUsed = new Date(connectionInfo.lastUsed);
         }
         return connectionInfo;
     }
     const info = {
-        id: model._id,
+        id: legacyModel._id,
         connectionOptions: {
-            connectionString: model.driverUrl,
+            connectionString: legacyModel.driverUrl,
         },
     };
-    modelSslPropertiesToConnectionOptions(model.driverOptions, info.connectionOptions);
-    const sshTunnel = modelTunnelToConnectionOptions(model);
+    modelSslPropertiesToConnectionOptions(legacyModel.driverOptions, info.connectionOptions);
+    const sshTunnel = modelTunnelToConnectionOptions(legacyModel);
     if (sshTunnel) {
         info.connectionOptions.sshTunnel = sshTunnel;
     }
-    if (model.driverOptions.directConnection !== undefined) {
-        setConnectionStringParam(info.connectionOptions, 'directConnection', model.driverOptions.directConnection ? 'true' : 'false');
+    if (legacyModel.driverOptions.directConnection !== undefined) {
+        setConnectionStringParam(info.connectionOptions, 'directConnection', legacyModel.driverOptions.directConnection ? 'true' : 'false');
     }
-    if (model.driverOptions.readPreference !== undefined) {
-        setConnectionStringParam(info.connectionOptions, 'readPreference', typeof model.driverOptions.readPreference === 'string'
-            ? model.driverOptions.readPreference
-            : model.driverOptions.readPreference.preference);
+    if (legacyModel.driverOptions.readPreference !== undefined) {
+        setConnectionStringParam(info.connectionOptions, 'readPreference', typeof legacyModel.driverOptions.readPreference === 'string'
+            ? legacyModel.driverOptions.readPreference
+            : legacyModel.driverOptions.readPreference.preference);
     }
-    if (model.isFavorite) {
+    if (legacyModel.isFavorite) {
         info.favorite = {
-            name: model.name,
-            color: model.color,
+            name: legacyModel.name,
+            color: legacyModel.color,
         };
     }
-    if (model.lastUsed) {
-        info.lastUsed = model.lastUsed;
+    if (legacyModel.lastUsed) {
+        info.lastUsed = legacyModel.lastUsed;
     }
     return info;
 }
 exports.convertConnectionModelToInfo = convertConnectionModelToInfo;
 function setConnectionStringParam(connectionOptions, param, value) {
     const url = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
-    url.searchParams.set(param, value);
+    url.typedSearchParams().set(param, value);
     connectionOptions.connectionString = url.toString();
 }
 function modelSslPropertiesToConnectionOptions(driverOptions, connectionOptions) {
     const url = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
+    const searchParams = url.typedSearchParams();
     if (driverOptions.sslValidate === false) {
-        url.searchParams.set('tlsAllowInvalidCertificates', 'true');
+        searchParams.set('tlsAllowInvalidCertificates', 'true');
     }
     if (driverOptions.tlsAllowInvalidHostnames) {
-        url.searchParams.set('tlsAllowInvalidHostnames', 'true');
+        searchParams.set('tlsAllowInvalidHostnames', 'true');
     }
     const sslCA = getSslDriverOptionsFile(driverOptions.sslCA);
     const sslCert = getSslDriverOptionsFile(driverOptions.sslCert);
     const sslKey = getSslDriverOptionsFile(driverOptions.sslKey);
     if (sslCA) {
-        url.searchParams.set('tlsCAFile', sslCA);
+        searchParams.set('tlsCAFile', sslCA);
     }
     if (sslCert && sslCert !== sslKey) {
-        connectionOptions.tlsCertificateFile = sslCert;
+        searchParams.set('tlsCertificateFile', sslCert);
     }
     if (sslKey) {
-        url.searchParams.set('tlsCertificateKeyFile', sslKey);
+        searchParams.set('tlsCertificateKeyFile', sslKey);
     }
     if (driverOptions.sslPass) {
-        url.searchParams.set('tlsCertificateKeyFilePassword', driverOptions.sslPass);
+        searchParams.set('tlsCertificateKeyFilePassword', driverOptions.sslPass);
     }
-    if (url.searchParams.get('ssl') === 'true' &&
-        url.searchParams.get('tls') === 'true') {
-        url.searchParams.delete('ssl');
+    if (searchParams.get('ssl') === 'true' &&
+        searchParams.get('tls') === 'true') {
+        searchParams.delete('ssl');
     }
     connectionOptions.connectionString = url.toString();
 }
@@ -143,15 +145,17 @@ async function convertConnectionInfoToModel(connectionInfo) {
     return new ConnectionModel({
         ...connection.toJSON(),
         ...additionalOptions,
-        ...connection_secrets_1.extractSecrets(connectionInfo),
+        ...(0, connection_secrets_1.extractSecrets)(connectionInfo),
     });
 }
 exports.convertConnectionInfoToModel = convertConnectionInfoToModel;
 function convertSslOptionsToLegacyProperties(options, properties) {
     const url = new mongodb_connection_string_url_1.default(options.connectionString);
-    const tlsCAFile = url.searchParams.get('tlsCAFile');
-    const tlsCertificateKeyFile = url.searchParams.get('tlsCertificateKeyFile');
-    const tlsCertificateKeyFilePassword = url.searchParams.get('tlsCertificateKeyFilePassword');
+    const searchParams = url.typedSearchParams();
+    const tlsCAFile = searchParams.get('tlsCAFile');
+    const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile');
+    const tlsCertificateKeyFilePassword = searchParams.get('tlsCertificateKeyFilePassword');
+    const tlsCertificateFile = searchParams.get('tlsCertificateFile');
     if (tlsCAFile) {
         properties.sslCA = [tlsCAFile];
     }
@@ -161,23 +165,24 @@ function convertSslOptionsToLegacyProperties(options, properties) {
     if (tlsCertificateKeyFilePassword) {
         properties.sslPass = tlsCertificateKeyFilePassword;
     }
-    if (options.tlsCertificateFile) {
-        properties.sslCert = options.tlsCertificateFile;
+    if (tlsCertificateFile) {
+        properties.sslCert = tlsCertificateFile;
     }
     properties.sslMethod = optionsToSslMethod(options);
 }
 function optionsToSslMethod(options) {
     const url = new mongodb_connection_string_url_1.default(options.connectionString);
-    const tls = url.searchParams.get('tls') || url.searchParams.get('ssl');
-    const tlsAllowInvalidCertificates = url.searchParams.get('tlsAllowInvalidCertificates');
-    const tlsAllowInvalidHostnames = url.searchParams.get('tlsAllowInvalidHostnames');
-    const tlsInsecure = url.searchParams.get('tlsInsecure');
-    const tlsCAFile = url.searchParams.get('tlsCAFile');
-    const tlsCertificateKeyFile = url.searchParams.get('tlsCertificateKeyFile');
+    const searchParams = url.typedSearchParams();
+    const tls = searchParams.get('tls') || searchParams.get('ssl');
+    const tlsAllowInvalidCertificates = searchParams.get('tlsAllowInvalidCertificates');
+    const tlsAllowInvalidHostnames = searchParams.get('tlsAllowInvalidHostnames');
+    const tlsInsecure = searchParams.get('tlsInsecure');
+    const tlsCAFile = searchParams.get('tlsCAFile');
+    const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile');
     if (tls === 'false') {
         return 'NONE';
     }
-    if (tlsCertificateKeyFile || options.tlsCertificateFile) {
+    if (tlsCertificateKeyFile) {
         return 'ALL';
     }
     if (tlsCAFile) {
@@ -192,9 +197,10 @@ function optionsToSslMethod(options) {
 }
 function removeAWSParams(connectionString) {
     const url = new mongodb_connection_string_url_1.default(connectionString);
-    if (url.searchParams.get('authMechanism') === 'MONGODB-AWS') {
-        url.searchParams.delete('authMechanism');
-        url.searchParams.delete('authMechanismProperties');
+    const searchParams = url.typedSearchParams();
+    if (searchParams.get('authMechanism') === 'MONGODB-AWS') {
+        searchParams.delete('authMechanism');
+        searchParams.delete('authMechanismProperties');
     }
     return url.href;
 }

package/lib/legacy/legacy-connection-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":"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"}

package/lib/redact.d.ts

@@ -1,5 +1,7 @@
-import { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
-import { ConnectionOptions } from './connection-options';
-export declare function redactConnectionString(uri: string): string;
+import type { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
+import type { ConnectionOptions } from './connection-options';
+import { redactConnectionString } from 'mongodb-connection-string-url';
+export { redactConnectionString };
 export declare function redactConnectionOptions(options: ConnectionOptions): ConnectionOptions;
-export declare function redactSshTunnelOptions(options: SshTunnelConfig): SshTunnelConfig;
+export declare function redactSshTunnelOptions<T extends Partial<SshTunnelConfig>>(options: T): T;
+//# sourceMappingURL=redact.d.ts.map

package/lib/redact.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAElC,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,iBAAiB,GACzB,iBAAiB,CAuBnB;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,OAAO,CAAC,eAAe,CAAC,EACvE,OAAO,EAAE,CAAC,GACT,CAAC,CAgBH"}

package/lib/redact.js

@@ -1,17 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.redactSshTunnelOptions = exports.redactConnectionOptions = exports.redactConnectionString = void 0;
-function redactConnectionString(uri) {
-    const regexes = [
-        /(?<=\/\/)(.*)(?=@)/g,
-        /(?<=AWS_SESSION_TOKEN(:|%3A))([^,&]+)/,
-    ];
-    regexes.forEach((r) => {
-        uri = uri.replace(r, '<credentials>');
-    });
-    return uri;
-}
-exports.redactConnectionString = redactConnectionString;
+const mongodb_connection_string_url_1 = require("mongodb-connection-string-url");
+Object.defineProperty(exports, "redactConnectionString", { enumerable: true, get: function () { return mongodb_connection_string_url_1.redactConnectionString; } });
 function redactConnectionOptions(options) {
     var _a, _b;
     const redactedTunnelOptions = options.sshTunnel
@@ -23,7 +14,7 @@ function redactConnectionOptions(options) {
         ...options,
         sshTunnel: redactedTunnelOptions,
     };
-    redacted.connectionString = redactConnectionString(options.connectionString);
+    redacted.connectionString = (0, mongodb_connection_string_url_1.redactConnectionString)(options.connectionString);
     if ((_a = redacted.sshTunnel) === null || _a === void 0 ? void 0 : _a.password) {
         redacted.sshTunnel.password = '<redacted>';
     }

package/lib/redact.js.map

@@ -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"}
+{"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,IAAA,sDAAsB,EAAC,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,OAAU;IAEV,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"}

package/lib/run-command.d.ts

@@ -1,4 +1,4 @@
-import { Document, Db, RunCommandOptions } from 'mongodb';
+import type { Document, Db, RunCommandOptions } from 'mongodb';
 import type { Binary } from 'bson';
 export declare type ConnectionStatus = {
     authInfo: {
@@ -119,6 +119,9 @@ interface RunDiagnosticsCommand {
         dbStats: 1;
         scale?: number;
     }, options?: RunCommandOptions): Promise<DbStats>;
+    (db: Db, spec: {
+        atlasVersion: 1;
+    }, options?: RunCommandOptions): Promise<AtlasVersionInfo>;
 }
 export declare type ListDatabasesOptions = {
     nameOnly?: never;
@@ -169,6 +172,10 @@ export declare type ListCollectionsOptions = {
 export declare type ListCollectionsOptionsNamesOnly = Omit<ListCollectionsOptions, 'nameOnly'> & {
     nameOnly: true;
 };
+export declare type AtlasVersionInfo = {
+    version: string;
+    gitVersion: string;
+};
 export declare type ListCollectionsResult<CollectionType> = {
     cursor: {
         firstBatch: CollectionType;
@@ -200,3 +207,4 @@ interface RunCommand extends RunDiagnosticsCommand, RunAdministrationCommand {
 }
 export declare const runCommand: RunCommand;
 export {};
+//# sourceMappingURL=run-command.d.ts.map

package/lib/run-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":"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"}

package/lib/run-command.js.map

@@ -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"}
+{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AACA,qCAAyC;AAsQlC,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"}

package/lib/ssh-tunnel.d.ts

@@ -1,5 +1,9 @@
 import SSHTunnel from '@mongodb-js/ssh-tunnel';
-import { ConnectionSshOptions } from './connection-options';
-export declare function openSshTunnel(srvResolvedConnectionString: string, sshTunnelOptions: ConnectionSshOptions | undefined, localPort: number): Promise<[SSHTunnel | undefined, string]>;
+import type { MongoClientOptions } from 'mongodb';
+import type { ConnectionSshOptions } from './connection-options';
+declare type Socks5Options = Pick<MongoClientOptions, 'proxyHost' | 'proxyPort' | 'proxyUsername' | 'proxyPassword'>;
+export declare function openSshTunnel(sshTunnelOptions: ConnectionSshOptions | undefined): Promise<[SSHTunnel | undefined, Socks5Options | undefined]>;
 export declare function forceCloseTunnel(tunnelToClose?: SSHTunnel | void): Promise<void>;
-export declare function waitForTunnelError(tunnel: SSHTunnel | void): Promise<void>;
+export declare function waitForTunnelError(tunnel: SSHTunnel | void): Promise<never>;
+export {};
+//# sourceMappingURL=ssh-tunnel.d.ts.map

package/lib/ssh-tunnel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssh-tunnel.d.ts","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":"AAMA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAOjE,aAAK,aAAa,GAAG,IAAI,CACvB,kBAAkB,EAClB,WAAW,GAAG,WAAW,GAAG,eAAe,GAAG,eAAe,CAC9D,CAAC;AAEF,wBAAsB,aAAa,CACjC,gBAAgB,EAAE,oBAAoB,GAAG,SAAS,GACjD,OAAO,CAAC,CAAC,SAAS,GAAG,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC,CAAC,CAyD7D;AAED,wBAAsB,gBAAgB,CACpC,aAAa,CAAC,EAAE,SAAS,GAAG,IAAI,GAC/B,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,GAAG,IAAI,GACvB,OAAO,CAAC,KAAK,CAAC,CAGhB"}