mongodb-data-service 22.8.0 → 22.9.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.
- package/lib/connect-mongo-client.d.ts +4 -2
- package/lib/connect-mongo-client.d.ts.map +1 -1
- package/lib/connect-mongo-client.js +45 -18
- package/lib/connect-mongo-client.js.map +1 -1
- package/lib/connection-options.d.ts +4 -1
- package/lib/connection-options.d.ts.map +1 -1
- package/lib/csfle-collection-tracker.js +24 -35
- package/lib/csfle-collection-tracker.js.map +1 -1
- package/lib/data-service.d.ts +8 -0
- package/lib/data-service.d.ts.map +1 -1
- package/lib/data-service.js +85 -60
- package/lib/data-service.js.map +1 -1
- package/lib/index-detail-helper.js +4 -4
- package/lib/index-detail-helper.js.map +1 -1
- package/lib/index.d.ts +3 -8
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -14
- package/lib/index.js.map +1 -1
- package/lib/instance-detail-helper.d.ts +1 -1
- package/lib/instance-detail-helper.d.ts.map +1 -1
- package/lib/instance-detail-helper.js +35 -46
- package/lib/instance-detail-helper.js.map +1 -1
- package/lib/redact.js +2 -3
- package/lib/redact.js.map +1 -1
- package/lib/run-command.js +1 -2
- package/lib/run-command.js.map +1 -1
- package/lib/ssh-tunnel.js +3 -3
- package/lib/ssh-tunnel.js.map +1 -1
- package/package.json +14 -19
- package/lib/connection-info.d.ts +0 -12
- package/lib/connection-info.d.ts.map +0 -1
- package/lib/connection-info.js +0 -3
- package/lib/connection-info.js.map +0 -1
- package/lib/connection-secrets.d.ts +0 -17
- package/lib/connection-secrets.d.ts.map +0 -1
- package/lib/connection-secrets.js +0 -135
- package/lib/connection-secrets.js.map +0 -1
- package/lib/connection-storage.d.ts +0 -8
- package/lib/connection-storage.d.ts.map +0 -1
- package/lib/connection-storage.js +0 -79
- package/lib/connection-storage.js.map +0 -1
- package/lib/connection-title.d.ts +0 -3
- package/lib/connection-title.d.ts.map +0 -1
- package/lib/connection-title.js +0 -22
- package/lib/connection-title.js.map +0 -1
- package/lib/encrypt.d.ts +0 -16
- package/lib/encrypt.d.ts.map +0 -1
- package/lib/encrypt.js +0 -104
- package/lib/encrypt.js.map +0 -1
- package/lib/import-export-connection.d.ts +0 -16
- package/lib/import-export-connection.d.ts.map +0 -1
- package/lib/import-export-connection.js +0 -123
- package/lib/import-export-connection.js.map +0 -1
- package/lib/legacy/legacy-connection-model.d.ts +0 -95
- package/lib/legacy/legacy-connection-model.d.ts.map +0 -1
- package/lib/legacy/legacy-connection-model.js +0 -264
- package/lib/legacy/legacy-connection-model.js.map +0 -1
package/lib/index.d.ts
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import connect from './connect';
|
|
2
|
-
import {
|
|
3
|
-
import { ConnectionOptions } from './connection-options';
|
|
4
|
-
import { ConnectionStorage } from './connection-storage';
|
|
5
|
-
import { getConnectionTitle } from './connection-title';
|
|
2
|
+
import { ConnectionOptions, ConnectionSshOptions } from './connection-options';
|
|
6
3
|
import { DataService } from './data-service';
|
|
7
|
-
import { convertConnectionModelToInfo, convertConnectionInfoToModel } from './legacy/legacy-connection-model';
|
|
8
|
-
import { ConnectionSecrets, extractSecrets, mergeSecrets } from './connection-secrets';
|
|
9
4
|
import { configuredKMSProviders } from './instance-detail-helper';
|
|
10
|
-
export {
|
|
11
|
-
export {
|
|
5
|
+
export { ConnectionOptions, ConnectionSshOptions, DataService, connect, configuredKMSProviders, };
|
|
6
|
+
export type { ReauthenticationHandler } from './connect-mongo-client';
|
|
12
7
|
export type { ExplainExecuteOptions } from './data-service';
|
|
13
8
|
export type { IndexDefinition } from './index-detail-helper';
|
|
14
9
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,WAAW,EACX,OAAO,EACP,sBAAsB,GACvB,CAAC;AAEF,YAAY,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACtE,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -3,22 +3,9 @@ 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.
|
|
6
|
+
exports.configuredKMSProviders = exports.connect = void 0;
|
|
7
7
|
const connect_1 = __importDefault(require("./connect"));
|
|
8
8
|
exports.connect = connect_1.default;
|
|
9
|
-
const connection_storage_1 = require("./connection-storage");
|
|
10
|
-
Object.defineProperty(exports, "ConnectionStorage", { enumerable: true, get: function () { return connection_storage_1.ConnectionStorage; } });
|
|
11
|
-
const connection_title_1 = require("./connection-title");
|
|
12
|
-
Object.defineProperty(exports, "getConnectionTitle", { enumerable: true, get: function () { return connection_title_1.getConnectionTitle; } });
|
|
13
|
-
const legacy_connection_model_1 = require("./legacy/legacy-connection-model");
|
|
14
|
-
Object.defineProperty(exports, "convertConnectionModelToInfo", { enumerable: true, get: function () { return legacy_connection_model_1.convertConnectionModelToInfo; } });
|
|
15
|
-
Object.defineProperty(exports, "convertConnectionInfoToModel", { enumerable: true, get: function () { return legacy_connection_model_1.convertConnectionInfoToModel; } });
|
|
16
|
-
const connection_secrets_1 = require("./connection-secrets");
|
|
17
|
-
Object.defineProperty(exports, "extractSecrets", { enumerable: true, get: function () { return connection_secrets_1.extractSecrets; } });
|
|
18
|
-
Object.defineProperty(exports, "mergeSecrets", { enumerable: true, get: function () { return connection_secrets_1.mergeSecrets; } });
|
|
19
9
|
const instance_detail_helper_1 = require("./instance-detail-helper");
|
|
20
10
|
Object.defineProperty(exports, "configuredKMSProviders", { enumerable: true, get: function () { return instance_detail_helper_1.configuredKMSProviders; } });
|
|
21
|
-
var import_export_connection_1 = require("./import-export-connection");
|
|
22
|
-
Object.defineProperty(exports, "exportConnections", { enumerable: true, get: function () { return import_export_connection_1.exportConnections; } });
|
|
23
|
-
Object.defineProperty(exports, "importConnections", { enumerable: true, get: function () { return import_export_connection_1.importConnections; } });
|
|
24
11
|
//# 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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAS9B,kBATK,iBAAO,CASL;AANT,qEAAkE;AAOhE,uGAPO,+CAAsB,OAOP"}
|
|
@@ -70,7 +70,7 @@ export type InstanceDetails = {
|
|
|
70
70
|
isAtlas: boolean;
|
|
71
71
|
csfleMode: 'enabled' | 'disabled' | 'unavailable';
|
|
72
72
|
};
|
|
73
|
-
export declare function getInstance(client: MongoClient): Promise<Omit<InstanceDetails, 'csfleMode'>>;
|
|
73
|
+
export declare function getInstance(client: MongoClient, uri: string): Promise<Omit<InstanceDetails, 'csfleMode'>>;
|
|
74
74
|
export declare function checkIsCSFLEConnection(client: {
|
|
75
75
|
options: MongoClientOptions;
|
|
76
76
|
}): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-detail-helper.d.ts","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACX,QAAQ,EACR,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAQjB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"instance-detail-helper.d.ts","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,14 +8,10 @@ const mongodb_build_info_1 = require("mongodb-build-info");
|
|
|
8
8
|
const mongodb_ns_1 = __importDefault(require("mongodb-ns"));
|
|
9
9
|
const run_command_1 = require("./run-command");
|
|
10
10
|
const logger_1 = require("./logger");
|
|
11
|
-
async function getInstance(client) {
|
|
12
|
-
var _a;
|
|
11
|
+
async function getInstance(client, uri) {
|
|
13
12
|
const adminDb = client.db('admin');
|
|
14
|
-
const [connectionStatus,
|
|
13
|
+
const [connectionStatus, hostInfoResult, buildInfoResult, getParameterResult, atlasVersionResult,] = await Promise.all([
|
|
15
14
|
(0, run_command_1.runCommand)(adminDb, { connectionStatus: 1, showPrivileges: true }).catch(ignoreNotAuthorized(null)),
|
|
16
|
-
(0, run_command_1.runCommand)(adminDb, { getCmdLineOpts: 1 }).catch((err) => {
|
|
17
|
-
return { errmsg: err.message };
|
|
18
|
-
}),
|
|
19
15
|
(0, run_command_1.runCommand)(adminDb, { hostInfo: 1 }).catch(ignoreNotAuthorized({})),
|
|
20
16
|
(0, run_command_1.runCommand)(adminDb, { buildInfo: 1 }),
|
|
21
17
|
(0, run_command_1.runCommand)(adminDb, {
|
|
@@ -30,36 +26,33 @@ async function getInstance(client) {
|
|
|
30
26
|
auth: adaptAuthInfo(connectionStatus),
|
|
31
27
|
build: adaptBuildInfo(buildInfoResult),
|
|
32
28
|
host: adaptHostInfo(hostInfoResult),
|
|
33
|
-
genuineMongoDB: buildGenuineMongoDBInfo(
|
|
29
|
+
genuineMongoDB: buildGenuineMongoDBInfo(uri),
|
|
34
30
|
dataLake: buildDataLakeInfo(buildInfoResult),
|
|
35
|
-
featureCompatibilityVersion:
|
|
31
|
+
featureCompatibilityVersion: getParameterResult?.featureCompatibilityVersion.version ?? null,
|
|
36
32
|
isAtlas: checkIsAtlas(client, atlasVersionResult),
|
|
37
33
|
};
|
|
38
34
|
}
|
|
39
35
|
exports.getInstance = getInstance;
|
|
40
36
|
function checkIsAtlas(client, atlasVersionInfo) {
|
|
41
|
-
|
|
42
|
-
const firstHost = ((_a = client.options.hosts[0]) === null || _a === void 0 ? void 0 : _a.host) || '';
|
|
37
|
+
const firstHost = client.options.hosts[0]?.host || '';
|
|
43
38
|
if (atlasVersionInfo.atlasVersion === '') {
|
|
44
39
|
return /mongodb(-dev)?\.net$/i.test(firstHost);
|
|
45
40
|
}
|
|
46
41
|
return true;
|
|
47
42
|
}
|
|
48
43
|
function checkIsCSFLEConnection(client) {
|
|
49
|
-
|
|
50
|
-
return configuredKMSProviders((_a = client.options) === null || _a === void 0 ? void 0 : _a.autoEncryption).length > 0;
|
|
44
|
+
return configuredKMSProviders(client.options?.autoEncryption).length > 0;
|
|
51
45
|
}
|
|
52
46
|
exports.checkIsCSFLEConnection = checkIsCSFLEConnection;
|
|
53
47
|
function configuredKMSProviders(autoEncryption) {
|
|
54
|
-
|
|
55
|
-
const kmsProviders = (_a = autoEncryption === null || autoEncryption === void 0 ? void 0 : autoEncryption.kmsProviders) !== null && _a !== void 0 ? _a : {};
|
|
48
|
+
const kmsProviders = autoEncryption?.kmsProviders ?? {};
|
|
56
49
|
return Object.entries(kmsProviders)
|
|
57
|
-
.filter(([, kmsOptions]) => Object.values(kmsOptions
|
|
50
|
+
.filter(([, kmsOptions]) => Object.values(kmsOptions ?? {}).filter(Boolean).length > 0)
|
|
58
51
|
.map(([kmsProviderName]) => kmsProviderName);
|
|
59
52
|
}
|
|
60
53
|
exports.configuredKMSProviders = configuredKMSProviders;
|
|
61
|
-
function buildGenuineMongoDBInfo(
|
|
62
|
-
const { isGenuine, serverName } = (0, mongodb_build_info_1.getGenuineMongoDB)(
|
|
54
|
+
function buildGenuineMongoDBInfo(uri) {
|
|
55
|
+
const { isGenuine, serverName } = (0, mongodb_build_info_1.getGenuineMongoDB)(uri);
|
|
63
56
|
return {
|
|
64
57
|
isGenuine,
|
|
65
58
|
dbType: serverName,
|
|
@@ -73,19 +66,18 @@ function buildDataLakeInfo(buildInfo) {
|
|
|
73
66
|
};
|
|
74
67
|
}
|
|
75
68
|
function adaptAuthInfo(connectionStatus) {
|
|
76
|
-
var _a;
|
|
77
69
|
if (connectionStatus === null) {
|
|
78
70
|
return { user: null, roles: [], privileges: [] };
|
|
79
71
|
}
|
|
80
72
|
const { authenticatedUsers, authenticatedUserRoles, authenticatedUserPrivileges, } = connectionStatus.authInfo;
|
|
81
73
|
return {
|
|
82
|
-
user:
|
|
74
|
+
user: authenticatedUsers[0] ?? null,
|
|
83
75
|
roles: authenticatedUserRoles,
|
|
84
76
|
privileges: authenticatedUserPrivileges,
|
|
85
77
|
};
|
|
86
78
|
}
|
|
87
79
|
function getPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null, requiredActions = null) {
|
|
88
|
-
const privileges = authenticatedUserPrivileges
|
|
80
|
+
const privileges = authenticatedUserPrivileges ?? [];
|
|
89
81
|
const filteredPrivileges = requiredActions && requiredActions.length > 0
|
|
90
82
|
? privileges.filter(({ actions }) => {
|
|
91
83
|
return requiredActions.every((action) => actions.includes(action));
|
|
@@ -108,7 +100,7 @@ function getPrivilegesByDatabaseAndCollection(authenticatedUserPrivileges = null
|
|
|
108
100
|
}
|
|
109
101
|
exports.getPrivilegesByDatabaseAndCollection = getPrivilegesByDatabaseAndCollection;
|
|
110
102
|
function getDatabasesByRoles(authenticatedUserRoles = null, possibleRoles = null) {
|
|
111
|
-
const roles = authenticatedUserRoles
|
|
103
|
+
const roles = authenticatedUserRoles ?? [];
|
|
112
104
|
const results = new Set();
|
|
113
105
|
const filteredRoles = possibleRoles && possibleRoles.length > 0
|
|
114
106
|
? roles.filter(({ role }) => {
|
|
@@ -150,44 +142,41 @@ function ignoreNotAuthorized(fallback) {
|
|
|
150
142
|
};
|
|
151
143
|
}
|
|
152
144
|
function adaptHostInfo(rawHostInfo) {
|
|
153
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
154
145
|
return {
|
|
155
|
-
os:
|
|
156
|
-
os_family:
|
|
146
|
+
os: rawHostInfo.os?.name,
|
|
147
|
+
os_family: rawHostInfo.os?.type
|
|
157
148
|
? rawHostInfo.os.type.toLowerCase()
|
|
158
149
|
: undefined,
|
|
159
|
-
kernel_version:
|
|
160
|
-
kernel_version_string:
|
|
161
|
-
arch:
|
|
162
|
-
memory_bits: (
|
|
163
|
-
cpu_cores:
|
|
164
|
-
cpu_frequency: parseInt(
|
|
150
|
+
kernel_version: rawHostInfo.os?.version,
|
|
151
|
+
kernel_version_string: rawHostInfo.extra?.versionString,
|
|
152
|
+
arch: rawHostInfo.system?.cpuArch,
|
|
153
|
+
memory_bits: (rawHostInfo.system?.memSizeMB ?? 0) * 1024 * 1024,
|
|
154
|
+
cpu_cores: rawHostInfo.system?.numCores,
|
|
155
|
+
cpu_frequency: parseInt(rawHostInfo.extra?.cpuFrequencyMHz || '0', 10) * 1000000,
|
|
165
156
|
};
|
|
166
157
|
}
|
|
167
158
|
function adaptBuildInfo(rawBuildInfo) {
|
|
168
|
-
var _a;
|
|
169
159
|
return {
|
|
170
|
-
version:
|
|
160
|
+
version: rawBuildInfo.version ?? '',
|
|
171
161
|
isEnterprise: (0, mongodb_build_info_1.isEnterprise)(rawBuildInfo),
|
|
172
162
|
};
|
|
173
163
|
}
|
|
174
164
|
function adaptDatabaseInfo(databaseStats) {
|
|
175
|
-
var _a, _b, _c, _d, _e, _f;
|
|
176
165
|
return {
|
|
177
|
-
collection_count:
|
|
178
|
-
document_count:
|
|
179
|
-
index_count:
|
|
180
|
-
storage_size:
|
|
181
|
-
data_size:
|
|
182
|
-
index_size:
|
|
166
|
+
collection_count: databaseStats.collections ?? 0,
|
|
167
|
+
document_count: databaseStats.objects ?? 0,
|
|
168
|
+
index_count: databaseStats.indexes ?? 0,
|
|
169
|
+
storage_size: databaseStats.storageSize ?? 0,
|
|
170
|
+
data_size: databaseStats.dataSize ?? 0,
|
|
171
|
+
index_size: databaseStats.indexSize ?? 0,
|
|
183
172
|
};
|
|
184
173
|
}
|
|
185
174
|
exports.adaptDatabaseInfo = adaptDatabaseInfo;
|
|
186
175
|
function adaptCollectionInfo({ db, name, info, options, type, }) {
|
|
187
176
|
const ns = (0, mongodb_ns_1.default)(`${db}.${name}`);
|
|
188
177
|
const { collection, database, system, oplog, command, special, specialish, normal, } = ns;
|
|
189
|
-
const { readOnly } = info
|
|
190
|
-
const { collation, viewOn, pipeline, validator, validationAction, validationLevel, clusteredIndex, encryptedFields, } = options
|
|
178
|
+
const { readOnly } = info ?? {};
|
|
179
|
+
const { collation, viewOn, pipeline, validator, validationAction, validationLevel, clusteredIndex, encryptedFields, } = options ?? {};
|
|
191
180
|
const hasValidation = Boolean(validator || validationAction || validationLevel);
|
|
192
181
|
return {
|
|
193
182
|
_id: ns.toString(),
|
|
@@ -199,11 +188,11 @@ function adaptCollectionInfo({ db, name, info, options, type, }) {
|
|
|
199
188
|
special,
|
|
200
189
|
specialish,
|
|
201
190
|
normal,
|
|
202
|
-
type: type
|
|
203
|
-
readonly: readOnly
|
|
204
|
-
collation: collation
|
|
205
|
-
view_on: viewOn
|
|
206
|
-
pipeline: pipeline
|
|
191
|
+
type: type ?? 'collection',
|
|
192
|
+
readonly: readOnly ?? false,
|
|
193
|
+
collation: collation ?? null,
|
|
194
|
+
view_on: viewOn ?? null,
|
|
195
|
+
pipeline: pipeline ?? null,
|
|
207
196
|
clustered: clusteredIndex ? true : false,
|
|
208
197
|
fle2: encryptedFields ? true : false,
|
|
209
198
|
validation: hasValidation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":";;;;;;AAOA,2DAI4B;AAC5B,4DAA8B;
|
|
1
|
+
{"version":3,"file":"instance-detail-helper.js","sourceRoot":"","sources":["../src/instance-detail-helper.ts"],"names":[],"mappings":"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"}
|
package/lib/redact.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.redactSshTunnelOptions = exports.redactConnectionOptions = exports.redac
|
|
|
4
4
|
const mongodb_connection_string_url_1 = require("mongodb-connection-string-url");
|
|
5
5
|
Object.defineProperty(exports, "redactConnectionString", { enumerable: true, get: function () { return mongodb_connection_string_url_1.redactConnectionString; } });
|
|
6
6
|
function redactConnectionOptions(options) {
|
|
7
|
-
var _a, _b;
|
|
8
7
|
const redactedTunnelOptions = options.sshTunnel
|
|
9
8
|
? {
|
|
10
9
|
...options.sshTunnel,
|
|
@@ -15,10 +14,10 @@ function redactConnectionOptions(options) {
|
|
|
15
14
|
sshTunnel: redactedTunnelOptions,
|
|
16
15
|
};
|
|
17
16
|
redacted.connectionString = (0, mongodb_connection_string_url_1.redactConnectionString)(options.connectionString);
|
|
18
|
-
if (
|
|
17
|
+
if (redacted.sshTunnel?.password) {
|
|
19
18
|
redacted.sshTunnel.password = '<redacted>';
|
|
20
19
|
}
|
|
21
|
-
if (
|
|
20
|
+
if (redacted.sshTunnel?.identityKeyPassphrase) {
|
|
22
21
|
redacted.sshTunnel.identityKeyPassphrase = '<redacted>';
|
|
23
22
|
}
|
|
24
23
|
return redacted;
|
package/lib/redact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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
|
|
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,IAAA,sDAAsB,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7E,IAAI,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE;QAChC,QAAQ,CAAC,SAAS,CAAC,QAAQ,GAAG,YAAY,CAAC;KAC5C;IAED,IAAI,QAAQ,CAAC,SAAS,EAAE,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.js
CHANGED
|
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runCommand = void 0;
|
|
4
4
|
const mongodb_1 = require("mongodb");
|
|
5
5
|
const runCommand = (db, spec, options) => {
|
|
6
|
-
|
|
7
|
-
const readPreference = (_a = db.readPreference) !== null && _a !== void 0 ? _a : mongodb_1.ReadPreference.PRIMARY_PREFERRED;
|
|
6
|
+
const readPreference = db.readPreference ?? mongodb_1.ReadPreference.PRIMARY_PREFERRED;
|
|
8
7
|
return db.command({ ...spec }, { readPreference, ...options });
|
|
9
8
|
};
|
|
10
9
|
exports.runCommand = runCommand;
|
package/lib/run-command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AAOA,qCAAyC;AAuTlC,MAAM,UAAU,GAAe,CACpC,EAAM,EACN,IAAc,EACd,OAA2B,EAC3B,EAAE
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AAOA,qCAAyC;AAuTlC,MAAM,UAAU,GAAe,CACpC,EAAM,EACN,IAAc,EACd,OAA2B,EAC3B,EAAE;IAUF,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,IAAI,wBAAc,CAAC,iBAAiB,CAAC;IAE7E,OAAO,EAAE,CAAC,OAAO,CACf,EAAE,GAAG,IAAI,EAAE,EACX,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAIf,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB"}
|
package/lib/ssh-tunnel.js
CHANGED
|
@@ -38,13 +38,13 @@ async function openSshTunnel(sshTunnelOptions, logger) {
|
|
|
38
38
|
passphrase: sshTunnelOptions.identityKeyPassphrase,
|
|
39
39
|
};
|
|
40
40
|
const redactedTunnelOptions = (0, redact_1.redactSshTunnelOptions)(tunnelConstructorOptions);
|
|
41
|
-
logger
|
|
41
|
+
logger?.info('COMPASS-DATA-SERVICE', (0, logger_1.mongoLogId)(1001000006), 'SSHTunnel', 'Creating SSH tunnel', redactedTunnelOptions);
|
|
42
42
|
debug('creating ssh tunnel with options', redactedTunnelOptions);
|
|
43
43
|
const tunnel = new ssh_tunnel_1.default(tunnelConstructorOptions);
|
|
44
44
|
debug('ssh tunnel listen ...');
|
|
45
45
|
await tunnel.listen();
|
|
46
46
|
debug('ssh tunnel opened');
|
|
47
|
-
logger
|
|
47
|
+
logger?.info('COMPASS-DATA-SERVICE', (0, logger_1.mongoLogId)(1001000007), 'SSHTunnel', 'SSH tunnel opened');
|
|
48
48
|
return [
|
|
49
49
|
tunnel,
|
|
50
50
|
{
|
|
@@ -58,7 +58,7 @@ async function openSshTunnel(sshTunnelOptions, logger) {
|
|
|
58
58
|
exports.openSshTunnel = openSshTunnel;
|
|
59
59
|
async function forceCloseTunnel(tunnelToClose, logger) {
|
|
60
60
|
if (tunnelToClose) {
|
|
61
|
-
logger
|
|
61
|
+
logger?.info('COMPASS-DATA-SERVICE', (0, logger_1.mongoLogId)(1001000008), 'SSHTunnel', 'Closing SSH tunnel');
|
|
62
62
|
try {
|
|
63
63
|
await tunnelToClose.close();
|
|
64
64
|
debug('ssh tunnel stopped');
|
package/lib/ssh-tunnel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-tunnel.js","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA4C;AAC5C,4CAAoB;AACpB,oDAA4B;AAC5B,+BAAiC;AACjC,wEAA+C;AAG/C,qCAAkD;AAElD,qCAAuD;AAEvD,MAAM,KAAK,GAAG,cAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAE1C,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC,gBAAM,CAAC,WAAW,CAAC,CAAC;AAO3C,KAAK,UAAU,aAAa,CACjC,gBAAkD,EAClD,MAAqC;IAErC,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KAC/B;IAED,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEtE,MAAM,wBAAwB,GAAG;QAC/B,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,KAAK;QACrB,iBAAiB,EAAE,KAAK;QACxB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,WAAW;QACtB,cAAc,EAAE,cAAc;QAC9B,cAAc,EAAE,cAAc;QAC9B,IAAI,EAAE,gBAAgB,CAAC,IAAI;QAC3B,IAAI,EAAE,gBAAgB,CAAC,IAAI;QAC3B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;QACnC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;QACnC,UAAU,EAAE,gBAAgB,CAAC,eAAe;YAC1C,CAAC,CAAC,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,eAAe,CAAC;YAC9D,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,gBAAgB,CAAC,qBAAqB;KACnD,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAA,+BAAsB,EAClD,wBAAwB,CACzB,CAAC;IAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"ssh-tunnel.js","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":"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"}
|
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": "22.
|
|
10
|
+
"version": "22.9.0",
|
|
11
11
|
"repository": {
|
|
12
12
|
"type": "git",
|
|
13
13
|
"url": "https://github.com/mongodb-js/compass.git"
|
|
@@ -39,40 +39,36 @@
|
|
|
39
39
|
"lint": "npm run eslint . && npm run prettier -- --check .",
|
|
40
40
|
"check": "npm run lint && npm run depcheck",
|
|
41
41
|
"check-ci": "npm run check",
|
|
42
|
-
"pretest": "node ../../scripts/testserver.js start dataservice --port=27021",
|
|
43
42
|
"test": "mocha",
|
|
44
43
|
"test-connectivity": "mocha ./src/connect.spec.ts",
|
|
45
|
-
"posttest": "node ../../scripts/testserver.js stop dataservice",
|
|
46
|
-
"pretest-csfle": "node ../../scripts/testserver.js start dataservice --enterprise --mongodb-version \">=7.0.0-rc0\" --topology=replicaset --secondaries=0 --port=27021",
|
|
47
44
|
"test-csfle": "mocha ./src/csfle-collection-tracker.spec.ts ./src/data-service.spec.ts",
|
|
48
|
-
"posttest-csfle": "node ../../scripts/testserver.js stop dataservice",
|
|
49
45
|
"test-cov": "nyc --compact=false --produce-source-map=false -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
|
|
50
46
|
"test-watch": "npm run test -- --watch",
|
|
51
47
|
"test-ci": "npm run test-cov",
|
|
52
48
|
"reformat": "npm run prettier -- --write . && npm run eslint . --fix"
|
|
53
49
|
},
|
|
54
50
|
"peerDependencies": {
|
|
55
|
-
"mongodb": "^5.
|
|
51
|
+
"mongodb": "^5.6.0"
|
|
56
52
|
},
|
|
57
53
|
"dependencies": {
|
|
58
|
-
"@mongodb-js/compass-logging": "^1.1.
|
|
59
|
-
"@mongodb-js/compass-utils": "^0.3.
|
|
60
|
-
"@mongodb-js/devtools-connect": "^2.
|
|
61
|
-
"@mongodb-js/oidc-plugin": "^0.
|
|
62
|
-
"@mongodb-js/ssh-tunnel": "^2.0.
|
|
54
|
+
"@mongodb-js/compass-logging": "^1.1.7",
|
|
55
|
+
"@mongodb-js/compass-utils": "^0.3.2",
|
|
56
|
+
"@mongodb-js/devtools-connect": "^2.4.0",
|
|
57
|
+
"@mongodb-js/oidc-plugin": "^0.3.0",
|
|
58
|
+
"@mongodb-js/ssh-tunnel": "^2.0.7",
|
|
63
59
|
"lodash": "^4.17.21",
|
|
64
|
-
"mongodb-build-info": "^1.
|
|
65
|
-
"mongodb-connection-model": "^22.4.1",
|
|
60
|
+
"mongodb-build-info": "^1.6.2",
|
|
66
61
|
"mongodb-connection-string-url": "^2.6.0",
|
|
67
62
|
"mongodb-ns": "^2.4.0",
|
|
68
63
|
"uuid": "^8.3.2"
|
|
69
64
|
},
|
|
70
65
|
"devDependencies": {
|
|
66
|
+
"@mongodb-js/compass-test-server": "^0.1.1",
|
|
71
67
|
"@mongodb-js/devtools-docker-test-envs": "^1.2.4",
|
|
72
|
-
"@mongodb-js/eslint-config-compass": "^1.0.
|
|
73
|
-
"@mongodb-js/mocha-config-compass": "^1.2.
|
|
74
|
-
"@mongodb-js/prettier-config-compass": "^1.0.
|
|
75
|
-
"@mongodb-js/tsconfig-compass": "^1.0.
|
|
68
|
+
"@mongodb-js/eslint-config-compass": "^1.0.7",
|
|
69
|
+
"@mongodb-js/mocha-config-compass": "^1.2.1",
|
|
70
|
+
"@mongodb-js/prettier-config-compass": "^1.0.1",
|
|
71
|
+
"@mongodb-js/tsconfig-compass": "^1.0.3",
|
|
76
72
|
"@types/lodash": "^4.14.188",
|
|
77
73
|
"@types/uuid": "^8.3.1",
|
|
78
74
|
"@types/whatwg-url": "^8.2.1",
|
|
@@ -86,11 +82,10 @@
|
|
|
86
82
|
"nyc": "^15.1.0",
|
|
87
83
|
"prettier": "^2.7.1",
|
|
88
84
|
"sinon": "^9.2.3",
|
|
89
|
-
"storage-mixin": "^5.1.5",
|
|
90
85
|
"typescript": "^5.0.4"
|
|
91
86
|
},
|
|
92
87
|
"optionalDependencies": {
|
|
93
88
|
"mongodb-client-encryption": "^2.8.0"
|
|
94
89
|
},
|
|
95
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "ab322a183cd516c117cf575d9b7931073954fe1d"
|
|
96
91
|
}
|
package/lib/connection-info.d.ts
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import type { ConnectionOptions } from './connection-options';
|
|
2
|
-
export interface ConnectionInfo {
|
|
3
|
-
readonly id: string;
|
|
4
|
-
lastUsed?: Date;
|
|
5
|
-
favorite?: ConnectionFavoriteOptions;
|
|
6
|
-
connectionOptions: ConnectionOptions;
|
|
7
|
-
}
|
|
8
|
-
export interface ConnectionFavoriteOptions {
|
|
9
|
-
name: string;
|
|
10
|
-
color?: string;
|
|
11
|
-
}
|
|
12
|
-
//# sourceMappingURL=connection-info.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connection-info.d.ts","sourceRoot":"","sources":["../src/connection-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,MAAM,WAAW,cAAc;IAI7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAKpB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAKhB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IAKrC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IAIxC,IAAI,EAAE,MAAM,CAAC;IAKb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
|
package/lib/connection-info.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connection-info.js","sourceRoot":"","sources":["../src/connection-info.ts"],"names":[],"mappings":""}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import type { ConnectionInfo } from './connection-info';
|
|
2
|
-
import type { AutoEncryptionOptions } from 'mongodb';
|
|
3
|
-
export interface ConnectionSecrets {
|
|
4
|
-
password?: string;
|
|
5
|
-
sshTunnelPassword?: string;
|
|
6
|
-
sshTunnelPassphrase?: string;
|
|
7
|
-
awsSessionToken?: string;
|
|
8
|
-
tlsCertificateKeyFilePassword?: string;
|
|
9
|
-
proxyPassword?: string;
|
|
10
|
-
autoEncryption?: AutoEncryptionOptions;
|
|
11
|
-
}
|
|
12
|
-
export declare function mergeSecrets(connectionInfo: Readonly<ConnectionInfo>, secrets: ConnectionSecrets | undefined): ConnectionInfo;
|
|
13
|
-
export declare function extractSecrets(connectionInfo: Readonly<ConnectionInfo>): {
|
|
14
|
-
connectionInfo: ConnectionInfo;
|
|
15
|
-
secrets: ConnectionSecrets;
|
|
16
|
-
};
|
|
17
|
-
//# sourceMappingURL=connection-secrets.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connection-secrets.d.ts","sourceRoot":"","sources":["../src/connection-secrets.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAGV,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,qBAAqB,CAAC;CACxC;AAED,wBAAgB,YAAY,CAC1B,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,EACxC,OAAO,EAAE,iBAAiB,GAAG,SAAS,GACrC,cAAc,CA6DhB;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG;IACxE,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,iBAAiB,CAAC;CAC5B,CAwFA"}
|