From 28f9f520a505cb6beffe60acf99603b4b2337b0b Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Wed, 9 Oct 2024 09:04:30 +0200 Subject: [PATCH 01/39] fix(shell-api): Fix invalid regular expression error in db.currentOp() MONGOSH-1703 (#2187) Fixes a bug where a regular expression error in db.currentOp() would cause it to error. --- packages/e2e-tests/test/e2e.spec.ts | 70 +++++++++++++++++++++++++ packages/e2e-tests/test/util-helpers.ts | 3 ++ packages/shell-api/src/database.spec.ts | 15 +++--- packages/shell-api/src/database.ts | 7 ++- 4 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 packages/e2e-tests/test/util-helpers.ts diff --git a/packages/e2e-tests/test/e2e.spec.ts b/packages/e2e-tests/test/e2e.spec.ts index dc58693b9..43971d67c 100644 --- a/packages/e2e-tests/test/e2e.spec.ts +++ b/packages/e2e-tests/test/e2e.spec.ts @@ -21,6 +21,7 @@ import { createServer as createHTTPServer } from 'http'; import { once } from 'events'; import type { AddressInfo } from 'net'; const { EJSON } = bson; +import { sleep } from './util-helpers'; const jsContextFlagCombinations: `--jsContext=${'plain-vm' | 'repl'}`[][] = [ [], @@ -1938,4 +1939,73 @@ describe('e2e', function () { shell.assertContainsOutput('610'); }); }); + + describe('currentOp', function () { + context('with 2 shells', function () { + let helperShell: TestShell; + let currentOpShell: TestShell; + + const CURRENT_OP_WAIT_TIME = 400; + const OPERATION_TIME = CURRENT_OP_WAIT_TIME * 2; + + beforeEach(async function () { + helperShell = this.startTestShell({ + args: [await testServer.connectionString()], + }); + currentOpShell = this.startTestShell({ + args: [await testServer.connectionString()], + }); + await helperShell.waitForPrompt(); + await currentOpShell.waitForPrompt(); + + // Insert a dummy object so find commands will actually run with the delay. + await helperShell.executeLine('db.coll.insertOne({})'); + }); + + it('should return the current operation and clear when it is complete', async function () { + const currentCommand = helperShell.executeLine( + `db.coll.find({$where: function() { sleep(${OPERATION_TIME}) }}).projection({testProjection: 1})` + ); + helperShell.assertNoErrors(); + await sleep(CURRENT_OP_WAIT_TIME); + let currentOpCall = await currentOpShell.executeLine(`db.currentOp()`); + + currentOpShell.assertNoErrors(); + + expect(currentOpCall).to.include('testProjection'); + + await currentCommand; + + currentOpCall = await currentOpShell.executeLine(`db.currentOp()`); + + currentOpShell.assertNoErrors(); + expect(currentOpCall).not.to.include('testProjection'); + }); + + it('should work when the operation contains regex', async function () { + const regExpString = String.raw`^(?i)\Qchho0842\E`; + + // Stringify the reg exp and drop the quotation marks. + // Meant to account for JS escaping behavior and to compare with output later. + const stringifiedRegExpString = `${JSON.stringify(regExpString)}`.slice( + 1, + -1 + ); + + void helperShell.executeLine( + `db.coll.find({$where: function() { sleep(${OPERATION_TIME}) }}).projection({re: BSONRegExp('${stringifiedRegExpString}')})` + ); + helperShell.assertNoErrors(); + + await sleep(CURRENT_OP_WAIT_TIME); + + const currentOpCall = await currentOpShell.executeLine( + `db.currentOp()` + ); + currentOpShell.assertNoErrors(); + + expect(currentOpCall).to.include(stringifiedRegExpString); + }); + }); + }); }); diff --git a/packages/e2e-tests/test/util-helpers.ts b/packages/e2e-tests/test/util-helpers.ts new file mode 100644 index 000000000..421bda080 --- /dev/null +++ b/packages/e2e-tests/test/util-helpers.ts @@ -0,0 +1,3 @@ +export function sleep(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)); +} diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts index 2af23eae8..d4fd662e2 100644 --- a/packages/shell-api/src/database.spec.ts +++ b/packages/shell-api/src/database.spec.ts @@ -1796,10 +1796,11 @@ describe('Database', function () { }, }); - const READ_PREFERENCE = { + const AGGREGATE_OPTIONS = { $readPreference: { mode: 'primaryPreferred', }, + bsonRegExp: true, }; beforeEach(function () { @@ -1824,7 +1825,7 @@ describe('Database', function () { }) ); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); } }); @@ -1846,7 +1847,7 @@ describe('Database', function () { }) ); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); }); }); @@ -1868,7 +1869,7 @@ describe('Database', function () { ); expect(matchStage).to.deep.equals({ $match: {} }); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); }); }); @@ -1890,7 +1891,7 @@ describe('Database', function () { ); expect(matchStage).to.deep.equals({ $match: {} }); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); }); }); @@ -1914,7 +1915,7 @@ describe('Database', function () { ); expect(matchStage).to.deep.equals({ $match: {} }); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); }); } @@ -1945,7 +1946,7 @@ describe('Database', function () { $match: { waitingForLock: true }, }); expect(serviceProvider.aggregateDb.firstCall.args[2]).to.deep.equal( - READ_PREFERENCE + AGGREGATE_OPTIONS ); }); diff --git a/packages/shell-api/src/database.ts b/packages/shell-api/src/database.ts index 137782ef0..1765c9299 100644 --- a/packages/shell-api/src/database.ts +++ b/packages/shell-api/src/database.ts @@ -1063,7 +1063,12 @@ export default class Database extends ShellApiWithMongoClass { } const adminDb = this.getSiblingDB('admin'); - const aggregateOptions = { $readPreference: { mode: 'primaryPreferred' } }; + const aggregateOptions = { + $readPreference: { mode: 'primaryPreferred' }, + // Regex patterns should be instances of BSONRegExp + // as there can be issues during conversion otherwise. + bsonRegExp: true, + }; try { const cursor = await adminDb.aggregate(pipeline, aggregateOptions); From 4830599a37b4617f9a7a71b57f85b5e72f555458 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 07:13:47 +0000 Subject: [PATCH 02/39] chore: update auto-generated files (#2205) * chore: update THIRD_PARTY_NOTICES * chore: update AUTHORS --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- packages/e2e-tests/AUTHORS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 8241b06b0..bbaf8fd7a 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Tue Oct 08 2024. +This document was automatically generated on Wed Oct 09 2024. ## List of dependencies diff --git a/packages/e2e-tests/AUTHORS b/packages/e2e-tests/AUTHORS index a3fddf588..e045c4873 100644 --- a/packages/e2e-tests/AUTHORS +++ b/packages/e2e-tests/AUTHORS @@ -7,3 +7,4 @@ Himanshu Singh Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika Kræn Hansen +Gagik Amaryan From 664380be2de1cf664857767f40e6838ea74eadec Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 9 Oct 2024 14:10:09 +0200 Subject: [PATCH 03/39] chore(e2e-tests): bring back test shell output printing on failure (#2204) This was one of the most helpful debugging features when investigating CI failures, but got a bit lost in the refactor in 40d6f41a5fb7. Let's bring it back! --- packages/e2e-tests/test/test-shell-context.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/e2e-tests/test/test-shell-context.ts b/packages/e2e-tests/test/test-shell-context.ts index f4efc8369..583cd6b17 100644 --- a/packages/e2e-tests/test/test-shell-context.ts +++ b/packages/e2e-tests/test/test-shell-context.ts @@ -45,13 +45,21 @@ export function ensureTestShellAfterHook( // Store the set of shells to kill afterwards const shells = new Set(); suite[symbol] = shells; - suite[hookName](async () => { + suite[hookName](async function () { const shellsToKill = [...shells]; shells.clear(); + + if (this.currentTest?.state === 'failed') { + for (const shell of shellsToKill) { + console.error(shell.debugInformation()); + } + } + await Promise.all( shellsToKill.map((shell) => { - // TODO: Consider if it's okay to kill those that are already killed? - shell.kill(); + if (shell.process.exitCode === null) { + shell.kill(); + } return shell.waitForExit(); }) ); From 2a3bb250933b4172ef0e5de8c3151defb703d0f1 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Thu, 10 Oct 2024 10:25:53 +0200 Subject: [PATCH 04/39] feat(shell-api): Account for orphan documents in getShardDistribution() helper MONGOSH-1838 (#2203) getShardDistribution() should correctly account for orphan documents (>= 6.0) when calculating size statistics. It does so by subtracting the size of orphan documents from the total size. --- packages/shell-api/src/collection.spec.ts | 64 +++++++++++++++++++++++ packages/shell-api/src/collection.ts | 49 +++++++++++++---- 2 files changed, 104 insertions(+), 9 deletions(-) diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts index 205da41f3..3f218d662 100644 --- a/packages/shell-api/src/collection.spec.ts +++ b/packages/shell-api/src/collection.spec.ts @@ -2276,6 +2276,70 @@ describe('Collection', function () { ShellApiErrors.NotConnectedToShardedCluster ); }); + + describe('with orphan documents', function () { + const mockedNumChunks = 2; + const mockedCollectionConfigInfo = {}; + const mockedShardStats = { + shard: 'test-shard', + storageStats: { + size: 1000, + numOrphanDocs: 10, + avgObjSize: 7, + count: 15, + }, + }; + const mockedShardInfo = { + host: 'dummy-host', + }; + + beforeEach(function () { + const serviceProviderCursor = stubInterface(); + + // Make find and limit have no effect so the value of findOne is determined by tryNext. + serviceProviderCursor.limit.returns(serviceProviderCursor); + serviceProvider.find.returns(serviceProviderCursor); + + // Mock according to the order of findOne calls getShardDistribution uses. + serviceProviderCursor.tryNext + .onCall(0) + .resolves(mockedCollectionConfigInfo); + serviceProviderCursor.tryNext.onCall(1).resolves(mockedShardInfo); + serviceProvider.countDocuments.returns( + Promise.resolve(mockedNumChunks) + ); + + const aggregateTryNext = sinon.stub(); + aggregateTryNext.onCall(0).resolves(mockedShardStats); + aggregateTryNext.onCall(1).resolves(null); + + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument + serviceProvider.aggregate.returns({ + tryNext: aggregateTryNext, + } as any); + }); + + it('should account for numOrphanDocs when calculating size', async function () { + const shardDistribution = await collection.getShardDistribution(); + + const { storageStats } = mockedShardStats; + expect(shardDistribution.type).equals('StatsResult'); + const adjustedSize = + storageStats.size - + storageStats.numOrphanDocs * storageStats.avgObjSize; + expect(shardDistribution.value.Totals.data).equals( + `${adjustedSize}B` + ); + const shardField = Object.keys(shardDistribution.value).find( + (field) => field !== 'Totals' + ) as `Shard ${string} at ${string}`; + + expect(shardField).not.undefined; + expect( + shardDistribution.value[shardField]['estimated data per chunk'] + ).equals(`${adjustedSize / mockedNumChunks}B`); + }); + }); }); describe('analyzeShardKey', function () { diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index cacfdd8f6..1723425bb 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -2135,12 +2135,14 @@ export default class Collection extends ShellApiWithMongoClass { @returnsPromise @topologies([Topologies.Sharded]) @apiVersions([]) - async getShardDistribution(): Promise { + async getShardDistribution(): Promise< + CommandResult + > { this._emitCollectionApiCall('getShardDistribution', {}); await getConfigDB(this._database); // Warns if not connected to mongos - const result = {} as Document; + const result = {} as GetShardDistributionResult; const config = this._mongo.getDB('config'); const collStats = await ( @@ -2179,17 +2181,24 @@ export default class Collection extends ShellApiWithMongoClass { .findOne({ _id: extractedShardStats.shard }), config.getCollection('chunks').countDocuments(countChunksQuery), ]); + + // Since 6.0, there can be orphan documents indicated by numOrphanDocs. + // These orphan documents need to be accounted for in the size calculation. + const orphanDocumentsSize = + (extractedShardStats.storageStats.numOrphanDocs ?? 0) * + (extractedShardStats.storageStats.avgObjSize ?? 0); + const ownedSize = + extractedShardStats.storageStats.size - orphanDocumentsSize; + const shardStats = { shardId: shard, host: host !== null ? host.host : null, - size: extractedShardStats.storageStats.size, + size: ownedSize, count: extractedShardStats.storageStats.count, numChunks: numChunks, avgObjSize: extractedShardStats.storageStats.avgObjSize, }; - const key = `Shard ${shardStats.shardId} at ${shardStats.host}`; - // In sharded timeseries collections we do not have a count // so we intentionally pass NaN as a result to the client. const shardStatsCount: number = shardStats.count ?? NaN; @@ -2203,7 +2212,7 @@ export default class Collection extends ShellApiWithMongoClass { ? 0 : Math.floor(shardStatsCount / shardStats.numChunks); - result[key] = { + result[`Shard ${shardStats.shardId} at ${shardStats.host}`] = { data: dataFormat(coerceToJSNumber(shardStats.size)), docs: shardStatsCount, chunks: shardStats.numChunks, @@ -2211,7 +2220,7 @@ export default class Collection extends ShellApiWithMongoClass { 'estimated docs per chunk': estimatedDocsPerChunk, }; - totals.size += coerceToJSNumber(shardStats.size); + totals.size += coerceToJSNumber(ownedSize); totals.count += coerceToJSNumber(shardStatsCount); totals.numChunks += coerceToJSNumber(shardStats.numChunks); @@ -2224,7 +2233,7 @@ export default class Collection extends ShellApiWithMongoClass { data: dataFormat(totals.size), docs: totals.count, chunks: totals.numChunks, - } as Document; + } as GetShardDistributionResult['Totals']; for (const shardStats of conciseShardsStats) { const estDataPercent = @@ -2243,7 +2252,8 @@ export default class Collection extends ShellApiWithMongoClass { ]; } result.Totals = totalValue; - return new CommandResult('StatsResult', result); + + return new CommandResult('StatsResult', result); } @serverVersions(['3.1.0', ServerVersions.latest]) @@ -2467,3 +2477,24 @@ export default class Collection extends ShellApiWithMongoClass { ); } } + +export type GetShardDistributionResult = { + Totals: { + data: string; + docs: number; + chunks: number; + } & { + [individualShardDistribution: `Shard ${string}`]: [ + `${number} % data`, + `${number} % docs in cluster`, + `${string} avg obj size on shard` + ]; + }; + [individualShardResult: `Shard ${string} at ${string}`]: { + data: string; + docs: number; + chunks: number; + 'estimated data per chunk': string; + 'estimated docs per chunk': number; + }; +}; From 0360e4bdbd8ba1857144ad1f98e6f5797005cf85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 08:34:19 +0000 Subject: [PATCH 05/39] chore: update THIRD_PARTY_NOTICES (#2208) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index bbaf8fd7a..b5e83bdb7 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Wed Oct 09 2024. +This document was automatically generated on Thu Oct 10 2024. ## List of dependencies From 3baf6f7dc608df221c8145f5846c3a6d8b594049 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Thu, 10 Oct 2024 12:06:19 +0200 Subject: [PATCH 06/39] feat(cli-repl): Ask for tlsCertificateKeyFilePassword when it is needed MONGOSH-1730 When using TLS enabled with a Certificate that requires a password, the mongosh does not prompt for a passphrase automatically, failing with an error. This adds a password prompt for that case. --- packages/cli-repl/src/cli-repl.ts | 34 ++++++++++++++++++++++-- packages/e2e-tests/test/e2e-tls.spec.ts | 35 +++++++++++++++++++++++++ packages/e2e-tests/test/test-shell.ts | 16 +++++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index d1784eb7c..db97e18de 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -288,6 +288,14 @@ export class CliRepl implements MongoshIOProvider { if (this.isPasswordMissingURI(cs)) { cs.password = encodeURIComponent(await this.requirePassword()); } + + if (await this.isTlsKeyFilePasswordMissingURI(searchParams)) { + const keyFilePassword = encodeURIComponent( + await this.requirePassword('Enter TLS key file password') + ); + searchParams.set('tlsCertificateKeyFilePassword', keyFilePassword); + } + this.ensurePasswordFieldIsPresentInAuth(driverOptions); driverUri = cs.toString(); } @@ -1008,6 +1016,28 @@ export class CliRepl implements MongoshIOProvider { ); } + async isTlsKeyFilePasswordMissingURI( + searchParams: ReturnType< + typeof ConnectionString.prototype.typedSearchParams + > + ): Promise { + const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile'); + const tlsCertificateKeyFilePassword = searchParams.get( + 'tlsCertificateKeyFilePassword' + ); + + if (tlsCertificateKeyFile && !tlsCertificateKeyFilePassword) { + const { contents } = await this.readFileUTF8(tlsCertificateKeyFile); + + // Matches standard encrypted key formats for PKCS#12/PKCS#8 and PKCS#1 + return ( + contents.search(/(ENCRYPTED PRIVATE KEY|Proc-Type: 4,ENCRYPTED)/) !== -1 + ); + } + + return false; + } + /** * Sets the auth.password field to undefined in the driverOptions if the auth * object is present with a truthy username. This is required by the driver, e.g. @@ -1028,13 +1058,13 @@ export class CliRepl implements MongoshIOProvider { /** * Require the user to enter a password. */ - async requirePassword(): Promise { + async requirePassword(passwordPrompt = 'Enter password'): Promise { const passwordPromise = askpassword({ input: this.input, output: this.promptOutput, replacementCharacter: '*', }); - this.promptOutput.write('Enter password: '); + this.promptOutput.write(`${passwordPrompt}: `); try { try { return (await passwordPromise).toString(); diff --git a/packages/e2e-tests/test/e2e-tls.spec.ts b/packages/e2e-tests/test/e2e-tls.spec.ts index add6d86b0..1e407eb13 100644 --- a/packages/e2e-tests/test/e2e-tls.spec.ts +++ b/packages/e2e-tests/test/e2e-tls.spec.ts @@ -494,6 +494,41 @@ describe('e2e TLS', function () { expect(logFileContents).not.to.include(CLIENT_CERT_PASSWORD); }); + it('asks for tlsCertificateKeyFilePassword when it is needed (connection string, encrypted)', async function () { + const shell = this.startTestShell({ + args: [ + await connectionStringWithLocalhost(server, { + serverSelectionTimeoutMS: '1500', + authMechanism: 'MONGODB-X509', + tls: 'true', + tlsCAFile: CA_CERT, + tlsCertificateKeyFile: CLIENT_CERT_ENCRYPTED, + }), + ], + env, + }); + + await shell.waitForLine(/Enter TLS key file password:/); + await shell.executeLine(CLIENT_CERT_PASSWORD); + + expect( + await shell.executeLine('db.runCommand({ connectionStatus: 1 })') + ).to.include(`user: '${certUser}'`); + + expect( + await shell.executeLine( + 'db.getSiblingDB("$external").auth({mechanism: "MONGODB-X509"})' + ) + ).to.include('ok: 1'); + expect( + await shell.executeLine('db.runCommand({ connectionStatus: 1 })') + ).to.include(`user: '${certUser}'`); + + const logPath = path.join(logBasePath, `${shell.logId}_log`); + const logFileContents = await fs.readFile(logPath, 'utf8'); + expect(logFileContents).not.to.include(CLIENT_CERT_PASSWORD); + }); + it('fails with invalid cert (args)', async function () { const shell = this.startTestShell({ args: [ diff --git a/packages/e2e-tests/test/test-shell.ts b/packages/e2e-tests/test/test-shell.ts index 66565a1a1..1420b380d 100644 --- a/packages/e2e-tests/test/test-shell.ts +++ b/packages/e2e-tests/test/test-shell.ts @@ -183,6 +183,22 @@ export class TestShell { return this._process; } + async waitForLine(pattern: RegExp, start = 0): Promise { + await eventually(() => { + const output = this._output.slice(start); + const lines = output.split('\n'); + const found = !!lines.filter((l) => pattern.exec(l)); + if (!found) { + throw new assert.AssertionError({ + message: 'expected line', + expected: pattern.toString(), + actual: + this._output.slice(0, start) + '[line search starts here]' + output, + }); + } + }); + } + async waitForPrompt(start = 0): Promise { await eventually(() => { const output = this._output.slice(start); From f38fde6f8ee695e366eced8e70e0136be05ffe23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:15:14 +0000 Subject: [PATCH 07/39] chore: update AUTHORS (#2209) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- packages/cli-repl/AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli-repl/AUTHORS b/packages/cli-repl/AUTHORS index e99923509..b6aae9f29 100644 --- a/packages/cli-repl/AUTHORS +++ b/packages/cli-repl/AUTHORS @@ -22,3 +22,4 @@ Paula Stachova Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika Kræn Hansen +Gagik Amaryan From 4694ab3f92f480714e6f860b8f5a56163d060f7f Mon Sep 17 00:00:00 2001 From: Rhys Date: Thu, 10 Oct 2024 12:34:16 -0400 Subject: [PATCH 08/39] chore(deps): update express for cookie dep version MONGOSH-1883 (#2211) --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 447b651f1..aca6cb6d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16206,9 +16206,9 @@ "optional": true }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -16216,7 +16216,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -45248,9 +45248,9 @@ "optional": true }, "express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", From 19603cfb93a4aa9dbdaaf44fef25b9966a4b5147 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:42:56 +0000 Subject: [PATCH 09/39] chore: update THIRD_PARTY_NOTICES (#2212) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index b5e83bdb7..51bb4f15e 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -249,7 +249,7 @@ Package|Version|License **[execa](#4172423d3420d919e31613f23914ef325af8a3bf9ed3c6110a4053369b1cfddd)**|5.1.1|MIT **[execa](#099ba5f976333854bfd5aa2237fd12d883c4477af76007a7963109833edef012)**|7.2.0|MIT **[expand-template](#46d3e73ca0d4a8c14e99252386f0a5c1a4fd8b2747331373d7b4da97105c15bb)**|2.0.3|(MIT OR WTFPL) -**[express](#8751e219c34fdecbdbc22ade072ef51354f9ff6434904f388f85002299a5a1ec)**|4.21.0|MIT +**[express](#96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2)**|4.21.1|MIT **[fast-xml-parser](#ebbe8cacbca0e6da2c884ade309dddffc2df1cf8f3532ffda03e31aa6d3a9a3b)**|4.4.1|MIT **[fault](#387740fc7544e813d0a9ad480550d0bb536270783b1ce8c1ee83cd7d18b1472e)**|1.0.4|MIT **[fetch-blob](#9a40c73e2482c1cc651991133722a6fedd12dc752d2858a21da24395e6fc8461)**|3.2.0|MIT @@ -23149,8 +23149,8 @@ License files: THE SOFTWARE. - -### [express](https://www.npmjs.com/package/express) (version 4.21.0) + +### [express](https://www.npmjs.com/package/express) (version 4.21.1) License tags: MIT License files: From 3c10b69185f107e118812acd32ecb456e6567dce Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Fri, 11 Oct 2024 09:47:06 +0200 Subject: [PATCH 10/39] fix(i18n): Add missing options parameter for find and findOne MONGOSH-1697 (#2210) db.collection.find.help() or db.collection.findOne.help() will now return the following parameters: query, projection, options. options was missing before. --- packages/i18n/src/locales/en_US.ts | 103 +++++++++++++++++------------ 1 file changed, 61 insertions(+), 42 deletions(-) diff --git a/packages/i18n/src/locales/en_US.ts b/packages/i18n/src/locales/en_US.ts index a30cb23a2..125abb16f 100644 --- a/packages/i18n/src/locales/en_US.ts +++ b/packages/i18n/src/locales/en_US.ts @@ -520,7 +520,7 @@ const translations: Catalog = { find: { link: 'https://docs.mongodb.com/manual/reference/method/db.collection.find', description: 'Selects documents in a collection or view.', - example: 'db.collection.find(query, projection)', + example: 'db.collection.find(query, projection, options)', }, findAndModify: { link: 'https://docs.mongodb.com/manual/reference/method/db.collection.findAndModify', @@ -530,7 +530,7 @@ const translations: Catalog = { findOne: { link: 'https://docs.mongodb.com/manual/reference/method/db.collection.findOne', description: 'Selects documents in a collection or view.', - example: 'db.collection.findOne(query, projection)', + example: 'db.collection.findOne(query, projection, options)', }, findOneAndDelete: { link: 'https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndDelete', @@ -899,122 +899,134 @@ const translations: Catalog = { link: 'https://docs.mongodb.com/manual/reference/method/cursor.addOption', description: 'Adds OP_QUERY wire protocol flags, such as the tailable flag, to change the behavior of queries. Accepts: DBQuery.Option fields tailable, slaveOk, noTimeout, awaitData, exhaust, partial.', - example: 'db.collection.find(query, projection).addOption(flag)', + example: + 'db.collection.find(query, projection, options).addOption(flag)', }, allowPartialResults: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.allowPartialResults', description: "Sets the 'partial' option to true.", example: - 'db.collection.find(query, projection).allowPartialResults()', + 'db.collection.find(query, projection, options).allowPartialResults()', }, allowDiskUse: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.allowDiskUse', description: "Sets the 'allowDiskUse' option. If no argument is passed, the default is true.", example: - 'db.collection.find(query, projection).sort(sort).allowDiskUse(false)', + 'db.collection.find(query, projection, options).sort(sort).allowDiskUse(false)', }, batchSize: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.batchSize', description: 'Specifies the number of documents to return in each batch of the response from the MongoDB instance. In most cases, modifying the batch size will not affect the user or the application, as the mongo shell and most drivers return results as if MongoDB returned a single batch.', - example: 'db.collection.find(query, projection).batchSize(10)', + example: + 'db.collection.find(query, projection, options).batchSize(10)', }, close: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.close', description: 'Instructs the server to close a cursor and free associated server resources. The server will automatically close cursors that have no remaining results, as well as cursors that have been idle for a period of time and lack the cursor.noCursorTimeout() option.', - example: 'db.collection.find(query, projection).close()', + example: 'db.collection.find(query, projection, options).close()', }, collation: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.collation', description: 'Specifies the collation for the cursor returned by the db.collection.find(). To use, append to the db.collection.find().', example: - 'db.collection.find(query, projection).collation(collationDocument)', + 'db.collection.find(query, projection, options).collation(collationDocument)', }, comment: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.comment', description: 'Adds a comment field to the query.', example: - "db.collection.find(query, projection).comment('Comment')", + "db.collection.find(query, projection, options).comment('Comment')", }, count: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.count', description: 'Counts the number of documents referenced by a cursor.', - example: 'db.collection.find(query, projection).count()', + example: 'db.collection.find(query, projection, options).count()', }, explain: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.explain', description: 'Provides information on the query plan for the db.collection.find() method.', - example: 'db.collection.find(query, projection).explain()', + example: + 'db.collection.find(query, projection, options).explain()', }, forEach: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.forEach', description: 'Iterates the cursor to apply a JavaScript function to each document from the cursor.', example: - 'db.collection.find(query, projection).forEach(function)', + 'db.collection.find(query, projection, options).forEach(function)', }, getQueryPlan: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.explain', description: 'Runs cursor.explain()', - example: 'db.collection.find(query, projection).getQueryPlan()', + example: + 'db.collection.find(query, projection, options).getQueryPlan()', }, hasNext: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.hasNext', description: "cursor.hasNext() returns true if the cursor returned by the db.collection.find() query can iterate further to return more documents. NOTE: if the cursor is tailable with awaitData then hasNext will block until a document is returned. To check if a document is in the cursor's batch without waiting, use tryNext instead", - example: 'db.collection.find(query, projection).hasNext()', + example: + 'db.collection.find(query, projection, options).hasNext()', }, hint: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.hint', description: 'Call this method on a query to override MongoDB’s default index selection and query optimization process. Use db.collection.getIndexes() to return the list of current indexes on a collection.', - example: 'db.collection.find(query, projection).hint(index)', + example: + 'db.collection.find(query, projection, options).hint(index)', }, isClosed: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.isClosed', description: 'Returns true if the cursor is closed.', - example: 'db.collection.find(query, projection).isClosed()', + example: + 'db.collection.find(query, projection, options).isClosed()', }, isExhausted: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.isExhausted', description: 'cursor.isExhausted() returns true if the cursor is closed and there are no remaining objects in the batch.', - example: 'db.collection.find(query, projection).isExhausted()', + example: + 'db.collection.find(query, projection, options).isExhausted()', }, itcount: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.itcount', description: 'Counts the number of documents remaining in a cursor. itcount() is similar to cursor.count(), but actually executes the query on an existing iterator, exhausting its contents in the process.', - example: 'db.collection.find(query, projection).itcount()', + example: + 'db.collection.find(query, projection, options).itcount()', }, length: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.count', description: 'Runs cursor.count()', - example: 'db.collection.find(query, projection).length()', + example: + 'db.collection.find(query, projection, options).length()', }, limit: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.limit', description: 'Use the limit() method on a cursor to specify the maximum number of documents the cursor will return.', - example: 'db.collection.find(query, projection).limit(2)', + example: + 'db.collection.find(query, projection, options).limit(2)', }, map: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.map', description: 'Applies the first argument, a function, to each document visited by the cursor and collects the return values from successive application into an array.', - example: 'db.collection.find(query, projection).map(function)', + example: + 'db.collection.find(query, projection, options).map(function)', }, max: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.max', description: 'Specifies the exclusive upper bound for a specific index in order to constrain the results of find(). max() provides a way to specify an upper bound on compound key indexes.', example: - 'db.collection.find(query, projection).max(indexBoundsDocument)', + 'db.collection.find(query, projection, options).max(indexBoundsDocument)', }, maxScan: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.maxScan', @@ -1025,31 +1037,32 @@ const translations: Catalog = { description: 'Specifies a cumulative time limit in milliseconds for processing operations on a cursor.', example: - 'db.collection.find(query, projection).maxTimeMS(timeLimit)', + 'db.collection.find(query, projection, options).maxTimeMS(timeLimit)', }, maxAwaitTimeMS: { description: 'Set a maxAwaitTimeMS on a tailing cursor query to allow to customize the timeout value for the option awaitData (Only supported on MongoDB 3.2 or higher, ignored otherwise)', example: - 'db.collection.find(query, projection).maxAwaitTimeMS(timeLimit)', + 'db.collection.find(query, projection, options).maxAwaitTimeMS(timeLimit)', }, min: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.min', description: 'Specifies the inclusive lower bound for a specific index in order to constrain the results of find(). min() provides a way to specify lower bounds on compound key indexes.', example: - 'db.collection.find(query, projection).min(indexBoundsDocument)', + 'db.collection.find(query, projection, options).min(indexBoundsDocument)', }, modifiers: { link: '', description: 'Get query modifiers.', - example: 'db.collection.find(query, projection).modifiers()', + example: + 'db.collection.find(query, projection, options).modifiers()', }, next: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.next', description: "The next document in the cursor returned by the db.collection.find() method. NOTE: if the cursor is tailable with awaitData then hasNext will block until a document is returned. To check if a document is in the cursor's batch without waiting, use tryNext instead", - example: 'db.collection.find(query, projection).next()', + example: 'db.collection.find(query, projection, options).next()', }, tryNext: { description: @@ -1060,25 +1073,26 @@ const translations: Catalog = { description: 'Instructs the server to avoid closing a cursor automatically after a period of inactivity.', example: - 'db.collection.find(query, projection).noCursorTimeout()', + 'db.collection.find(query, projection, options).noCursorTimeout()', }, objsLeftInBatch: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.objsLeftInBatch', description: 'cursor.objsLeftInBatch() returns the number of documents remaining in the current batch.', example: - 'db.collection.find(query, projection).objsLeftInBatch()', + 'db.collection.find(query, projection, options).objsLeftInBatch()', }, oplogReplay: { link: '', description: 'Sets oplogReplay cursor flag to true.', - example: 'db.collection.find(query, projection).oplogReplay()', + example: + 'db.collection.find(query, projection, options).oplogReplay()', }, projection: { link: '', description: 'Sets a field projection for the query.', example: - 'db.collection.find(query, projection).projection(field)', + 'db.collection.find(query, projection, options).projection(field)', }, // don't document since everything is currently pretty printed pretty: { @@ -1090,7 +1104,7 @@ const translations: Catalog = { description: 'Specify a read concern for the db.collection.find() method.', example: - 'db.collection.find(query, projection).readConcern(level)', + 'db.collection.find(query, projection, options).readConcern(level)', }, readonly: { link: '', @@ -1102,63 +1116,68 @@ const translations: Catalog = { description: 'Append readPref() to a cursor to control how the client routes the query to members of the replica set.', example: - 'db.collection.find(query, projection).readPref(mode, tagSet)', + 'db.collection.find(query, projection, options).readPref(mode, tagSet)', }, returnKey: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.returnKey', description: 'Modifies the cursor to return index keys rather than the documents.', - example: 'db.collection.find(query, projection).returnKey()', + example: + 'db.collection.find(query, projection, options).returnKey()', }, showDiskLoc: { link: '', description: 'The $showDiskLoc option has now been deprecated and replaced with the showRecordId field. $showDiskLoc will still be accepted for OP_QUERY style find.', - example: 'db.collection.find(query, projection).showDiskLoc()', + example: + 'db.collection.find(query, projection, options).showDiskLoc()', }, showRecordId: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.showRecordId', description: 'Modifies the output of a query by adding a field $recordId to matching documents. $recordId is the internal key which uniquely identifies a document in a collection.', - example: 'db.collection.find(query, projection).showRecordId', + example: + 'db.collection.find(query, projection, options).showRecordId', }, size: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.size', description: 'A count of the number of documents that match the db.collection.find() query after applying any cursor.skip() and cursor.limit() methods.', - example: 'db.collection.find(query, projection).size()', + example: 'db.collection.find(query, projection, options).size()', }, skip: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.skip', description: 'Call the cursor.skip() method on a cursor to control where MongoDB begins returning results. This approach may be useful in implementing paginated results.', example: - 'db.collection.find(query, projection).skip(offsetNumber)', + 'db.collection.find(query, projection, options).skip(offsetNumber)', }, snapshot: { link: '', description: 'The $snapshot operator prevents the cursor from returning a document more than once because an intervening write operation results in a move of the document', - example: 'db.collection.find(query, projection).snapshot()', + example: + 'db.collection.find(query, projection, options).snapshot()', }, sort: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.sort', description: 'Specifies the order in which the query returns matching documents. You must apply sort() to the cursor before retrieving any documents from the database.', example: - 'db.collection.find(query, projection).sort(sortDocument)', + 'db.collection.find(query, projection, options).sort(sortDocument)', }, tailable: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.tailable', description: 'Marks the cursor as tailable.', example: - 'db.collection.find(query, projection).tailable({ awaitData: true })', + 'db.collection.find(query, projection, options).tailable({ awaitData: true })', }, toArray: { link: 'https://docs.mongodb.com/manual/reference/method/cursor.toArray', description: 'The toArray() method returns an array that contains all the documents from a cursor. The method iterates completely the cursor, loading all the documents into RAM and exhausting the cursor.', - example: 'db.collection.find(query, projection).toArray()', + example: + 'db.collection.find(query, projection, options).toArray()', }, }, }, From 249fd54e698596ff2d8490f13ea65c5a1f9af902 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:55:34 +0000 Subject: [PATCH 11/39] chore: update auto-generated files (#2213) * chore: update THIRD_PARTY_NOTICES * chore: update AUTHORS --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- packages/i18n/AUTHORS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 51bb4f15e..1a93ed007 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Thu Oct 10 2024. +This document was automatically generated on Fri Oct 11 2024. ## List of dependencies diff --git a/packages/i18n/AUTHORS b/packages/i18n/AUTHORS index 51d4a5ef8..8ff435d30 100644 --- a/packages/i18n/AUTHORS +++ b/packages/i18n/AUTHORS @@ -19,3 +19,4 @@ Hao Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika Paula Stachova +Gagik Amaryan From f238af98467ba9833d5826ceeae9214e9df631fb Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Fri, 11 Oct 2024 16:54:14 +0200 Subject: [PATCH 12/39] fix(i18n): Fix incorrect createView.help MONGOSH-1867 (#2215) db.createView.help() was returning createCollection instead of createView --- packages/i18n/src/locales/en_US.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/i18n/src/locales/en_US.ts b/packages/i18n/src/locales/en_US.ts index 125abb16f..0da1ae248 100644 --- a/packages/i18n/src/locales/en_US.ts +++ b/packages/i18n/src/locales/en_US.ts @@ -1271,7 +1271,7 @@ const translations: Catalog = { createView: { link: 'https://docs.mongodb.com/manual/reference/method/db.createView/', description: 'Create new view', - example: "db.createCollection('viewName', 'source', [])", + example: "db.createView('viewName', 'source', [])", }, createUser: { link: 'https://docs.mongodb.com/manual/reference/method/db.createUser', From facadf8e5814121f1fffe7819a90098a5821d5d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 13 Oct 2024 03:19:57 +0000 Subject: [PATCH 13/39] chore: update THIRD_PARTY_NOTICES (#2216) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 1a93ed007..28b43d7a1 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Fri Oct 11 2024. +This document was automatically generated on Sun Oct 13 2024. ## List of dependencies From 9f3ebe01c3c020516b380c066cea91bb6e8c4102 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Tue, 15 Oct 2024 14:05:00 +0200 Subject: [PATCH 14/39] fix(cli-repl): Fix depcheck with a more permissive workaround for the searchParams type (#2219) --- packages/cli-repl/src/cli-repl.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index db97e18de..18479f05f 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -1017,12 +1017,11 @@ export class CliRepl implements MongoshIOProvider { } async isTlsKeyFilePasswordMissingURI( - searchParams: ReturnType< - typeof ConnectionString.prototype.typedSearchParams - > + searchParams: unknown ): Promise { - const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile'); - const tlsCertificateKeyFilePassword = searchParams.get( + const searchMap = searchParams as Map; + const tlsCertificateKeyFile = searchMap.get('tlsCertificateKeyFile'); + const tlsCertificateKeyFilePassword = searchMap.get( 'tlsCertificateKeyFilePassword' ); From 4eccc326123e05c8a1f330eaab72b7eea37ecce5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:13:31 +0000 Subject: [PATCH 15/39] chore: update THIRD_PARTY_NOTICES (#2220) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 28b43d7a1..2a7e056db 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Sun Oct 13 2024. +This document was automatically generated on Tue Oct 15 2024. ## List of dependencies From 9d29def497e1915e1db1cf461fa0881711300e75 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 16 Oct 2024 14:57:52 +0100 Subject: [PATCH 16/39] add a smoke test for require in non-repl mode (#2217) --- packages/cli-repl/src/smoke-tests.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/cli-repl/src/smoke-tests.ts b/packages/cli-repl/src/smoke-tests.ts index 22fe82155..559f7f0dc 100644 --- a/packages/cli-repl/src/smoke-tests.ts +++ b/packages/cli-repl/src/smoke-tests.ts @@ -150,6 +150,15 @@ export async function runSmokeTests({ perfTestIterations: 20, tags: ['startup'], }, + { + name: 'eval_nodb_require', + input: '', + output: /foobar/, + includeStderr: false, + testArgs: ['--nodb', '--eval', 'require("util").format("%sbar", "foo")'], + exitCode: 0, + perfTestIterations: 0, + }, { name: 'mongosh_version', input: '', From 778c58943c73ab6f1fee4a14d617c3a831e2831d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:06:41 +0000 Subject: [PATCH 17/39] chore: update THIRD_PARTY_NOTICES (#2223) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 2a7e056db..151ddd9c4 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Tue Oct 15 2024. +This document was automatically generated on Wed Oct 16 2024. ## List of dependencies From d71dd9180050426967970730f1cf91c65291f797 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Thu, 17 Oct 2024 10:13:19 +0200 Subject: [PATCH 18/39] chore(deps): Bump depcheck to 1.4.7 and @babel/parser to 7.25.8 (#2222) There have been various errors in CI check task related to TypeScript features that depcheck's parser didn't support; the newer version updates this. --- package-lock.json | 1095 +++++++++-------- package.json | 3 +- packages/arg-parser/package.json | 2 +- packages/async-rewriter2/package.json | 2 +- packages/autocomplete/package.json | 2 +- packages/browser-repl/package.json | 2 +- packages/browser-runtime-core/package.json | 2 +- .../browser-runtime-electron/package.json | 2 +- packages/build/package.json | 2 +- packages/cli-repl/package.json | 2 +- packages/e2e-tests/package.json | 2 +- packages/editor/package.json | 2 +- packages/errors/package.json | 2 +- packages/history/package.json | 2 +- packages/i18n/package.json | 2 +- .../js-multiline-to-singleline/package.json | 2 +- packages/logging/package.json | 2 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 2 +- packages/service-provider-server/package.json | 2 +- packages/shell-api/package.json | 2 +- packages/shell-evaluator/package.json | 2 +- packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- 24 files changed, 609 insertions(+), 533 deletions(-) diff --git a/package-lock.json b/package-lock.json index aca6cb6d5..a34dd609f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,7 @@ "@types/which": "^1.3.2", "chai": "^4.2.0", "cross-env": "^6.0.3", + "depcheck": "^1.4.7", "duplexpair": "^1.0.2", "find-up": "^5.0.0", "glob": "^10.3.12", @@ -1067,17 +1068,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/core/node_modules/convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -1393,17 +1383,19 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -1521,10 +1513,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", - "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==", - "dev": true, + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", + "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.8" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -2828,17 +2823,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/template/node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/traverse": { "version": "7.23.2", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", @@ -2859,24 +2843,14 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", + "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -3635,9 +3609,10 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", @@ -10247,18 +10222,6 @@ "@types/babel__traverse": "*" } }, - "node_modules/@types/babel__core/node_modules/@babel/parser": { - "version": "7.21.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz", - "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@types/babel__generator": { "version": "7.6.4", "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", @@ -10988,91 +10951,65 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz", - "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz", + "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/shared": "3.2.31", + "@babel/parser": "^7.25.3", + "@vue/shared": "3.5.12", + "entities": "^4.5.0", "estree-walker": "^2.0.2", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-core/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz", - "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz", + "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==", "dev": true, + "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31" + "@vue/compiler-core": "3.5.12", + "@vue/shared": "3.5.12" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz", - "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz", + "integrity": "sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/compiler-dom": "3.2.31", - "@vue/compiler-ssr": "3.2.31", - "@vue/reactivity-transform": "3.2.31", - "@vue/shared": "3.2.31", + "@babel/parser": "^7.25.3", + "@vue/compiler-core": "3.5.12", + "@vue/compiler-dom": "3.5.12", + "@vue/compiler-ssr": "3.5.12", + "@vue/shared": "3.5.12", "estree-walker": "^2.0.2", - "magic-string": "^0.25.7", - "postcss": "^8.1.10", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "magic-string": "^0.30.11", + "postcss": "^8.4.47", + "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz", - "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==", - "dev": true, - "dependencies": { - "@vue/compiler-dom": "3.2.31", - "@vue/shared": "3.2.31" - } - }, - "node_modules/@vue/reactivity-transform": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz", - "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz", + "integrity": "sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31", - "estree-walker": "^2.0.2", - "magic-string": "^0.25.7" + "@vue/compiler-dom": "3.5.12", + "@vue/shared": "3.5.12" } }, "node_modules/@vue/shared": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz", - "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==", - "dev": true + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz", + "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/ast": { "version": "1.12.1", @@ -12965,6 +12902,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -13879,10 +13825,11 @@ } }, "node_modules/cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "devOptional": true, + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -14658,34 +14605,35 @@ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" }, "node_modules/depcheck": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-1.4.3.tgz", - "integrity": "sha512-vy8xe1tlLFu7t4jFyoirMmOR7x7N601ubU9Gkifyr9z8rjBFtEdWHDBMqXyk6OkK+94NXutzddVXJuo0JlUQKQ==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-1.4.7.tgz", + "integrity": "sha512-1lklS/bV5chOxwNKA/2XUUk/hPORp8zihZsXflr8x0kLwmcZ9Y9BsS6Hs3ssvA+2wUVbG0U2Ciqvm1SokNjPkA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "7.16.4", - "@babel/traverse": "^7.12.5", - "@vue/compiler-sfc": "^3.0.5", - "camelcase": "^6.2.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.2.0", - "deps-regex": "^0.1.4", - "ignore": "^5.1.8", - "is-core-module": "^2.4.0", - "js-yaml": "^3.14.0", - "json5": "^2.1.3", - "lodash": "^4.17.20", - "minimatch": "^3.0.4", + "@babel/parser": "^7.23.0", + "@babel/traverse": "^7.23.2", + "@vue/compiler-sfc": "^3.3.4", + "callsite": "^1.0.0", + "camelcase": "^6.3.0", + "cosmiconfig": "^7.1.0", + "debug": "^4.3.4", + "deps-regex": "^0.2.0", + "findup-sync": "^5.0.0", + "ignore": "^5.2.4", + "is-core-module": "^2.12.0", + "js-yaml": "^3.14.1", + "json5": "^2.2.3", + "lodash": "^4.17.21", + "minimatch": "^7.4.6", "multimatch": "^5.0.0", "please-upgrade-node": "^3.2.0", - "query-ast": "^1.0.3", - "readdirp": "^3.5.0", + "readdirp": "^3.6.0", "require-package-name": "^2.0.1", - "resolve": "^1.18.1", - "sass": "^1.29.0", - "scss-parser": "^1.0.4", - "semver": "^7.3.2", - "yargs": "^16.1.0" + "resolve": "^1.22.3", + "resolve-from": "^5.0.0", + "semver": "^7.5.4", + "yargs": "^16.2.0" }, "bin": { "depcheck": "bin/depcheck.js" @@ -14694,6 +14642,42 @@ "node": ">=10" } }, + "node_modules/depcheck/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/depcheck/node_modules/minimatch": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", + "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/depcheck/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -14708,10 +14692,11 @@ "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" }, "node_modules/deps-regex": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.1.4.tgz", - "integrity": "sha1-UYZnt2kUYKXn4KNBvnbrfOgJAYQ=", - "dev": true + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.2.0.tgz", + "integrity": "sha512-PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q==", + "dev": true, + "license": "MIT" }, "node_modules/dequal": { "version": "2.0.3", @@ -14740,6 +14725,16 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/detect-indent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", @@ -15405,10 +15400,11 @@ "dev": true }, "node_modules/entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -16094,7 +16090,8 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/esutils": { "version": "2.0.3", @@ -16199,6 +16196,19 @@ "node": ">=6" } }, + "node_modules/expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", @@ -16768,6 +16778,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/findup-sync": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 10.13.0" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -17471,6 +17497,51 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "license": "MIT", + "dependencies": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -17957,6 +18028,19 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "node_modules/homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse-passwd": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -18375,9 +18459,10 @@ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -18391,12 +18476,6 @@ "minimatch": "^3.0.4" } }, - "node_modules/immutable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", - "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", - "dev": true - }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -18584,15 +18663,6 @@ "node": ">=4" } }, - "node_modules/invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", @@ -18726,11 +18796,15 @@ } }, "node_modules/is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -21707,12 +21781,13 @@ } }, "node_modules/magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "version": "0.30.12", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz", + "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==", "dev": true, + "license": "MIT", "dependencies": { - "sourcemap-codec": "^1.4.8" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "node_modules/make-dir": { @@ -25056,6 +25131,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/parse-path": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz", @@ -25244,9 +25329,10 @@ "dev": true }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", @@ -25439,9 +25525,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "dev": true, "funding": [ { @@ -25457,10 +25543,11 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -25480,9 +25567,9 @@ } }, "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -25490,6 +25577,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -25948,15 +26036,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/query-ast": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/query-ast/-/query-ast-1.0.4.tgz", - "integrity": "sha512-KFJFSvODCBjIH5HbHvITj9EEZKYUU6VX0T5CuB1ayvjUoUaZkKMi6eeby5Tf8DMukyZHlJQOE1+f3vevKUe6eg==", - "dev": true, - "dependencies": { - "invariant": "2.2.4" - } - }, "node_modules/querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -26845,11 +26924,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "license": "MIT", "dependencies": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -26886,6 +26966,20 @@ "node": ">=8" } }, + "node_modules/resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -27109,23 +27203,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "node_modules/sass": { - "version": "1.49.10", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.10.tgz", - "integrity": "sha512-w37zfWJwKu4I78U4z63u1mmgoncq+v3iOB4yzQMPyAPVHHawaQSnu9C9ysGQnZEhW609jkcLioJcMCqm75JMdg==", - "dev": true, - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/sax": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", @@ -27159,18 +27236,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/scss-parser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/scss-parser/-/scss-parser-1.0.5.tgz", - "integrity": "sha512-RZOtvCmCnwkDo7kdcYBi807Y5EoTIxJ34AgEgJNDmOH1jl0/xG0FyYZFbH6Ga3Iwu7q8LSdxJ4C5UkzNXjQxKQ==", - "dev": true, - "dependencies": { - "invariant": "2.2.4" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/seek-bzip": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", @@ -27920,10 +27985,11 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -27947,12 +28013,6 @@ "node": ">=0.10.0" } }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true - }, "node_modules/sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -30849,7 +30909,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8" @@ -30877,7 +30937,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.20.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -30898,7 +30958,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", "prettier": "^2.8.8" @@ -30941,7 +31001,7 @@ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "babel-loader": "^8.3.0", "buffer": "^6.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "enzyme": "^3.11.0", "eslint": "^7.25.0", "html-webpack-plugin": "^5.5.0", @@ -31074,7 +31134,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -31099,7 +31159,7 @@ "@mongosh/service-provider-server": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -31153,7 +31213,7 @@ "@types/tar-fs": "^2.0.0", "@types/tmp": "^0.2.3", "cross-spawn": "^7.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "sinon-chai": "^3.5.0", @@ -31224,7 +31284,7 @@ "@types/text-table": "^0.2.1", "@types/yargs-parser": "^15.0.0", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "mongodb-crypt-library-dummy": "^1.0.2", @@ -31285,7 +31345,7 @@ "@types/rimraf": "^3.0.0", "bson": "^6.8.0", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", @@ -31341,7 +31401,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", "prettier": "^2.8.8" @@ -31359,7 +31419,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "chalk": "^4.1.2", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "handlebars": "^4.7.7", "prettier": "^2.8.8", @@ -31381,7 +31441,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", "prettier": "^2.8.8" @@ -31401,7 +31461,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31555,7 +31615,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.1.18", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31579,7 +31639,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31619,7 +31679,7 @@ "@mongosh/service-provider-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", "postmsg-rpc": "^2.4.0", @@ -31646,7 +31706,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31677,7 +31737,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31707,7 +31767,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8", @@ -31732,7 +31792,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, @@ -31761,7 +31821,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/cross-spawn": "^6.0.2", "@types/tar": "^4.0.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", "prettier": "^2.8.8" @@ -31781,7 +31841,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8" @@ -32664,11 +32724,6 @@ "json5": "^2.2.2" }, "dependencies": { - "@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==" - }, "convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -32905,14 +32960,14 @@ } }, "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==" }, "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==" }, "@babel/helper-validator-option": { "version": "7.22.5", @@ -33002,10 +33057,12 @@ } }, "@babel/parser": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", - "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==", - "dev": true + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", + "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", + "requires": { + "@babel/types": "^7.25.8" + } }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.22.5", @@ -33843,13 +33900,6 @@ "@babel/code-frame": "^7.22.13", "@babel/parser": "^7.22.15", "@babel/types": "^7.22.15" - }, - "dependencies": { - "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" - } } }, "@babel/traverse": { @@ -33867,22 +33917,15 @@ "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" - }, - "dependencies": { - "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" - } } }, "@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", + "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" } }, @@ -34516,9 +34559,9 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" }, "@jridgewell/trace-mapping": { "version": "0.3.25", @@ -37013,7 +37056,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/errors": "0.0.0-dev.0", "@mongosh/i18n": "0.0.0-dev.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "mongodb-connection-string-url": "^3.0.1", @@ -37032,7 +37075,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.20.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } @@ -37045,7 +37088,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/shell-api": "0.0.0-dev.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", "prettier": "^2.8.8", @@ -37080,7 +37123,7 @@ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "babel-loader": "^8.3.0", "buffer": "^6.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "enzyme": "^3.11.0", "eslint": "^7.25.0", "html-webpack-plugin": "^5.5.0", @@ -37172,7 +37215,7 @@ "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -37190,7 +37233,7 @@ "@mongosh/types": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -37229,7 +37272,7 @@ "boxednode": "^2.4.3", "command-exists": "^1.2.9", "cross-spawn": "^7.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "download": "^8.0.0", "es-aggregate-error": "^1.0.9", "eslint": "^7.25.0", @@ -37288,7 +37331,7 @@ "askcharacter": "^2.0.4", "askpassword": "^2.0.2", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "escape-string-regexp": "^4.0.0", "eslint": "^7.25.0", "get-console-process-list": "^1.0.5", @@ -37353,7 +37396,7 @@ "@types/rimraf": "^3.0.0", "bson": "^6.8.0", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", @@ -37394,7 +37437,7 @@ "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "js-beautify": "^1.15.1", "nanobus": "^4.5.0", @@ -37408,7 +37451,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "chalk": "^4.1.2", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "handlebars": "^4.7.7", "prettier": "^2.8.8", @@ -37421,7 +37464,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^1.1.2", @@ -37435,7 +37478,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/errors": "0.0.0-dev.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } @@ -37510,7 +37553,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.1.18", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } @@ -37525,7 +37568,7 @@ "@mongosh/errors": "0.0.0-dev.0", "@mongosh/history": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2", @@ -37544,7 +37587,7 @@ "@mongosh/service-provider-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "interruptor": "^1.0.1", "mocha": "^10.2.0", @@ -37564,7 +37607,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/errors": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "mongodb-build-info": "^1.7.2", @@ -37586,7 +37629,7 @@ "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", "aws4": "^1.12.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "kerberos": "2.1.0", "mongodb": "^6.9.0", @@ -37609,7 +37652,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "mongodb-redact": "^1.1.2", @@ -37628,7 +37671,7 @@ "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } @@ -37647,7 +37690,7 @@ "@types/tar": "^4.0.4", "bson": "^6.8.0", "cross-spawn": "^7.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "escape-string-regexp": "^4.0.0", "eslint": "^7.25.0", "joi": "^17.4.0", @@ -37663,7 +37706,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8" @@ -40547,14 +40590,6 @@ "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" - }, - "dependencies": { - "@babel/parser": { - "version": "7.21.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz", - "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==", - "dev": true - } } }, "@types/babel__generator": { @@ -41195,88 +41230,59 @@ } }, "@vue/compiler-core": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz", - "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz", + "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==", "dev": true, "requires": { - "@babel/parser": "^7.16.4", - "@vue/shared": "3.2.31", + "@babel/parser": "^7.25.3", + "@vue/shared": "3.5.12", + "entities": "^4.5.0", "estree-walker": "^2.0.2", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "source-map-js": "^1.2.0" } }, "@vue/compiler-dom": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz", - "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz", + "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==", "dev": true, "requires": { - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31" + "@vue/compiler-core": "3.5.12", + "@vue/shared": "3.5.12" } }, "@vue/compiler-sfc": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz", - "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz", + "integrity": "sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==", "dev": true, "requires": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/compiler-dom": "3.2.31", - "@vue/compiler-ssr": "3.2.31", - "@vue/reactivity-transform": "3.2.31", - "@vue/shared": "3.2.31", + "@babel/parser": "^7.25.3", + "@vue/compiler-core": "3.5.12", + "@vue/compiler-dom": "3.5.12", + "@vue/compiler-ssr": "3.5.12", + "@vue/shared": "3.5.12", "estree-walker": "^2.0.2", - "magic-string": "^0.25.7", - "postcss": "^8.1.10", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "magic-string": "^0.30.11", + "postcss": "^8.4.47", + "source-map-js": "^1.2.0" } }, "@vue/compiler-ssr": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz", - "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz", + "integrity": "sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==", "dev": true, "requires": { - "@vue/compiler-dom": "3.2.31", - "@vue/shared": "3.2.31" - } - }, - "@vue/reactivity-transform": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz", - "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==", - "dev": true, - "requires": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31", - "estree-walker": "^2.0.2", - "magic-string": "^0.25.7" + "@vue/compiler-dom": "3.5.12", + "@vue/shared": "3.5.12" } }, "@vue/shared": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz", - "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz", + "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==", "dev": true }, "@webassemblyjs/ast": { @@ -42781,6 +42787,12 @@ "set-function-length": "^1.2.1" } }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==", + "dev": true + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -43498,9 +43510,9 @@ } }, "cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "devOptional": true, "requires": { "@types/parse-json": "^4.0.0", @@ -44069,34 +44081,60 @@ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" }, "depcheck": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-1.4.3.tgz", - "integrity": "sha512-vy8xe1tlLFu7t4jFyoirMmOR7x7N601ubU9Gkifyr9z8rjBFtEdWHDBMqXyk6OkK+94NXutzddVXJuo0JlUQKQ==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-1.4.7.tgz", + "integrity": "sha512-1lklS/bV5chOxwNKA/2XUUk/hPORp8zihZsXflr8x0kLwmcZ9Y9BsS6Hs3ssvA+2wUVbG0U2Ciqvm1SokNjPkA==", "dev": true, "requires": { - "@babel/parser": "7.16.4", - "@babel/traverse": "^7.12.5", - "@vue/compiler-sfc": "^3.0.5", - "camelcase": "^6.2.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.2.0", - "deps-regex": "^0.1.4", - "ignore": "^5.1.8", - "is-core-module": "^2.4.0", - "js-yaml": "^3.14.0", - "json5": "^2.1.3", - "lodash": "^4.17.20", - "minimatch": "^3.0.4", + "@babel/parser": "^7.23.0", + "@babel/traverse": "^7.23.2", + "@vue/compiler-sfc": "^3.3.4", + "callsite": "^1.0.0", + "camelcase": "^6.3.0", + "cosmiconfig": "^7.1.0", + "debug": "^4.3.4", + "deps-regex": "^0.2.0", + "findup-sync": "^5.0.0", + "ignore": "^5.2.4", + "is-core-module": "^2.12.0", + "js-yaml": "^3.14.1", + "json5": "^2.2.3", + "lodash": "^4.17.21", + "minimatch": "^7.4.6", "multimatch": "^5.0.0", "please-upgrade-node": "^3.2.0", - "query-ast": "^1.0.3", - "readdirp": "^3.5.0", + "readdirp": "^3.6.0", "require-package-name": "^2.0.1", - "resolve": "^1.18.1", - "sass": "^1.29.0", - "scss-parser": "^1.0.4", - "semver": "^7.3.2", - "yargs": "^16.1.0" + "resolve": "^1.22.3", + "resolve-from": "^5.0.0", + "semver": "^7.5.4", + "yargs": "^16.2.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", + "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } } }, "depd": { @@ -44110,9 +44148,9 @@ "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" }, "deps-regex": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.1.4.tgz", - "integrity": "sha1-UYZnt2kUYKXn4KNBvnbrfOgJAYQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.2.0.tgz", + "integrity": "sha512-PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q==", "dev": true }, "dequal": { @@ -44135,6 +44173,12 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", + "dev": true + }, "detect-indent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", @@ -44655,9 +44699,9 @@ "dev": true }, "entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true }, "env-paths": { @@ -45241,6 +45285,15 @@ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "optional": true }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", + "dev": true, + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, "exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", @@ -45679,6 +45732,18 @@ "path-exists": "^4.0.0" } }, + "findup-sync": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", + "dev": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" + } + }, "flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -46191,6 +46256,41 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", + "dev": true, + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + }, + "dependencies": { + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -46558,6 +46658,15 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "dev": true, + "requires": { + "parse-passwd": "^1.0.0" + } + }, "hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -46884,9 +46993,9 @@ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==" }, "ignore-walk": { "version": "3.0.4", @@ -46897,12 +47006,6 @@ "minimatch": "^3.0.4" } }, - "immutable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", - "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", - "dev": true - }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -47049,15 +47152,6 @@ "p-is-promise": "^1.1.0" } }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, "ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", @@ -47157,11 +47251,11 @@ } }, "is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "requires": { - "has": "^1.0.3" + "hasown": "^2.0.2" } }, "is-date-object": { @@ -49426,12 +49520,12 @@ "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==" }, "magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "version": "0.30.12", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz", + "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==", "dev": true, "requires": { - "sourcemap-codec": "^1.4.8" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "make-dir": { @@ -51986,6 +52080,12 @@ "lines-and-columns": "^1.1.6" } }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", + "dev": true + }, "parse-path": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz", @@ -52141,9 +52241,9 @@ "dev": true }, "picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==" }, "picomatch": { "version": "2.3.1", @@ -52283,20 +52383,20 @@ } }, "postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "dev": true, "requires": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "dependencies": { "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true } } @@ -52656,15 +52756,6 @@ "side-channel": "^1.0.6" } }, - "query-ast": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/query-ast/-/query-ast-1.0.4.tgz", - "integrity": "sha512-KFJFSvODCBjIH5HbHvITj9EEZKYUU6VX0T5CuB1ayvjUoUaZkKMi6eeby5Tf8DMukyZHlJQOE1+f3vevKUe6eg==", - "dev": true, - "requires": { - "invariant": "2.2.4" - } - }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -53363,11 +53454,11 @@ "dev": true }, "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "requires": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -53394,6 +53485,16 @@ } } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", + "dev": true, + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -53550,17 +53651,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sass": { - "version": "1.49.10", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.10.tgz", - "integrity": "sha512-w37zfWJwKu4I78U4z63u1mmgoncq+v3iOB4yzQMPyAPVHHawaQSnu9C9ysGQnZEhW609jkcLioJcMCqm75JMdg==", - "dev": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, "sax": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", @@ -53587,15 +53677,6 @@ "ajv-keywords": "^3.5.2" } }, - "scss-parser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/scss-parser/-/scss-parser-1.0.5.tgz", - "integrity": "sha512-RZOtvCmCnwkDo7kdcYBi807Y5EoTIxJ34AgEgJNDmOH1jl0/xG0FyYZFbH6Ga3Iwu7q8LSdxJ4C5UkzNXjQxKQ==", - "dev": true, - "requires": { - "invariant": "2.2.4" - } - }, "seek-bzip": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", @@ -54179,9 +54260,9 @@ "dev": true }, "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true }, "source-map-support": { @@ -54202,12 +54283,6 @@ } } }, - "sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true - }, "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", diff --git a/package.json b/package.json index 62376ce31..1b9716b8c 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,8 @@ "webpack-bundle-analyzer": "^4.7.0", "webpack-cli": "^4.3.1", "which": "^2.0.2", - "yaml": "^1.10.0" + "yaml": "^1.10.0", + "depcheck": "^1.4.7" }, "optionalDependencies": { "lerna": "^8.1.8" diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index 81d1762e6..f17d7a9c3 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -44,7 +44,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8" diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index 1edaa3562..708a4f1b7 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -51,7 +51,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.20.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index 5a8a3e876..bf8a8ec88 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -37,7 +37,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", "prettier": "^2.8.8" diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 6473f630d..682a50213 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -85,7 +85,7 @@ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "babel-loader": "^8.3.0", "buffer": "^6.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "enzyme": "^3.11.0", "eslint": "^7.25.0", "html-webpack-plugin": "^5.5.0", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index c0ff405d9..2e7be050d 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -43,7 +43,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 1d553db57..7be04ec3e 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -44,7 +44,7 @@ "@mongosh/service-provider-server": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "rimraf": "^3.0.2" diff --git a/packages/build/package.json b/packages/build/package.json index 855bea195..adb70b500 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -53,7 +53,7 @@ "@types/tar-fs": "^2.0.0", "@types/tmp": "^0.2.3", "cross-spawn": "^7.0.3", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", "sinon-chai": "^3.5.0", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index d5b9c3282..3dc9c2af3 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -106,7 +106,7 @@ "@types/yargs-parser": "^15.0.0", "@types/chai-as-promised": "^7.1.3", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-crypt-library-dummy": "^1.0.2", "prettier": "^2.8.8", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 156ee4019..e23ee3794 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -41,7 +41,7 @@ "@types/rimraf": "^3.0.0", "bson": "^6.8.0", "chai-as-promised": "^7.1.1", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", diff --git a/packages/editor/package.json b/packages/editor/package.json index b83aac301..c19b63c03 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -46,7 +46,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", "prettier": "^2.8.8" diff --git a/packages/errors/package.json b/packages/errors/package.json index 77026835b..1df02b0e7 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -40,7 +40,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "chalk": "^4.1.2", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "handlebars": "^4.7.7", "prettier": "^2.8.8", diff --git a/packages/history/package.json b/packages/history/package.json index 6150cea42..c10707bba 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -42,7 +42,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb-connection-string-url": "^3.0.1", "prettier": "^2.8.8" diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 548a1b86a..2888e6917 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -42,7 +42,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index 3da72b53d..c1953234f 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -43,7 +43,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/babel__core": "^7.1.18", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } diff --git a/packages/logging/package.json b/packages/logging/package.json index 7239b1730..42f23d7d9 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -28,7 +28,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 5b9f6ce57..c6c1d7e64 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -43,7 +43,7 @@ "@mongosh/service-provider-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", "postmsg-rpc": "^2.4.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 177d3c5f6..798136d70 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -57,7 +57,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json index a781a9f90..4eced5a8b 100644 --- a/packages/service-provider-server/package.json +++ b/packages/service-provider-server/package.json @@ -66,7 +66,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" } diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index fb7978794..31047d155 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -53,7 +53,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8", diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index c572642bb..d1f9f06f5 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -40,7 +40,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", "@types/sinon-chai": "^3.2.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8" }, diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index c2eaa1b05..c99d437e6 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -51,7 +51,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/cross-spawn": "^6.0.2", "@types/tar": "^4.0.4", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "nanobus": "^4.5.0", "prettier": "^2.8.8" diff --git a/packages/types/package.json b/packages/types/package.json index a2fe5d1d4..782e5f133 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -44,7 +44,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "depcheck": "^1.4.3", + "depcheck": "^1.4.7", "eslint": "^7.25.0", "mongodb": "^6.9.0", "prettier": "^2.8.8" From 8b8ef7fcab05e3519a4b111b571b1046979e2af1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 08:21:47 +0000 Subject: [PATCH 19/39] chore: update auto-generated files (#2224) * chore: update THIRD_PARTY_NOTICES * chore: update AUTHORS --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 100 ++++---------------- packages/arg-parser/AUTHORS | 1 + packages/async-rewriter2/AUTHORS | 1 + packages/autocomplete/AUTHORS | 1 + packages/browser-repl/AUTHORS | 1 + packages/browser-runtime-core/AUTHORS | 1 + packages/browser-runtime-electron/AUTHORS | 1 + packages/build/AUTHORS | 1 + packages/editor/AUTHORS | 1 + packages/errors/AUTHORS | 1 + packages/history/AUTHORS | 1 + packages/js-multiline-to-singleline/AUTHORS | 1 + packages/logging/AUTHORS | 1 + packages/node-runtime-worker-thread/AUTHORS | 1 + packages/service-provider-core/AUTHORS | 1 + packages/service-provider-server/AUTHORS | 1 + packages/shell-evaluator/AUTHORS | 1 + packages/snippet-manager/AUTHORS | 1 + packages/types/AUTHORS | 1 + 19 files changed, 38 insertions(+), 80 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 151ddd9c4..ccc78172c 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Wed Oct 16 2024. +This document was automatically generated on Thu Oct 17 2024. ## List of dependencies @@ -54,14 +54,12 @@ Package|Version|License **[@babel/helper-simple-access](#dc3e63b7b12d0eb147694ad9ec9e7aa787e6b06d217588a133ca2e99cc587b22)**|7.22.5|MIT **[@babel/helper-skip-transparent-expression-wrappers](#3680d72a3e5058442cc8966d761775227dc7296f71c862ab179c463d5caeb58b)**|7.22.5|MIT **[@babel/helper-split-export-declaration](#2f47cc2b7fe1c026742640af9190a7f9163faecb332a5b0717a76415e215ea1d)**|7.22.6|MIT -**[@babel/helper-string-parser](#149908f6f248dc03088fc69ea568914fe824a3db73b5c6c3fccee483cf5ea8a4)**|7.22.5|MIT -**[@babel/helper-validator-identifier](#b98e4f333229567cd14c45f975f8790c55df32254602572fb44f811dc65e1a3e)**|7.22.20|MIT +**[@babel/helper-string-parser](#3e823d043a87bb0e820b7bf894d00b437b31268e75ef63335a13cd7a50c467c0)**|7.25.7|MIT +**[@babel/helper-validator-identifier](#3df356165f526bab88c031bc66d811e8c93c2a4217100e93252c681caaf5f470)**|7.25.7|MIT **[@babel/helper-validator-option](#deada2cd042f06e8fd213df49ced5a41c1d2b99bf4d5f5b6d553719b3bbef43d)**|7.22.5|MIT **[@babel/helpers](#cb1e18e6d46d89abd6ba3ec9218d7de7d12a4a2a123de99f25fbe74273486c85)**|7.22.6|MIT **[@babel/highlight](#c3f39ed214bc95c7a4f36115d2a44166416b0a3deca3807e19cf43f8c3c97992)**|7.22.20|MIT -**[@babel/parser](#c6d1b39f8ba907386ce051c3c7812099926586a80551cf1898e4cfad6423632a)**|7.16.4|MIT -**[@babel/parser](#6184d832a9387cc6c79182d111fe4f69ae4621a524254f6d66f8fb841691da21)**|7.22.7|MIT -**[@babel/parser](#e7d24bd4d33cf5dfbb8d42d588389a0df1d5a11fd875e181c5ab46dbe07d54b6)**|7.23.0|MIT +**[@babel/parser](#b1c0640807d2701180a218503f997764272a637a4f749736e2f25ed19388fa5f)**|7.25.8|MIT **[@babel/plugin-syntax-jsx](#92b0c9e2acd6beca918c90ecdc4cc5973ac7c517f7dee4ef88df317effdfa44b)**|7.22.5|MIT **[@babel/plugin-syntax-typescript](#b6fc5c65f4e7013bf626b2718813ae149f1b5fe0ce1bad1e28ec66f87e0cc536)**|7.22.5|MIT **[@babel/plugin-transform-destructuring](#c97fc3729e02faa151dc6eb84560e5aba3f15e1b409cf5ed2a58431f96660368)**|7.22.5|MIT @@ -72,14 +70,14 @@ Package|Version|License **[@babel/preset-typescript](#98ef09dd3dc2481c1ac9e23d6809726082706962813dedac9ab80f49bca1b812)**|7.22.5|MIT **[@babel/template](#3c75119e7609dea949724f8fca09fa5070562bec09a8f3bb3ad4d5301aa67ce0)**|7.22.15|MIT **[@babel/traverse](#30097e39f159c2eb3863a791d6a98f23c7d5ac1cac6578a2deb827a48fefc7a0)**|7.23.2|MIT -**[@babel/types](#c7dd9bf0ec2fff59ef38d47c554dbc3077e5a8ef660e9bfd6a705292c0b26f0c)**|7.23.0|MIT +**[@babel/types](#f9cc77d02872cde090c99c280cfff1306d7ad77fb22d15f53ad97a58c3db944e)**|7.25.8|MIT **[@hapi/hoek](#a306f63b06e22206da212d9805ac6d378591ee24cb90b85f5f84eeee9e418a87)**|9.3.0|BSD-3-Clause **[@hapi/topo](#c08672fb909d4d2d143fdec500a195120eeb0ac994445f970a7b9410041e3848)**|5.1.0|BSD-3-Clause **[@jridgewell/gen-mapping](#1e660067f4d1364dc830c372517d8ec92eddc9af7eaa6b1e698d478b286abafa)**|0.1.1|MIT **[@jridgewell/gen-mapping](#25a8188ec7d87cf1b9baf2470bad1f75a22f246ca0fca732933d26fd488ef5d2)**|0.3.5|MIT **[@jridgewell/resolve-uri](#f356bc3bb9c04f5fe4e387a4eea4e74125aae03bb50f846d956d7d986d200f50)**|3.1.0|MIT **[@jridgewell/set-array](#46727c727ad43ad8e382221964d27c475629a5635986edac6ea622c772311421)**|1.2.1|MIT -**[@jridgewell/sourcemap-codec](#48d1d40d908582402e2071de1ae38b57c21fc0e7615f8f82f3f5b1f0cad0dd93)**|1.4.14|MIT +**[@jridgewell/sourcemap-codec](#7b2141e6a44d38d8458ddcb163c26ab65d5782f6c25465b1954182593dd0c2c4)**|1.5.0|MIT **[@jridgewell/trace-mapping](#73923b51cccefe7db1ead00c09a18978443a238d51a858a7a0c86868a9a4ea3f)**|0.3.25|MIT **[@lukeed/csprng](#3676fe5c642281431ce385febe753d3f7230e20120a0909b5020aee00271509d)**|1.1.0|MIT **[@lukeed/uuid](#82700fba068def47ea9842f28d700a387f59da805f74a6ed10a5eb7eece4cdab)**|2.0.1|MIT @@ -386,7 +384,7 @@ Package|Version|License **[path-key](#8e0734b8abb76579df2174822606e692914e985fc58363a78e6ad4b2a4a5831f)**|4.0.0|MIT **[path-to-regexp](#96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266)**|0.1.10|MIT **[path-to-regexp](#571cfd74ecd5ea999273383b83a44bf35d4a62383c67a63fef169cc42eb2d859)**|1.9.0|MIT -**[picocolors](#87994c8f4d800603a2cf449baca40fcaf984088237be5cebbfbc79de0d95da98)**|1.0.1|ISC +**[picocolors](#f964752f1f8cfd947506fd51ce1c148469ecf3b6f531d826511b720670e556f1)**|1.1.0|ISC **[prebuild-install](#93d13a9b3a51a6a802fcd35aa031d3ae7369aa6fd47d3a89f28a6d31ea3c9dc5)**|7.1.2|MIT **[pretty-repl](#52450099e67a2b965036ab65b63b01d615b3fbcff38085a23fd8e80694d2a8ed)**|4.0.1|MIT **[process-nextick-args](#449a33b1fb1386db92b40df9073f48703b67ff05c4da5043d007fdb90ed76aca)**|2.0.1|MIT @@ -6990,8 +6988,8 @@ License files: - -### [@babel/helper-string-parser](https://www.npmjs.com/package/@babel/helper-string-parser) (version 7.22.5) + +### [@babel/helper-string-parser](https://www.npmjs.com/package/@babel/helper-string-parser) (version 7.25.7) License tags: MIT License files: @@ -7022,8 +7020,8 @@ License files: - -### [@babel/helper-validator-identifier](https://www.npmjs.com/package/@babel/helper-validator-identifier) (version 7.22.20) + +### [@babel/helper-validator-identifier](https://www.npmjs.com/package/@babel/helper-validator-identifier) (version 7.25.7) License tags: MIT License files: @@ -7150,66 +7148,8 @@ License files: - -### [@babel/parser](https://www.npmjs.com/package/@babel/parser) (version 7.16.4) -License tags: MIT - -License files: -* LICENSE: - - Copyright (C) 2012-2014 by various contributors (see AUTHORS) - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - - - - -### [@babel/parser](https://www.npmjs.com/package/@babel/parser) (version 7.22.7) -License tags: MIT - -License files: -* LICENSE: - - Copyright (C) 2012-2014 by various contributors (see AUTHORS) - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - - - - -### [@babel/parser](https://www.npmjs.com/package/@babel/parser) (version 7.23.0) + +### [@babel/parser](https://www.npmjs.com/package/@babel/parser) (version 7.25.8) License tags: MIT License files: @@ -7557,8 +7497,8 @@ License files: - -### [@babel/types](https://www.npmjs.com/package/@babel/types) (version 7.23.0) + +### [@babel/types](https://www.npmjs.com/package/@babel/types) (version 7.25.8) License tags: MIT License files: @@ -7746,8 +7686,8 @@ License files: - -### [@jridgewell/sourcemap-codec](https://www.npmjs.com/package/@jridgewell/sourcemap-codec) (version 1.4.14) + +### [@jridgewell/sourcemap-codec](https://www.npmjs.com/package/@jridgewell/sourcemap-codec) (version 1.5.0) License tags: MIT License files: @@ -29108,8 +29048,8 @@ License files: - -### [picocolors](https://www.npmjs.com/package/picocolors) (version 1.0.1) + +### [picocolors](https://www.npmjs.com/package/picocolors) (version 1.1.0) License tags: ISC License files: @@ -29117,7 +29057,7 @@ License files: ISC License - Copyright (c) 2021 Alexey Raspopov, Kostiantyn Denysov, Anton Verinov + Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/packages/arg-parser/AUTHORS b/packages/arg-parser/AUTHORS index 7ec31f28a..6369c10db 100644 --- a/packages/arg-parser/AUTHORS +++ b/packages/arg-parser/AUTHORS @@ -8,3 +8,4 @@ Paula Stachova Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika Sergey Petushkov +Gagik Amaryan diff --git a/packages/async-rewriter2/AUTHORS b/packages/async-rewriter2/AUTHORS index 4a6c03b88..d0b24c124 100644 --- a/packages/async-rewriter2/AUTHORS +++ b/packages/async-rewriter2/AUTHORS @@ -7,3 +7,4 @@ kyriakos markakis <11089475+marquicodes@users.noreply.github.com> Alena Khineika Martin Rodriguez Reboredo Le Roux Bodenstein +Gagik Amaryan diff --git a/packages/autocomplete/AUTHORS b/packages/autocomplete/AUTHORS index eea7618a5..2f72eeae5 100644 --- a/packages/autocomplete/AUTHORS +++ b/packages/autocomplete/AUTHORS @@ -13,3 +13,4 @@ dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Le Roux Bodenstein Nate Eagleson pulkitkalra-mdb <156152710+pulkitkalra-mdb@users.noreply.github.com> +Gagik Amaryan diff --git a/packages/browser-repl/AUTHORS b/packages/browser-repl/AUTHORS index 698379288..8eb3b5001 100644 --- a/packages/browser-repl/AUTHORS +++ b/packages/browser-repl/AUTHORS @@ -16,3 +16,4 @@ Martin Rodriguez Reboredo Paula Stachova Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika +Gagik Amaryan diff --git a/packages/browser-runtime-core/AUTHORS b/packages/browser-runtime-core/AUTHORS index 79a12d4e1..edf7daf95 100644 --- a/packages/browser-runtime-core/AUTHORS +++ b/packages/browser-runtime-core/AUTHORS @@ -11,3 +11,4 @@ github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Martin Rodriguez Reboredo Le Roux Bodenstein Basit <1305718+mabaasit@users.noreply.github.com> +Gagik Amaryan diff --git a/packages/browser-runtime-electron/AUTHORS b/packages/browser-runtime-electron/AUTHORS index ae5e67b83..9feb2b8c2 100644 --- a/packages/browser-runtime-electron/AUTHORS +++ b/packages/browser-runtime-electron/AUTHORS @@ -11,3 +11,4 @@ github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Alena Khineika Martin Rodriguez Reboredo Le Roux Bodenstein +Gagik Amaryan diff --git a/packages/build/AUTHORS b/packages/build/AUTHORS index 3574d38e2..82d9a9637 100644 --- a/packages/build/AUTHORS +++ b/packages/build/AUTHORS @@ -18,3 +18,4 @@ Kevin Mas Ruiz Paula Stachova dylrich dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Gagik Amaryan diff --git a/packages/editor/AUTHORS b/packages/editor/AUTHORS index 64ef87e24..389cace2c 100644 --- a/packages/editor/AUTHORS +++ b/packages/editor/AUTHORS @@ -5,3 +5,4 @@ Basit <1305718+mabaasit@users.noreply.github.com> Martin Rodriguez Reboredo Le Roux Bodenstein Kevin Mas Ruiz +Gagik Amaryan diff --git a/packages/errors/AUTHORS b/packages/errors/AUTHORS index a278c6837..1ef48a072 100644 --- a/packages/errors/AUTHORS +++ b/packages/errors/AUTHORS @@ -9,3 +9,4 @@ Michael Rose github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Massimiliano Marcon Le Roux Bodenstein +Gagik Amaryan diff --git a/packages/history/AUTHORS b/packages/history/AUTHORS index 6392e8395..94c090af8 100644 --- a/packages/history/AUTHORS +++ b/packages/history/AUTHORS @@ -12,3 +12,4 @@ dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Martin Rodriguez Reboredo Le Roux Bodenstein Alena Khineika +Gagik Amaryan diff --git a/packages/js-multiline-to-singleline/AUTHORS b/packages/js-multiline-to-singleline/AUTHORS index d8b8a544a..c57599173 100644 --- a/packages/js-multiline-to-singleline/AUTHORS +++ b/packages/js-multiline-to-singleline/AUTHORS @@ -4,3 +4,4 @@ Anna Henningsen dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Martin Rodriguez Reboredo Le Roux Bodenstein +Gagik Amaryan diff --git a/packages/logging/AUTHORS b/packages/logging/AUTHORS index a9463a2e8..80bdd39d3 100644 --- a/packages/logging/AUTHORS +++ b/packages/logging/AUTHORS @@ -10,3 +10,4 @@ Paula Stachova Rhys Howell Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika +Gagik Amaryan diff --git a/packages/node-runtime-worker-thread/AUTHORS b/packages/node-runtime-worker-thread/AUTHORS index 4b716ec5b..167bf0ae2 100644 --- a/packages/node-runtime-worker-thread/AUTHORS +++ b/packages/node-runtime-worker-thread/AUTHORS @@ -11,3 +11,4 @@ dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bailey Pearson Alena Khineika Basit <1305718+mabaasit@users.noreply.github.com> +Gagik Amaryan diff --git a/packages/service-provider-core/AUTHORS b/packages/service-provider-core/AUTHORS index 94e2634f7..c40adb297 100644 --- a/packages/service-provider-core/AUTHORS +++ b/packages/service-provider-core/AUTHORS @@ -18,3 +18,4 @@ Kevin Mas Ruiz Hao Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika +Gagik Amaryan diff --git a/packages/service-provider-server/AUTHORS b/packages/service-provider-server/AUTHORS index ebca5350e..a1daa2b1b 100644 --- a/packages/service-provider-server/AUTHORS +++ b/packages/service-provider-server/AUTHORS @@ -18,3 +18,4 @@ Martin Rodriguez Reboredo Basit <1305718+mabaasit@users.noreply.github.com> Paula Stachova Alena Khineika +Gagik Amaryan diff --git a/packages/shell-evaluator/AUTHORS b/packages/shell-evaluator/AUTHORS index b5a766027..0f48a1dad 100644 --- a/packages/shell-evaluator/AUTHORS +++ b/packages/shell-evaluator/AUTHORS @@ -12,3 +12,4 @@ Alena Khineika Martin Rodriguez Reboredo Le Roux Bodenstein Kevin Mas Ruiz +Gagik Amaryan diff --git a/packages/snippet-manager/AUTHORS b/packages/snippet-manager/AUTHORS index 507ffb796..bfb7a6aad 100644 --- a/packages/snippet-manager/AUTHORS +++ b/packages/snippet-manager/AUTHORS @@ -8,3 +8,4 @@ Martin Rodriguez Reboredo Le Roux Bodenstein Paula Stachova Sergey Petushkov +Gagik Amaryan diff --git a/packages/types/AUTHORS b/packages/types/AUTHORS index a563405a4..6c7edbcdb 100644 --- a/packages/types/AUTHORS +++ b/packages/types/AUTHORS @@ -9,3 +9,4 @@ Martin Rodriguez Reboredo Kevin Mas Ruiz Basit <1305718+mabaasit@users.noreply.github.com> Alena Khineika +Gagik Amaryan From a08940b923169466a004cf4086e7a652fe57d3c1 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Thu, 17 Oct 2024 14:45:19 +0200 Subject: [PATCH 20/39] fix(cli-repl): Revert workaround for depcheck for searchParams type --- packages/cli-repl/src/cli-repl.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index 18479f05f..db97e18de 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -1017,11 +1017,12 @@ export class CliRepl implements MongoshIOProvider { } async isTlsKeyFilePasswordMissingURI( - searchParams: unknown + searchParams: ReturnType< + typeof ConnectionString.prototype.typedSearchParams + > ): Promise { - const searchMap = searchParams as Map; - const tlsCertificateKeyFile = searchMap.get('tlsCertificateKeyFile'); - const tlsCertificateKeyFilePassword = searchMap.get( + const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile'); + const tlsCertificateKeyFilePassword = searchParams.get( 'tlsCertificateKeyFilePassword' ); From af042440684e057d9ed14196502197f078850e0c Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Fri, 18 Oct 2024 10:25:34 +0200 Subject: [PATCH 21/39] fix(shell-api): Add support for running aggregate database with a single stage MONGOSH-1868 (#2218) Co-authored-by: Anna Henningsen --- packages/shell-api/src/database.spec.ts | 10 ++++++++++ packages/shell-api/src/database.ts | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts index d4fd662e2..a78e97101 100644 --- a/packages/shell-api/src/database.spec.ts +++ b/packages/shell-api/src/database.spec.ts @@ -400,6 +400,16 @@ describe('Database', function () { ); }); + it('supports a single aggregation stage', async function () { + await database.aggregate({ $piplelineStage: {} }, { options: true }); + + expect(serviceProvider.aggregateDb).to.have.been.calledWith( + database._name, + [{ $piplelineStage: {} }], + { options: true } + ); + }); + it('calls serviceProvider.aggregateDb with explicit batchSize', async function () { await database.aggregate([{ $piplelineStage: {} }], { options: true, diff --git a/packages/shell-api/src/database.ts b/packages/shell-api/src/database.ts index 1765c9299..7c6ce4a3b 100644 --- a/packages/shell-api/src/database.ts +++ b/packages/shell-api/src/database.ts @@ -423,7 +423,7 @@ export default class Database extends ShellApiWithMongoClass { @returnType('AggregationCursor') @apiVersions([1]) async aggregate( - pipeline: Document[], + pipelineOrSingleStage: Document | Document[], options?: Document ): Promise { if ('background' in (options ?? {})) { @@ -431,7 +431,12 @@ export default class Database extends ShellApiWithMongoClass { aggregateBackgroundOptionNotSupportedHelp ); } + const pipeline: Document[] = Array.isArray(pipelineOrSingleStage) + ? pipelineOrSingleStage + : [pipelineOrSingleStage]; + assertArgsDefinedType([pipeline], [true], 'Database.aggregate'); + this._emitDatabaseApiCall('aggregate', { options, pipeline }); const { aggOptions, dbOptions, explain } = adaptAggregateOptions(options); @@ -1429,6 +1434,7 @@ export default class Database extends ShellApiWithMongoClass { CommonErrors.CommandFailed ); } + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion for (const cmdDescription of Object.values(result.commands) as Document[]) { if ('slaveOk' in cmdDescription) { cmdDescription.secondaryOk = cmdDescription.slaveOk; From d83f36936b6c9fce891242df1427f22f23468268 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:34:10 +0000 Subject: [PATCH 22/39] chore: update auto-generated files (#2226) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index ccc78172c..bda052708 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Thu Oct 17 2024. +This document was automatically generated on Fri Oct 18 2024. ## List of dependencies From 15faeba6c012a984754cd28af99344c887d02354 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Fri, 18 Oct 2024 11:46:46 +0200 Subject: [PATCH 23/39] fix(shell-api): mongosh should throw an error when trying to drop a non-primary index MONGOSH-1608 (#2221) --- packages/shell-api/src/collection.spec.ts | 21 +++++++++++---------- packages/shell-api/src/collection.ts | 9 --------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts index 3f218d662..95d16c2fa 100644 --- a/packages/shell-api/src/collection.spec.ts +++ b/packages/shell-api/src/collection.spec.ts @@ -1165,26 +1165,27 @@ describe('Collection', function () { context( 'when serviceProvider.dropIndexes rejects IndexNotFound', function () { + let expectedError: Error; beforeEach(function () { - const error = new Error('index not found with name [index_1]'); - Object.assign(error, { + expectedError = new Error('index not found with name [index_1]'); + Object.assign(expectedError, { ok: 0, errmsg: 'index not found with name [index_1]', code: 27, codeName: 'IndexNotFound', - name: 'MongoError', + name: 'MongoServerError', }); - serviceProvider.runCommandWithCheck.rejects(error); + serviceProvider.runCommandWithCheck.rejects(expectedError); }); it('returns the error as object', async function () { - expect(await collection.dropIndexes('index_1')).to.deep.equal({ - ok: 0, - errmsg: 'index not found with name [index_1]', - code: 27, - codeName: 'IndexNotFound', - }); + let caughtError: Error | undefined; + await collection + .dropIndexes('index_1') + .catch((err) => (caughtError = err)); + + expect(caughtError).to.deep.equal(expectedError); }); } ); diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index 1723425bb..a8c699ff5 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -1335,15 +1335,6 @@ export default class Collection extends ShellApiWithMongoClass { return all.sort((a, b) => b.nIndexesWas - a.nIndexesWas)[0]; } - if (error?.codeName === 'IndexNotFound') { - return { - ok: error.ok, - errmsg: error.errmsg, - code: error.code, - codeName: error.codeName, - }; - } - throw error; } } From 42c83d6614c7ca248f3c0524aa57451989961b57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 03:19:58 +0000 Subject: [PATCH 24/39] chore: update auto-generated files (#2228) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index bda052708..6d49c9a3b 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Fri Oct 18 2024. +This document was automatically generated on Sun Oct 20 2024. ## List of dependencies From c65a5b5aeffb7f2f6b58415321c6559556124d06 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Tue, 22 Oct 2024 16:12:54 +0200 Subject: [PATCH 25/39] fix(shell-api): Align database and collection aggregate functions MONGOSH-1868 (#2229) --- packages/shell-api/src/collection.ts | 20 +++++++------ packages/shell-api/src/database.spec.ts | 23 +++++++++++--- packages/shell-api/src/database.ts | 40 +++++++++++++++++-------- 3 files changed, 58 insertions(+), 25 deletions(-) diff --git a/packages/shell-api/src/collection.ts b/packages/shell-api/src/collection.ts index a8c699ff5..911dcc45d 100644 --- a/packages/shell-api/src/collection.ts +++ b/packages/shell-api/src/collection.ts @@ -66,6 +66,7 @@ import type { UpdateOptions, DropCollectionOptions, CheckMetadataConsistencyOptions, + AggregateOptions, } from '@mongosh/service-provider-core'; import type { RunCommandCursor, Database } from './index'; import { @@ -159,26 +160,27 @@ export default class Collection extends ShellApiWithMongoClass { */ async aggregate( pipeline: Document[], - options: Document & { explain?: never } - ): Promise; + options: AggregateOptions & { explain: ExplainVerbosityLike } + ): Promise; async aggregate( pipeline: Document[], - options: Document & { explain: ExplainVerbosityLike } - ): Promise; + options?: AggregateOptions + ): Promise; async aggregate(...stages: Document[]): Promise; @returnsPromise @returnType('AggregationCursor') @apiVersions([1]) - async aggregate(...args: any[]): Promise { - let options; - let pipeline; + async aggregate(...args: unknown[]): Promise { + let options: AggregateOptions; + let pipeline: Document[]; if (args.length === 0 || Array.isArray(args[0])) { options = args[1] || {}; - pipeline = args[0] || []; + pipeline = (args[0] as Document[]) || []; } else { options = {}; - pipeline = args || []; + pipeline = (args as Document[]) || []; } + if ('background' in options) { await this._instanceState.printWarning( aggregateBackgroundOptionNotSupportedHelp diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts index a78e97101..4cc7cb7e2 100644 --- a/packages/shell-api/src/database.spec.ts +++ b/packages/shell-api/src/database.spec.ts @@ -401,12 +401,25 @@ describe('Database', function () { }); it('supports a single aggregation stage', async function () { - await database.aggregate({ $piplelineStage: {} }, { options: true }); + await database.aggregate({ $piplelineStage: {} }); expect(serviceProvider.aggregateDb).to.have.been.calledWith( database._name, [{ $piplelineStage: {} }], - { options: true } + {} + ); + }); + + it('supports passing args as aggregation stages', async function () { + await database.aggregate( + { $piplelineStage: {} }, + { $piplelineStage2: {} } + ); + + expect(serviceProvider.aggregateDb).to.have.been.calledWith( + database._name, + [{ $piplelineStage: {} }, { $piplelineStage2: {} }], + {} ); }); @@ -2891,7 +2904,9 @@ describe('Database', function () { it('runs a $sql aggregation', async function () { const serviceProviderCursor = stubInterface(); serviceProvider.aggregateDb.returns(serviceProviderCursor as any); - await database.sql('SELECT * FROM somecollection;', { options: true }); + await database.sql('SELECT * FROM somecollection;', { + serializeFunctions: true, + }); expect(serviceProvider.aggregateDb).to.have.been.calledWith( database._name, [ @@ -2904,7 +2919,7 @@ describe('Database', function () { }, }, ], - { options: true } + { serializeFunctions: true } ); }); diff --git a/packages/shell-api/src/database.ts b/packages/shell-api/src/database.ts index 7c6ce4a3b..c148cc14e 100644 --- a/packages/shell-api/src/database.ts +++ b/packages/shell-api/src/database.ts @@ -52,6 +52,8 @@ import type { CreateEncryptedCollectionOptions, CheckMetadataConsistencyOptions, RunCommandOptions, + ExplainVerbosityLike, + AggregateOptions, } from '@mongosh/service-provider-core'; export type CollectionNamesWithTypes = { @@ -413,27 +415,38 @@ export default class Database extends ShellApiWithMongoClass { } /** - * Run an aggregation against the db. + * Run an aggregation against the database. Accepts array pipeline and options object OR stages as individual arguments. * - * @param pipeline - * @param options * @returns {Promise} The promise of aggregation results. */ + async aggregate( + pipeline: Document[], + options: AggregateOptions & { explain: ExplainVerbosityLike } + ): Promise; + async aggregate( + pipeline: Document[], + options?: AggregateOptions + ): Promise; + async aggregate(...stages: Document[]): Promise; @returnsPromise @returnType('AggregationCursor') @apiVersions([1]) - async aggregate( - pipelineOrSingleStage: Document | Document[], - options?: Document - ): Promise { - if ('background' in (options ?? {})) { + async aggregate(...args: unknown[]): Promise { + let options: AggregateOptions; + let pipeline: Document[]; + if (args.length === 0 || Array.isArray(args[0])) { + options = args[1] || {}; + pipeline = (args[0] as Document[]) || []; + } else { + options = {}; + pipeline = (args as Document[]) || []; + } + + if ('background' in options) { await this._instanceState.printWarning( aggregateBackgroundOptionNotSupportedHelp ); } - const pipeline: Document[] = Array.isArray(pipelineOrSingleStage) - ? pipelineOrSingleStage - : [pipelineOrSingleStage]; assertArgsDefinedType([pipeline], [true], 'Database.aggregate'); @@ -1731,7 +1744,10 @@ export default class Database extends ShellApiWithMongoClass { @serverVersions(['4.4.0', ServerVersions.latest]) @returnsPromise @returnType('AggregationCursor') - async sql(sqlString: string, options?: Document): Promise { + async sql( + sqlString: string, + options?: AggregateOptions + ): Promise { this._emitDatabaseApiCall('sql', { sqlString: sqlString, options }); await this._instanceState.shellApi.print( 'Note: this is an experimental feature that may be subject to change in future releases.' From 87b8948b0f50426a35a1b03d8b66ca78560d61f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:21:31 +0000 Subject: [PATCH 26/39] chore: update auto-generated files (#2231) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 6d49c9a3b..029896c78 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Sun Oct 20 2024. +This document was automatically generated on Tue Oct 22 2024. ## List of dependencies From 6f46d3a364b2997270694c2dc5d947373e1f1c37 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Wed, 23 Oct 2024 13:51:05 +0200 Subject: [PATCH 27/39] chore(deps): Add node-gyp version control across different distros MONGOSH-1891 (#2230) --- .evergreen/install-npm-deps.sh | 8 +- package-lock.json | 1272 +++++++++++++++++--------------- package.json | 2 +- 3 files changed, 669 insertions(+), 613 deletions(-) diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index eb8081f32..97cffcc7e 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -1,8 +1,12 @@ set -e set -x -npm ci --verbose +if [[ "${DISTRO_ID}" =~ ^(rhel|ubuntu1804) ]]; then + # RHEL and Ubuntu 18.04 use Python 3.6 which isn't supported by newer node-gyp versions + npm i node-gyp@9 --verbose --force +fi +npm ci --verbose echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE" # if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version @@ -30,4 +34,4 @@ npm run mark-ci-required-optional-dependencies npm run evergreen-release bump echo "npm packages after installation" -npm ls || true \ No newline at end of file +npm ls || true diff --git a/package-lock.json b/package-lock.json index a34dd609f..3fc63358e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "mocha": "^10.2.0", "mongodb": "^6.9.0", "mongodb-runner": "^5.7.0", - "node-gyp": "^9.0.0", + "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", "pkg-up": "^3.1.0", "rimraf": "^3.0.2", @@ -5161,15 +5161,6 @@ "@octokit/openapi-types": "^18.0.0" } }, - "node_modules/@lerna/create/node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@lerna/create/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -5454,45 +5445,6 @@ } } }, - "node_modules/@lerna/create/node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/@lerna/create/node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@lerna/create/node_modules/npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -6730,7 +6682,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", - "optional": true, + "devOptional": true, "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", @@ -6746,7 +6698,7 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "optional": true + "devOptional": true }, "node_modules/@npmcli/arborist": { "version": "7.5.4", @@ -7029,30 +6981,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/@npmcli/arborist/node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, "node_modules/@npmcli/arborist/node_modules/nopt": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", @@ -7449,15 +7377,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/metavuln-calculator/node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@npmcli/metavuln-calculator/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -7583,45 +7502,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/@npmcli/metavuln-calculator/node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -7768,6 +7648,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "dev": true, "dependencies": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" @@ -7780,6 +7661,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -10109,6 +9991,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "license": "MIT", "engines": { "node": ">= 10" } @@ -11645,6 +11528,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", "dependencies": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" @@ -11657,6 +11542,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -12412,6 +12298,318 @@ "node": ">= 12.4.0" } }, + "node_modules/boxednode/node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "license": "MIT", + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/boxednode/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/boxednode/node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/cacache/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/boxednode/node_modules/cacache/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/boxednode/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/boxednode/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/boxednode/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/boxednode/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/boxednode/node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/boxednode/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/boxednode/node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^12.13 || ^14.13 || >=16" + } + }, + "node_modules/boxednode/node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/boxednode/node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/boxednode/node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/bplist-parser": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", @@ -16212,8 +16410,7 @@ "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "optional": true + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "node_modules/express": { "version": "4.21.1", @@ -17079,6 +17276,8 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", "dependencies": { "aproba": "^1.0.3 || ^2.0.0", "color-support": "^1.1.3", @@ -20683,15 +20882,6 @@ "@octokit/openapi-types": "^18.0.0" } }, - "node_modules/lerna/node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/lerna/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -20976,45 +21166,6 @@ } } }, - "node_modules/lerna/node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/lerna/node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/lerna/node_modules/npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -21820,7 +21971,7 @@ "version": "13.0.1", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", - "optional": true, + "devOptional": true, "dependencies": { "@npmcli/agent": "^2.0.0", "cacache": "^18.0.0", @@ -21843,7 +21994,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "optional": true, + "devOptional": true, "dependencies": { "semver": "^7.3.5" }, @@ -21855,7 +22006,7 @@ "version": "18.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", - "optional": true, + "devOptional": true, "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", @@ -21878,7 +22029,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "optional": true, + "devOptional": true, "dependencies": { "minipass": "^7.0.3" }, @@ -21890,13 +22041,13 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "optional": true + "devOptional": true }, "node_modules/make-fetch-happen/node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "optional": true, + "devOptional": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -21905,7 +22056,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", - "optional": true, + "devOptional": true, "dependencies": { "minipass": "^7.0.3" }, @@ -21917,7 +22068,7 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "optional": true, + "devOptional": true, "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", @@ -21934,7 +22085,7 @@ "version": "10.0.6", "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "optional": true, + "devOptional": true, "dependencies": { "minipass": "^7.0.3" }, @@ -21946,7 +22097,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "optional": true, + "devOptional": true, "dependencies": { "unique-slug": "^4.0.0" }, @@ -21958,7 +22109,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "optional": true, + "devOptional": true, "dependencies": { "imurmurhash": "^0.1.4" }, @@ -23217,195 +23368,80 @@ } }, "node_modules/node-gyp": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz", - "integrity": "sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "devOptional": true, + "license": "MIT", "dependencies": { "env-paths": "^2.2.0", - "glob": "^7.1.4", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^5.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" + "tar": "^6.2.1", + "which": "^4.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^12.22 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/@npmcli/fs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz", - "integrity": "sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/node-gyp/node_modules/cacache": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz", - "integrity": "sha512-eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g==", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^1.1.2", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^7.2.0", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.1.11", - "unique-filename": "^1.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, + "node_modules/node-gyp/node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "devOptional": true, + "license": "ISC", "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/node-gyp/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, + "node_modules/node-gyp/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "devOptional": true, + "license": "ISC", "engines": { - "node": ">= 6" + "node": ">=16" } }, - "node_modules/node-gyp/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "node_modules/node-gyp/node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "devOptional": true, + "license": "ISC", "dependencies": { - "agent-base": "6", - "debug": "4" + "abbrev": "^2.0.0" }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/node-gyp/node_modules/lru-cache": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz", - "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==", - "engines": { - "node": ">=12" - } - }, - "node_modules/node-gyp/node_modules/make-fetch-happen": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz", - "integrity": "sha512-3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.0.2", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^6.1.1", - "ssri": "^8.0.1" + "bin": { + "nopt": "bin/nopt.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/node-gyp/node_modules/minipass-fetch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz", - "integrity": "sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==", + "node_modules/node-gyp/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "devOptional": true, + "license": "ISC", "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "isexe": "^3.1.1" }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/node-gyp/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-gyp/node_modules/socks-proxy-agent": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz", - "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.1", - "socks": "^2.6.1" + "node-which": "bin/which.js" }, "engines": { - "node": ">= 10" + "node": "^16.13.0 || >=18.0.0" } }, "node_modules/node-machine-id": { @@ -23435,6 +23471,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dev": true, "dependencies": { "abbrev": "1" }, @@ -23690,6 +23727,8 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", "dependencies": { "are-we-there-yet": "^3.0.0", "console-control-strings": "^1.1.0", @@ -25712,7 +25751,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", - "optional": true, + "devOptional": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -28258,6 +28297,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, "dependencies": { "minipass": "^3.1.1" }, @@ -29536,6 +29576,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, "dependencies": { "unique-slug": "^2.0.0" } @@ -29544,6 +29585,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4" } @@ -35966,12 +36008,6 @@ "@octokit/openapi-types": "^18.0.0" } }, - "abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true - }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -36170,33 +36206,6 @@ "whatwg-url": "^5.0.0" } }, - "node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "requires": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - } - }, - "nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "requires": { - "abbrev": "^2.0.0" - } - }, "npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -37763,7 +37772,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", - "optional": true, + "devOptional": true, "requires": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", @@ -37776,7 +37785,7 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "optional": true + "devOptional": true } } }, @@ -37998,24 +38007,6 @@ "minipass": "^7.0.3" } }, - "node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "requires": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - } - }, "nopt": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", @@ -38319,12 +38310,6 @@ "which": "^4.0.0" } }, - "abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true - }, "brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -38420,33 +38405,6 @@ "minipass": "^7.0.3" } }, - "node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "requires": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - } - }, - "nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "requires": { - "abbrev": "^2.0.0" - } - }, "npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -38559,6 +38517,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "dev": true, "requires": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" @@ -38567,7 +38526,8 @@ "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true } } }, @@ -42396,6 +42356,225 @@ "semver": "^7.3.2", "tar": "^6.0.5", "yargs": "^16.0.3" + }, + "dependencies": { + "@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "requires": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + } + }, + "@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "requires": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + } + }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "requires": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "dependencies": { + "glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "requires": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + } + }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==" + }, + "make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "requires": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + } + }, + "minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "requires": { + "encoding": "^0.1.13", + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "requires": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + } + }, + "nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "requires": { + "abbrev": "^1.0.0" + } + }, + "socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "requires": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + } + }, + "ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "requires": { + "minipass": "^3.1.1" + } + }, + "unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "requires": { + "unique-slug": "^3.0.0" + } + }, + "unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "requires": { + "imurmurhash": "^0.1.4" + } + } } }, "bplist-parser": { @@ -45297,8 +45476,7 @@ "exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "optional": true + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "express": { "version": "4.21.1", @@ -48689,12 +48867,6 @@ "@octokit/openapi-types": "^18.0.0" } }, - "abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "optional": true - }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -48893,33 +49065,6 @@ "whatwg-url": "^5.0.0" } }, - "node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", - "optional": true, - "requires": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" - } - }, - "nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "optional": true, - "requires": { - "abbrev": "^2.0.0" - } - }, "npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -49554,7 +49699,7 @@ "version": "13.0.1", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", - "optional": true, + "devOptional": true, "requires": { "@npmcli/agent": "^2.0.0", "cacache": "^18.0.0", @@ -49574,7 +49719,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "optional": true, + "devOptional": true, "requires": { "semver": "^7.3.5" } @@ -49583,7 +49728,7 @@ "version": "18.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", - "optional": true, + "devOptional": true, "requires": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", @@ -49603,7 +49748,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "optional": true, + "devOptional": true, "requires": { "minipass": "^7.0.3" } @@ -49612,19 +49757,19 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "optional": true + "devOptional": true }, "minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "optional": true + "devOptional": true }, "minipass-collect": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", - "optional": true, + "devOptional": true, "requires": { "minipass": "^7.0.3" } @@ -49633,7 +49778,7 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "optional": true, + "devOptional": true, "requires": { "encoding": "^0.1.13", "minipass": "^7.0.3", @@ -49645,7 +49790,7 @@ "version": "10.0.6", "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "optional": true, + "devOptional": true, "requires": { "minipass": "^7.0.3" } @@ -49654,7 +49799,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "optional": true, + "devOptional": true, "requires": { "unique-slug": "^4.0.0" } @@ -49663,7 +49808,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "optional": true, + "devOptional": true, "requires": { "imurmurhash": "^0.1.4" } @@ -50635,148 +50780,51 @@ "dev": true }, "node-gyp": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz", - "integrity": "sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "devOptional": true, "requires": { "env-paths": "^2.2.0", - "glob": "^7.1.4", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^5.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" + "tar": "^6.2.1", + "which": "^4.0.0" }, "dependencies": { - "@npmcli/fs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz", - "integrity": "sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==", - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "requires": { - "debug": "4" - } - }, - "cacache": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz", - "integrity": "sha512-eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g==", - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^1.1.2", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^7.2.0", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.1.11", - "unique-filename": "^1.1.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "lru-cache": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz", - "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==" + "abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "devOptional": true }, - "make-fetch-happen": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz", - "integrity": "sha512-3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==", - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.0.2", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^6.1.1", - "ssri": "^8.0.1" - } + "isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "devOptional": true }, - "minipass-fetch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz", - "integrity": "sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==", + "nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "devOptional": true, "requires": { - "encoding": "^0.1.13", - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "abbrev": "^2.0.0" } }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - }, - "socks-proxy-agent": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz", - "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==", + "which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "devOptional": true, "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.1", - "socks": "^2.6.1" + "isexe": "^3.1.1" } } } @@ -50805,6 +50853,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dev": true, "requires": { "abbrev": "1" } @@ -52506,7 +52555,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", - "optional": true + "devOptional": true }, "process": { "version": "0.11.10", @@ -54496,6 +54545,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, "requires": { "minipass": "^3.1.1" } @@ -55455,6 +55505,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, "requires": { "unique-slug": "^2.0.0" } @@ -55463,6 +55514,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, "requires": { "imurmurhash": "^0.1.4" } diff --git a/package.json b/package.json index 1b9716b8c..abb343dee 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "mocha": "^10.2.0", "mongodb": "^6.9.0", "mongodb-runner": "^5.7.0", - "node-gyp": "^9.0.0", + "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", "pkg-up": "^3.1.0", "rimraf": "^3.0.2", From 80f8b197608480c0e1d252db47ae0ee0a2b1fdad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:59:32 +0000 Subject: [PATCH 28/39] chore: update auto-generated files (#2233) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 029896c78..1170815d7 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Tue Oct 22 2024. +This document was automatically generated on Wed Oct 23 2024. ## List of dependencies From c18016a7d156642180ef29ccacf3f5a36bd21e94 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 23 Oct 2024 15:33:38 +0200 Subject: [PATCH 29/39] chore: rename service-provider-server and `CliServiceProvider` (#2232) `ServiceProvider` is our abstraction for how mongosh interacts with the database. The two notable implementations of that that are actually being used are based on the Node.js driver and the Java driver, respectively. Neither `CliServiceProvider` (has no inherent connection with CLI usage) nor `service-provider-server` (connects to the same servers as any other service provider would) are great names and only reflect the historical architecture for mongosh at this point. So, let's rename this to something that accurately reflects what this service provider implementation is and what distinguishes it from others! --- .evergreen.yml | 668 +++++++++--------- package-lock.json | 55 +- package.json | 2 +- .../browser-runtime-electron/package.json | 2 +- .../src/electron-runtime.spec.ts | 6 +- .../build/src/compile/signable-compiler.ts | 13 +- packages/cli-repl/package.json | 2 +- packages/cli-repl/src/build-info.ts | 6 +- packages/cli-repl/src/cli-repl.spec.ts | 2 +- packages/cli-repl/src/cli-repl.ts | 6 +- packages/i18n/src/locales/en_US.ts | 2 +- .../node-runtime-worker-thread/package.json | 2 +- .../src/index.spec.ts | 2 +- .../node-runtime-worker-thread/src/index.ts | 2 +- .../src/serializer.spec.ts | 2 +- .../src/serializer.ts | 2 +- .../src/worker-runtime.ts | 2 +- .../.depcheckrc | 0 .../.eslintignore | 0 .../.eslintrc.js | 0 .../.gitignore | 0 .../.prettierignore | 0 .../.prettierrc.json | 0 .../AUTHORS | 0 .../LICENSE | 0 .../package.json | 2 +- .../src/compass/compass-service-provider.ts | 8 +- .../service-provider-node-driver/src/index.ts | 4 + .../src/mongodb-patches.spec.ts | 0 .../src/mongodb-patches.ts | 0 .../node-driver-provider.integration.spec.ts} | 42 +- .../src/node-driver-service-provider.spec.ts} | 146 ++-- .../src/node-driver-service-provider.ts} | 17 +- .../tsconfig-lint.json | 0 .../tsconfig.json | 0 packages/service-provider-server/src/index.ts | 4 - .../src/change-stream-cursor.spec.ts | 6 +- .../src/field-level-encryption.spec.ts | 4 +- packages/shell-api/src/helpers.spec.ts | 6 +- packages/shell-api/src/integration.spec.ts | 6 +- packages/shell-api/src/mongo.spec.ts | 4 +- packages/shell-api/src/replica-set.spec.ts | 10 +- packages/shell-api/src/session.spec.ts | 6 +- packages/shell-api/src/shard.spec.ts | 12 +- 44 files changed, 569 insertions(+), 484 deletions(-) rename packages/{service-provider-server => service-provider-node-driver}/.depcheckrc (100%) rename packages/{service-provider-server => service-provider-node-driver}/.eslintignore (100%) rename packages/{service-provider-server => service-provider-node-driver}/.eslintrc.js (100%) rename packages/{service-provider-server => service-provider-node-driver}/.gitignore (100%) rename packages/{service-provider-server => service-provider-node-driver}/.prettierignore (100%) rename packages/{service-provider-server => service-provider-node-driver}/.prettierrc.json (100%) rename packages/{service-provider-server => service-provider-node-driver}/AUTHORS (100%) rename packages/{service-provider-server => service-provider-node-driver}/LICENSE (100%) rename packages/{service-provider-server => service-provider-node-driver}/package.json (97%) rename packages/{service-provider-server => service-provider-node-driver}/src/compass/compass-service-provider.ts (79%) create mode 100644 packages/service-provider-node-driver/src/index.ts rename packages/{service-provider-server => service-provider-node-driver}/src/mongodb-patches.spec.ts (100%) rename packages/{service-provider-server => service-provider-node-driver}/src/mongodb-patches.ts (100%) rename packages/{service-provider-server/src/cli-service-provider.integration.spec.ts => service-provider-node-driver/src/node-driver-provider.integration.spec.ts} (94%) rename packages/{service-provider-server/src/cli-service-provider.spec.ts => service-provider-node-driver/src/node-driver-service-provider.spec.ts} (90%) rename packages/{service-provider-server/src/cli-service-provider.ts => service-provider-node-driver/src/node-driver-service-provider.ts} (99%) rename packages/{service-provider-server => service-provider-node-driver}/tsconfig-lint.json (100%) rename packages/{service-provider-server => service-provider-node-driver}/tsconfig.json (100%) delete mode 100644 packages/service-provider-server/src/index.ts diff --git a/.evergreen.yml b/.evergreen.yml index 895ca6cb8..f35a98c84 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -1190,8 +1190,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1199,13 +1199,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1213,13 +1213,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1227,13 +1227,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1241,13 +1241,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1255,13 +1255,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1269,13 +1269,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1283,13 +1283,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1297,13 +1297,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1311,13 +1311,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1325,13 +1325,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1339,13 +1339,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1353,13 +1353,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1367,13 +1367,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1381,7 +1381,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -3374,8 +3374,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3383,13 +3383,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3397,13 +3397,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3411,13 +3411,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3425,13 +3425,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3439,13 +3439,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3453,13 +3453,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3467,13 +3467,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3481,13 +3481,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3495,13 +3495,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3509,13 +3509,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3523,13 +3523,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3537,13 +3537,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3551,13 +3551,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3565,13 +3565,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3579,13 +3579,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3593,13 +3593,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3607,13 +3607,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3621,13 +3621,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3635,13 +3635,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3649,13 +3649,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3663,13 +3663,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3677,13 +3677,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3691,13 +3691,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3705,7 +3705,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -5586,8 +5586,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5595,13 +5595,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5609,13 +5609,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5623,13 +5623,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5637,13 +5637,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5651,13 +5651,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5665,13 +5665,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5679,13 +5679,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5693,13 +5693,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5707,13 +5707,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5721,13 +5721,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5735,13 +5735,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5749,13 +5749,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5763,13 +5763,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5777,13 +5777,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5791,13 +5791,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5805,13 +5805,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5819,13 +5819,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5833,13 +5833,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5847,13 +5847,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5861,13 +5861,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5875,13 +5875,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5889,13 +5889,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5903,13 +5903,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5917,13 +5917,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5931,13 +5931,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5945,7 +5945,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -9991,7 +9991,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_service_provider_core" mongosh_run_only_in_package: "service-provider-core" - - name: test_m42xc_n20_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10006,9 +10006,9 @@ tasks: mongosh_server_test_version: "4.2.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xe_n20_service_provider_server + mongosh_test_id: "m42xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10023,9 +10023,9 @@ tasks: mongosh_server_test_version: "4.2.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xc_n20_service_provider_server + mongosh_test_id: "m42xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10040,9 +10040,9 @@ tasks: mongosh_server_test_version: "4.4.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xe_n20_service_provider_server + mongosh_test_id: "m44xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10057,9 +10057,9 @@ tasks: mongosh_server_test_version: "4.4.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xc_n20_service_provider_server + mongosh_test_id: "m44xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10074,9 +10074,9 @@ tasks: mongosh_server_test_version: "5.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xe_n20_service_provider_server + mongosh_test_id: "m50xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10091,9 +10091,9 @@ tasks: mongosh_server_test_version: "5.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xc_n20_service_provider_server + mongosh_test_id: "m50xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10108,9 +10108,9 @@ tasks: mongosh_server_test_version: "6.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xe_n20_service_provider_server + mongosh_test_id: "m60xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10125,9 +10125,9 @@ tasks: mongosh_server_test_version: "6.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xc_n20_service_provider_server + mongosh_test_id: "m60xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10142,9 +10142,9 @@ tasks: mongosh_server_test_version: "7.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xe_n20_service_provider_server + mongosh_test_id: "m70xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10159,9 +10159,9 @@ tasks: mongosh_server_test_version: "7.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xc_n20_service_provider_server + mongosh_test_id: "m70xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10176,9 +10176,9 @@ tasks: mongosh_server_test_version: "8.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xe_n20_service_provider_server + mongosh_test_id: "m80xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10193,9 +10193,9 @@ tasks: mongosh_server_test_version: "8.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_mlatest_n20_service_provider_server + mongosh_test_id: "m80xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_mlatest_n20_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: - name: compile_ts @@ -10210,9 +10210,9 @@ tasks: mongosh_server_test_version: "latest-alpha-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "mlatest_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xc_n16_service_provider_server + mongosh_test_id: "mlatest_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10227,9 +10227,9 @@ tasks: mongosh_server_test_version: "4.2.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xe_n16_service_provider_server + mongosh_test_id: "m42xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10244,9 +10244,9 @@ tasks: mongosh_server_test_version: "4.2.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xc_n16_service_provider_server + mongosh_test_id: "m42xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10261,9 +10261,9 @@ tasks: mongosh_server_test_version: "4.4.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xe_n16_service_provider_server + mongosh_test_id: "m44xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10278,9 +10278,9 @@ tasks: mongosh_server_test_version: "4.4.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xc_n16_service_provider_server + mongosh_test_id: "m44xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10295,9 +10295,9 @@ tasks: mongosh_server_test_version: "5.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xe_n16_service_provider_server + mongosh_test_id: "m50xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10312,9 +10312,9 @@ tasks: mongosh_server_test_version: "5.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xc_n16_service_provider_server + mongosh_test_id: "m50xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10329,9 +10329,9 @@ tasks: mongosh_server_test_version: "6.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xe_n16_service_provider_server + mongosh_test_id: "m60xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10346,9 +10346,9 @@ tasks: mongosh_server_test_version: "6.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xc_n16_service_provider_server + mongosh_test_id: "m60xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10363,9 +10363,9 @@ tasks: mongosh_server_test_version: "7.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xe_n16_service_provider_server + mongosh_test_id: "m70xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10380,9 +10380,9 @@ tasks: mongosh_server_test_version: "7.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xc_n16_service_provider_server + mongosh_test_id: "m70xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10397,9 +10397,9 @@ tasks: mongosh_server_test_version: "8.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xe_n16_service_provider_server + mongosh_test_id: "m80xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10414,9 +10414,9 @@ tasks: mongosh_server_test_version: "8.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_mlatest_n16_service_provider_server + mongosh_test_id: "m80xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_mlatest_n16_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: - name: compile_ts @@ -10431,8 +10431,8 @@ tasks: mongosh_server_test_version: "latest-alpha-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "mlatest_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" + mongosh_test_id: "mlatest_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" - name: test_m42xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -16445,20 +16445,20 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m60xc_n20_shell_api - name: test_m60xe_n20_shell_api - name: test_m70xc_n20_shell_api @@ -16629,30 +16629,30 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m42xc_n20_service_provider_server - - name: test_m44xc_n20_service_provider_server - - name: test_m44xe_n20_service_provider_server - - name: test_m50xc_n20_service_provider_server - - name: test_m50xe_n20_service_provider_server - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m42xc_n16_service_provider_server - - name: test_m44xc_n16_service_provider_server - - name: test_m44xe_n16_service_provider_server - - name: test_m50xc_n16_service_provider_server - - name: test_m50xe_n16_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver + - name: test_m44xc_n20_service_provider_node_driver + - name: test_m44xe_n20_service_provider_node_driver + - name: test_m50xc_n20_service_provider_node_driver + - name: test_m50xe_n20_service_provider_node_driver + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m42xc_n16_service_provider_node_driver + - name: test_m44xc_n16_service_provider_node_driver + - name: test_m44xe_n16_service_provider_node_driver + - name: test_m50xc_n16_service_provider_node_driver + - name: test_m50xe_n16_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m42xc_n20_shell_api - name: test_m44xc_n20_shell_api - name: test_m44xe_n20_shell_api @@ -17203,32 +17203,32 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m42xc_n20_service_provider_server - - name: test_m42xe_n20_service_provider_server - - name: test_m44xc_n20_service_provider_server - - name: test_m44xe_n20_service_provider_server - - name: test_m50xc_n20_service_provider_server - - name: test_m50xe_n20_service_provider_server - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m42xc_n16_service_provider_server - - name: test_m42xe_n16_service_provider_server - - name: test_m44xc_n16_service_provider_server - - name: test_m44xe_n16_service_provider_server - - name: test_m50xc_n16_service_provider_server - - name: test_m50xe_n16_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver + - name: test_m42xe_n20_service_provider_node_driver + - name: test_m44xc_n20_service_provider_node_driver + - name: test_m44xe_n20_service_provider_node_driver + - name: test_m50xc_n20_service_provider_node_driver + - name: test_m50xe_n20_service_provider_node_driver + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m42xc_n16_service_provider_node_driver + - name: test_m42xe_n16_service_provider_node_driver + - name: test_m44xc_n16_service_provider_node_driver + - name: test_m44xe_n16_service_provider_node_driver + - name: test_m50xc_n16_service_provider_node_driver + - name: test_m50xe_n16_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m42xc_n20_shell_api - name: test_m42xe_n20_shell_api - name: test_m44xc_n20_shell_api diff --git a/package-lock.json b/package-lock.json index 3fc63358e..2e0a59245 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "packages/logging", "packages/service-provider-core", "packages/arg-parser", - "packages/service-provider-server", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", @@ -6599,8 +6599,8 @@ "resolved": "packages/service-provider-core", "link": true }, - "node_modules/@mongosh/service-provider-server": { - "resolved": "packages/service-provider-server", + "node_modules/@mongosh/service-provider-node-driver": { + "resolved": "packages/service-provider-node-driver", "link": true }, "node_modules/@mongosh/shell-api": { @@ -31198,7 +31198,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -31289,7 +31289,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", @@ -31718,7 +31718,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", @@ -31759,9 +31759,42 @@ "mongodb-client-encryption": "^6.1.0" } }, + "packages/service-provider-node-driver": { + "name": "@mongosh/service-provider-node-driver", + "version": "0.0.0-dev.0", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.0", + "@mongodb-js/oidc-plugin": "^1.1.1", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", + "aws4": "^1.12.0", + "mongodb": "^6.9.0", + "mongodb-connection-string-url": "^3.0.1", + "socks": "^2.8.3" + }, + "devDependencies": { + "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/prettier-config-devtools": "^1.0.1", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@types/sinon-chai": "^3.2.4", + "depcheck": "^1.4.7", + "eslint": "^7.25.0", + "prettier": "^2.8.8" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "kerberos": "2.1.0", + "mongodb-client-encryption": "^6.1.0" + } + }, "packages/service-provider-server": { "name": "@mongosh/service-provider-server", "version": "0.0.0-dev.0", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.0", @@ -37238,7 +37271,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", @@ -37323,7 +37356,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", @@ -37593,7 +37626,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", @@ -37625,8 +37658,8 @@ "prettier": "^2.8.8" } }, - "@mongosh/service-provider-server": { - "version": "file:packages/service-provider-server", + "@mongosh/service-provider-node-driver": { + "version": "file:packages/service-provider-node-driver", "requires": { "@mongodb-js/devtools-connect": "^3.3.0", "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/package.json b/package.json index abb343dee..c46657fed 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "packages/logging", "packages/service-provider-core", "packages/arg-parser", - "packages/service-provider-server", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 7be04ec3e..5a77f920b 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", diff --git a/packages/browser-runtime-electron/src/electron-runtime.spec.ts b/packages/browser-runtime-electron/src/electron-runtime.spec.ts index f9645b7d0..2465265a3 100644 --- a/packages/browser-runtime-electron/src/electron-runtime.spec.ts +++ b/packages/browser-runtime-electron/src/electron-runtime.spec.ts @@ -5,20 +5,20 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); const { expect } = chai; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; import { bson } from '@mongosh/service-provider-core'; import { ElectronRuntime } from './electron-runtime'; import { EventEmitter } from 'events'; import type { RuntimeEvaluationListener } from '@mongosh/browser-runtime-core'; describe('Electron runtime', function () { - let serviceProvider: SinonStubbedInstance; + let serviceProvider: SinonStubbedInstance; let messageBus: SinonStubbedInstance; let evaluationListener: SinonStubbedInstance; let electronRuntime: ElectronRuntime; beforeEach(function () { - serviceProvider = sinon.createStubInstance(CliServiceProvider); + serviceProvider = sinon.createStubInstance(NodeDriverServiceProvider); serviceProvider.bsonLibrary = bson; serviceProvider.getConnectionInfo.resolves({ extraInfo: { uri: '' }, diff --git a/packages/build/src/compile/signable-compiler.ts b/packages/build/src/compile/signable-compiler.ts index cf591129a..c7cab80ff 100644 --- a/packages/build/src/compile/signable-compiler.ts +++ b/packages/build/src/compile/signable-compiler.ts @@ -10,7 +10,7 @@ import { compileJSFileAsBinary } from 'boxednode'; async function preCompileHook(nodeSourceTree: string) { const fleAddonVersion = require(path.join( await findModulePath( - 'service-provider-server', + 'service-provider-node-driver', 'mongodb-client-encryption' ), 'package.json' @@ -108,17 +108,20 @@ export class SignableCompiler { async compile(): Promise { const fleAddon = { path: await findModulePath( - 'service-provider-server', + 'service-provider-node-driver', 'mongodb-client-encryption' ), requireRegexp: /\bmongocrypt\.node$/, }; const kerberosAddon = { - path: await findModulePath('service-provider-server', 'kerberos'), + path: await findModulePath('service-provider-node-driver', 'kerberos'), requireRegexp: /\bkerberos\.node$/, }; const osDnsAddon = { - path: await findModulePath('service-provider-server', 'os-dns-native'), + path: await findModulePath( + 'service-provider-node-driver', + 'os-dns-native' + ), requireRegexp: /\bos_dns_native\.node$/, }; const cryptLibraryVersionAddon = { @@ -130,7 +133,7 @@ export class SignableCompiler { requireRegexp: /\bglibc_version\.node$/, }; // Warning! Until https://jira.mongodb.org/browse/MONGOSH-990, - // packages/service-provider-server *also* has a copy of these. + // packages/service-provider-node-driver *also* has a copy of these. // We use the versions included in packages/cli-repl here, so these // should be kept in sync! const winCAAddon = diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 3dc9c2af3..9f3dbb40f 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -71,7 +71,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", diff --git a/packages/cli-repl/src/build-info.ts b/packages/cli-repl/src/build-info.ts index 650f69245..99c138a4c 100644 --- a/packages/cli-repl/src/build-info.ts +++ b/packages/cli-repl/src/build-info.ts @@ -1,5 +1,5 @@ import os from 'os'; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; export interface BuildInfo { version: string; @@ -16,7 +16,7 @@ export interface BuildInfo { sharedOpenssl: boolean; segmentApiKey?: string; runtimeGlibcVersion: string; - deps: ReturnType; + deps: ReturnType; } function getSystemArch(): (typeof process)['arch'] { @@ -79,7 +79,7 @@ export async function buildInfo({ withSegmentApiKey?: boolean; } = {}): Promise { const dependencyVersionInfo: BuildInfo['deps'] = { - ...CliServiceProvider.getVersionInformation(), + ...NodeDriverServiceProvider.getVersionInformation(), }; const buildInfo = { ...baseBuildInfo(), deps: { ...dependencyVersionInfo } }; diff --git a/packages/cli-repl/src/cli-repl.spec.ts b/packages/cli-repl/src/cli-repl.spec.ts index 37b1a24bf..a63894311 100644 --- a/packages/cli-repl/src/cli-repl.spec.ts +++ b/packages/cli-repl/src/cli-repl.spec.ts @@ -29,7 +29,7 @@ import ConnectionString from 'mongodb-connection-string-url'; import type { CliReplOptions } from './cli-repl'; import { CliRepl } from './cli-repl'; import { CliReplErrors } from './error-codes'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; import type { AddressInfo } from 'net'; const { EJSON } = bson; diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index db97e18de..e69350f6d 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -7,7 +7,7 @@ import { redactURICredentials } from '@mongosh/history'; import i18n from '@mongosh/i18n'; import type { AutoEncryptionOptions } from '@mongosh/service-provider-core'; import { bson } from '@mongosh/service-provider-core'; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; import type { CliOptions, DevtoolsConnectOptions } from '@mongosh/arg-parser'; import { SnippetManager } from '@mongosh/snippet-manager'; import { Editor } from '@mongosh/editor'; @@ -829,7 +829,7 @@ export class CliRepl implements MongoshIOProvider { async connect( driverUri: string, driverOptions: DevtoolsConnectOptions - ): Promise { + ): Promise { const { quiet } = CliRepl.getFileAndEvalInfo(this.cliOptions); if (!this.cliOptions.nodb && !quiet) { this.output.write( @@ -839,7 +839,7 @@ export class CliRepl implements MongoshIOProvider { '\n' ); } - return await CliServiceProvider.connect( + return await NodeDriverServiceProvider.connect( driverUri, driverOptions, this.cliOptions, diff --git a/packages/i18n/src/locales/en_US.ts b/packages/i18n/src/locales/en_US.ts index 0da1ae248..5272483c2 100644 --- a/packages/i18n/src/locales/en_US.ts +++ b/packages/i18n/src/locales/en_US.ts @@ -128,7 +128,7 @@ const translations: Catalog = { }, 'service-provider-browser': {}, 'service-provider-core': {}, - 'service-provider-server': {}, + 'service-provider-node-driver': {}, 'shell-api': { classes: { ShellApi: { diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index c6c1d7e64..e162cf72a 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -40,7 +40,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", diff --git a/packages/node-runtime-worker-thread/src/index.spec.ts b/packages/node-runtime-worker-thread/src/index.spec.ts index a1aa5e909..88b626c03 100644 --- a/packages/node-runtime-worker-thread/src/index.spec.ts +++ b/packages/node-runtime-worker-thread/src/index.spec.ts @@ -5,7 +5,7 @@ import type { MongoshBus } from '@mongosh/types'; import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { WorkerRuntime } from '../dist/index'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; export const dummyOptions: DevtoolsConnectOptions = Object.freeze({ productName: 'Test Product', diff --git a/packages/node-runtime-worker-thread/src/index.ts b/packages/node-runtime-worker-thread/src/index.ts index 5c417977c..e3bff7288 100644 --- a/packages/node-runtime-worker-thread/src/index.ts +++ b/packages/node-runtime-worker-thread/src/index.ts @@ -17,7 +17,7 @@ import { deserializeEvaluationResult, serializeConnectOptions, } from './serializer'; -import type { CompassServiceProvider } from '@mongosh/service-provider-server'; +import type { CompassServiceProvider } from '@mongosh/service-provider-node-driver'; import type { InterruptHandle } from 'interruptor'; import { interrupt as nativeInterrupt } from 'interruptor'; import { WorkerThreadEvaluationListener } from './worker-thread-evaluation-listener'; diff --git a/packages/node-runtime-worker-thread/src/serializer.spec.ts b/packages/node-runtime-worker-thread/src/serializer.spec.ts index 0b956b35d..e0a5f763c 100644 --- a/packages/node-runtime-worker-thread/src/serializer.spec.ts +++ b/packages/node-runtime-worker-thread/src/serializer.spec.ts @@ -1,4 +1,4 @@ -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server/lib/cli-service-provider'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; import { expect } from 'chai'; import { UUID, Long } from 'bson'; import { diff --git a/packages/node-runtime-worker-thread/src/serializer.ts b/packages/node-runtime-worker-thread/src/serializer.ts index d4b6f6b2f..3453fb6d6 100644 --- a/packages/node-runtime-worker-thread/src/serializer.ts +++ b/packages/node-runtime-worker-thread/src/serializer.ts @@ -1,7 +1,7 @@ import { inspect } from 'util'; import { EJSON } from 'bson'; import type { RuntimeEvaluationResult } from '@mongosh/browser-runtime-core'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; function isPrimitive( val: any diff --git a/packages/node-runtime-worker-thread/src/worker-runtime.ts b/packages/node-runtime-worker-thread/src/worker-runtime.ts index 8176ca4fa..e46f50ed5 100644 --- a/packages/node-runtime-worker-thread/src/worker-runtime.ts +++ b/packages/node-runtime-worker-thread/src/worker-runtime.ts @@ -9,7 +9,7 @@ import type { } from '@mongosh/browser-runtime-core'; import { ElectronRuntime } from '@mongosh/browser-runtime-electron'; import type { ServiceProvider } from '@mongosh/service-provider-core'; -import { CompassServiceProvider } from '@mongosh/service-provider-server'; +import { CompassServiceProvider } from '@mongosh/service-provider-node-driver'; import { exposeAll, createCaller } from './rpc'; import { serializeEvaluationResult, diff --git a/packages/service-provider-server/.depcheckrc b/packages/service-provider-node-driver/.depcheckrc similarity index 100% rename from packages/service-provider-server/.depcheckrc rename to packages/service-provider-node-driver/.depcheckrc diff --git a/packages/service-provider-server/.eslintignore b/packages/service-provider-node-driver/.eslintignore similarity index 100% rename from packages/service-provider-server/.eslintignore rename to packages/service-provider-node-driver/.eslintignore diff --git a/packages/service-provider-server/.eslintrc.js b/packages/service-provider-node-driver/.eslintrc.js similarity index 100% rename from packages/service-provider-server/.eslintrc.js rename to packages/service-provider-node-driver/.eslintrc.js diff --git a/packages/service-provider-server/.gitignore b/packages/service-provider-node-driver/.gitignore similarity index 100% rename from packages/service-provider-server/.gitignore rename to packages/service-provider-node-driver/.gitignore diff --git a/packages/service-provider-server/.prettierignore b/packages/service-provider-node-driver/.prettierignore similarity index 100% rename from packages/service-provider-server/.prettierignore rename to packages/service-provider-node-driver/.prettierignore diff --git a/packages/service-provider-server/.prettierrc.json b/packages/service-provider-node-driver/.prettierrc.json similarity index 100% rename from packages/service-provider-server/.prettierrc.json rename to packages/service-provider-node-driver/.prettierrc.json diff --git a/packages/service-provider-server/AUTHORS b/packages/service-provider-node-driver/AUTHORS similarity index 100% rename from packages/service-provider-server/AUTHORS rename to packages/service-provider-node-driver/AUTHORS diff --git a/packages/service-provider-server/LICENSE b/packages/service-provider-node-driver/LICENSE similarity index 100% rename from packages/service-provider-server/LICENSE rename to packages/service-provider-node-driver/LICENSE diff --git a/packages/service-provider-server/package.json b/packages/service-provider-node-driver/package.json similarity index 97% rename from packages/service-provider-server/package.json rename to packages/service-provider-node-driver/package.json index 4eced5a8b..633c7c810 100644 --- a/packages/service-provider-server/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,5 +1,5 @@ { - "name": "@mongosh/service-provider-server", + "name": "@mongosh/service-provider-node-driver", "version": "0.0.0-dev.0", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", diff --git a/packages/service-provider-server/src/compass/compass-service-provider.ts b/packages/service-provider-node-driver/src/compass/compass-service-provider.ts similarity index 79% rename from packages/service-provider-server/src/compass/compass-service-provider.ts rename to packages/service-provider-node-driver/src/compass/compass-service-provider.ts index 41153a645..bb87f3ae6 100644 --- a/packages/service-provider-server/src/compass/compass-service-provider.ts +++ b/packages/service-provider-node-driver/src/compass/compass-service-provider.ts @@ -1,5 +1,5 @@ -import type { DevtoolsConnectOptions } from '../cli-service-provider'; -import CliServiceProvider from '../cli-service-provider'; +import type { DevtoolsConnectOptions } from '../node-driver-service-provider'; +import { NodeDriverServiceProvider } from '../node-driver-service-provider'; import type { MongoClient } from 'mongodb'; import type { ReplPlatform } from '@mongosh/service-provider-core'; import type ConnectionString from 'mongodb-connection-string-url'; @@ -8,7 +8,7 @@ import type { EventEmitter } from 'events'; /** * A service provider that is meant to be used in compass. */ -class CompassServiceProvider extends CliServiceProvider { +export class CompassServiceProvider extends NodeDriverServiceProvider { public readonly platform: ReplPlatform; /** * Instantiate a new CompassServiceProvider with the data-service's connected @@ -28,5 +28,3 @@ class CompassServiceProvider extends CliServiceProvider { this.platform = 'Compass'; } } - -export default CompassServiceProvider; diff --git a/packages/service-provider-node-driver/src/index.ts b/packages/service-provider-node-driver/src/index.ts new file mode 100644 index 000000000..2d6ba2543 --- /dev/null +++ b/packages/service-provider-node-driver/src/index.ts @@ -0,0 +1,4 @@ +import { NodeDriverServiceProvider } from './node-driver-service-provider'; +import { CompassServiceProvider } from './compass/compass-service-provider'; +export type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect'; +export { NodeDriverServiceProvider, CompassServiceProvider }; diff --git a/packages/service-provider-server/src/mongodb-patches.spec.ts b/packages/service-provider-node-driver/src/mongodb-patches.spec.ts similarity index 100% rename from packages/service-provider-server/src/mongodb-patches.spec.ts rename to packages/service-provider-node-driver/src/mongodb-patches.spec.ts diff --git a/packages/service-provider-server/src/mongodb-patches.ts b/packages/service-provider-node-driver/src/mongodb-patches.ts similarity index 100% rename from packages/service-provider-server/src/mongodb-patches.ts rename to packages/service-provider-node-driver/src/mongodb-patches.ts diff --git a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts b/packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts similarity index 94% rename from packages/service-provider-server/src/cli-service-provider.integration.spec.ts rename to packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts index eab0d25d7..ef55af294 100644 --- a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts +++ b/packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts @@ -1,6 +1,6 @@ -import type { DropDatabaseResult } from './cli-service-provider'; -import CliServiceProvider from './cli-service-provider'; -import CompassServiceProvider from './compass/compass-service-provider'; +import type { DropDatabaseResult } from './node-driver-service-provider'; +import { NodeDriverServiceProvider } from './node-driver-service-provider'; +import { CompassServiceProvider } from './compass/compass-service-provider'; import { expect } from 'chai'; import { EventEmitter } from 'events'; import { MongoClient } from 'mongodb'; @@ -24,12 +24,12 @@ import type { MongoClientOptions, } from '@mongosh/service-provider-core'; import ConnectionString from 'mongodb-connection-string-url'; -import { dummyOptions } from './cli-service-provider.spec'; +import { dummyOptions } from './node-driver-service-provider.spec'; -describe('CliServiceProvider [integration]', function () { +describe('NodeDriverServiceProvider [integration]', function () { const testServer = startSharedTestServer(); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let client: MongoClient; let dbName: string; let db: Db; @@ -46,7 +46,7 @@ describe('CliServiceProvider [integration]', function () { dbName = `test-db-${Date.now()}`; db = client.db(dbName); bus = new EventEmitter(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( client, bus, dummyOptions, @@ -59,9 +59,9 @@ describe('CliServiceProvider [integration]', function () { }); describe('.connect', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; beforeEach(async function () { - instance = await CliServiceProvider.connect( + instance = await NodeDriverServiceProvider.connect( connectionString, dummyOptions, {}, @@ -73,13 +73,13 @@ describe('CliServiceProvider [integration]', function () { await instance.close(true); }); - it('returns a CliServiceProvider', function () { - expect(instance).to.be.instanceOf(CliServiceProvider); + it('returns a NodeDriverServiceProvider', function () { + expect(instance).to.be.instanceOf(NodeDriverServiceProvider); }); }); describe('.getNewConnection', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; beforeEach(async function () { instance = await serviceProvider.getNewConnection(connectionString); @@ -89,17 +89,17 @@ describe('CliServiceProvider [integration]', function () { await instance.close(true); }); - it('returns a CliServiceProvider', function () { - expect(instance).to.be.instanceOf(CliServiceProvider); + it('returns a NodeDriverServiceProvider', function () { + expect(instance).to.be.instanceOf(NodeDriverServiceProvider); }); - it('differs from the original CliServiceProvider', function () { + it('differs from the original NodeDriverServiceProvider', function () { expect(instance).to.not.equal(serviceProvider); }); }); describe('.suspend', function () { - it('allows disconnecting and reconnecting the CliServiceProvider', async function () { + it('allows disconnecting and reconnecting the NodeDriverServiceProvider', async function () { await serviceProvider.runCommandWithCheck('admin', { ping: 1 }); const reconnect = await serviceProvider.suspend(); try { @@ -155,7 +155,7 @@ describe('CliServiceProvider [integration]', function () { describe('.getConnectionInfo', function () { context('when a uri has been passed', function () { it("returns the connection's info", async function () { - const instance = new CliServiceProvider( + const instance = new NodeDriverServiceProvider( client, bus, dummyOptions, @@ -174,7 +174,11 @@ describe('CliServiceProvider [integration]', function () { context('when the optional uri has not been passed', function () { it("returns the connection's info", async function () { - const instance = new CliServiceProvider(client, bus, dummyOptions); + const instance = new NodeDriverServiceProvider( + client, + bus, + dummyOptions + ); const connectionInfo = await instance.getConnectionInfo(); expect(Object.keys(connectionInfo)).to.deep.equal([ @@ -816,7 +820,7 @@ describe('CliServiceProvider [integration]', function () { }); describe('CompassServiceProvider', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; afterEach(async function () { await instance?.close(true); diff --git a/packages/service-provider-server/src/cli-service-provider.spec.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts similarity index 90% rename from packages/service-provider-server/src/cli-service-provider.spec.ts rename to packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts index f295ba9ac..0d73b4499 100644 --- a/packages/service-provider-server/src/cli-service-provider.spec.ts +++ b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts @@ -5,8 +5,8 @@ import { Collection, Db, MongoClient } from 'mongodb'; import sinonChai from 'sinon-chai'; import type { StubbedInstance } from 'ts-sinon'; import sinon, { stubInterface } from 'ts-sinon'; -import type { DevtoolsConnectOptions } from './cli-service-provider'; -import CliServiceProvider from './cli-service-provider'; +import type { DevtoolsConnectOptions } from './node-driver-service-provider'; +import { NodeDriverServiceProvider } from './node-driver-service-provider'; import ConnectionString from 'mongodb-connection-string-url'; import { EventEmitter } from 'events'; import type { @@ -47,21 +47,29 @@ const createClientStub = ( return clientStub; }; -describe('CliServiceProvider', function () { - let serviceProvider: CliServiceProvider; +describe('NodeDriverServiceProvider', function () { + let serviceProvider: NodeDriverServiceProvider; let collectionStub: StubbedInstance; let bus: EventEmitter; beforeEach(function () { bus = new EventEmitter(); collectionStub = stubInterface(); - serviceProvider = new CliServiceProvider({} as any, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + {} as any, + bus, + dummyOptions + ); }); describe('#constructor', function () { const mongoClient: any = sinon.spy(); beforeEach(function () { - serviceProvider = new CliServiceProvider(mongoClient, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + mongoClient, + bus, + dummyOptions + ); }); it('sets the mongo client on the instance', function () { @@ -78,7 +86,7 @@ describe('CliServiceProvider', function () { collectionStub.aggregate.returns({ toArray: () => Promise.resolve(aggResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -100,7 +108,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.bulkWrite.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -124,7 +132,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.countDocuments.resolves(countResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -144,7 +152,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.deleteMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -164,7 +172,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.deleteOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -184,7 +192,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.distinct.resolves(distinctResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -208,7 +216,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.estimatedDocumentCount.resolves(countResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -236,7 +244,7 @@ describe('CliServiceProvider', function () { collectionStub.find.returns({ toArray: () => Promise.resolve(findResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -265,7 +273,7 @@ describe('CliServiceProvider', function () { collectionStub.find.returns({ toArray: () => Promise.resolve(findResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -291,7 +299,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndDelete.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -317,7 +325,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndReplace.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -347,7 +355,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndUpdate.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -376,7 +384,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.insertMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -397,7 +405,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.insertOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -419,7 +427,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.replaceOne.resolves(commandResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -451,7 +459,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.command.resolves(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', async function () { @@ -471,7 +483,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.command.resolves(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database and throws if ok: 0', async function () { @@ -497,7 +513,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.runCursorCommand.returns(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', function () { @@ -519,7 +539,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.updateOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -546,7 +566,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.updateMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -574,7 +594,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('returns ok: 1 if dropped', async function () { @@ -624,7 +648,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.createIndexes.resolves(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -656,7 +680,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.listIndexes.returns(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -690,7 +714,11 @@ describe('CliServiceProvider', function () { }, } as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command', async function () { @@ -718,7 +746,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.renameCollection.resolves({ ok: 1 } as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', async function () { @@ -751,7 +783,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.createCollection.resolves({} as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command', async function () { @@ -791,7 +827,11 @@ describe('CliServiceProvider', function () { dbStub = stubInterface(); clientStub = stubInterface(); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); libmongoc = stubInterface(); }); @@ -827,12 +867,16 @@ describe('CliServiceProvider', function () { describe('sessions', function () { let clientStub: StubbedInstance; - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let db: StubbedInstance; let driverSession: ClientSession; beforeEach(function () { clientStub = stubInterface(); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); driverSession = { dSession: 1 } as any; clientStub.startSession.returns(driverSession); db = stubInterface(); @@ -889,7 +933,11 @@ describe('CliServiceProvider', function () { watch: watchMock as any, }) as any; - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes watch on MongoClient', function () { @@ -938,7 +986,7 @@ describe('CliServiceProvider', function () { }), }, }; - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -962,7 +1010,7 @@ describe('CliServiceProvider', function () { context('when connected to an Atlas deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -979,7 +1027,7 @@ describe('CliServiceProvider', function () { context('when connected to a DocumentDB deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -996,7 +1044,7 @@ describe('CliServiceProvider', function () { context('when connected to a CosmosDB deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -1014,7 +1062,7 @@ describe('CliServiceProvider', function () { // Security-relevant tests -- description covered in e2e-oidc tests. describe('processDriverOptions', function () { - it('shares user configuration options from an existing CliServiceProvider instance', function () { + it('shares user configuration options from an existing NodeDriverServiceProvider instance', function () { const cloneableOidcOptions = { redirectURI: 'http://localhost', openBrowser: { command: '/usr/bin/browser' }, @@ -1026,7 +1074,7 @@ describe('CliServiceProvider', function () { productName: 'test', }; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { currentClientOptions: { oidc: { @@ -1051,7 +1099,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1069,7 +1117,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1087,7 +1135,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1120,7 +1168,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.listSearchIndexes.returns(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1173,7 +1221,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.createSearchIndexes.resolves(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1201,7 +1249,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.dropSearchIndex.resolves(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1230,7 +1278,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.updateSearchIndex.resolves(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.ts similarity index 99% rename from packages/service-provider-server/src/cli-service-provider.ts rename to packages/service-provider-node-driver/src/node-driver-service-provider.ts index 328845315..559538677 100644 --- a/packages/service-provider-server/src/cli-service-provider.ts +++ b/packages/service-provider-node-driver/src/node-driver-service-provider.ts @@ -189,7 +189,7 @@ interface DependencyVersionInfo { /** * Encapsulates logic for the service provider for the mongosh CLI. */ -class CliServiceProvider +export class NodeDriverServiceProvider extends ServiceProviderCore implements ServiceProvider { @@ -203,12 +203,12 @@ class CliServiceProvider * @returns {Promise} The promise with cli service provider. */ static async connect( - this: typeof CliServiceProvider, + this: typeof NodeDriverServiceProvider, uri: string, driverOptions: DevtoolsConnectOptions, cliOptions: { nodb?: boolean } = {}, bus: MongoshBus = new EventEmitter() // TODO: Change VSCode to pass all arguments, then remove defaults - ): Promise { + ): Promise { const connectionString = new ConnectionString(uri || 'mongodb://nodb/'); const clientOptions = this.processDriverOptions( null, @@ -292,7 +292,7 @@ class CliServiceProvider private _lastSeenTopology: TopologyDescription | undefined; /** - * Instantiate a new CliServiceProvider with the Node driver's connected + * Instantiate a new NodeDriverServiceProvider with the Node driver's connected * MongoClient instance. * * @param {MongoClient} mongoClient - The Node drivers' MongoClient instance. @@ -418,7 +418,7 @@ class CliServiceProvider async getNewConnection( uri: string, options: Partial = {} - ): Promise { + ): Promise { const connectionString = new ConnectionString(uri); const clientOptions = this.processDriverOptions(connectionString, options); @@ -427,7 +427,7 @@ class CliServiceProvider clientOptions ); clientOptions.parentState = state; - return new CliServiceProvider( + return new NodeDriverServiceProvider( client, this.bus, clientOptions, @@ -1404,7 +1404,7 @@ class CliServiceProvider // Internal, only exposed for testing static processDriverOptions( - currentProviderInstance: CliServiceProvider | null, + currentProviderInstance: NodeDriverServiceProvider | null, uri: ConnectionString, opts: DevtoolsConnectOptions ): DevtoolsConnectOptions { @@ -1469,7 +1469,7 @@ class CliServiceProvider uri: ConnectionString, opts: Partial ): DevtoolsConnectOptions { - return CliServiceProvider.processDriverOptions(this, uri, { + return NodeDriverServiceProvider.processDriverOptions(this, uri, { productName: this.currentClientOptions.productName, productDocsLink: this.currentClientOptions.productDocsLink, ...opts, @@ -1533,5 +1533,4 @@ class CliServiceProvider } } -export default CliServiceProvider; export { DevtoolsConnectOptions }; diff --git a/packages/service-provider-server/tsconfig-lint.json b/packages/service-provider-node-driver/tsconfig-lint.json similarity index 100% rename from packages/service-provider-server/tsconfig-lint.json rename to packages/service-provider-node-driver/tsconfig-lint.json diff --git a/packages/service-provider-server/tsconfig.json b/packages/service-provider-node-driver/tsconfig.json similarity index 100% rename from packages/service-provider-server/tsconfig.json rename to packages/service-provider-node-driver/tsconfig.json diff --git a/packages/service-provider-server/src/index.ts b/packages/service-provider-server/src/index.ts deleted file mode 100644 index bdd49e343..000000000 --- a/packages/service-provider-server/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import CliServiceProvider from './cli-service-provider'; -import CompassServiceProvider from './compass/compass-service-provider'; -export type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect'; -export { CliServiceProvider, CompassServiceProvider }; diff --git a/packages/shell-api/src/change-stream-cursor.spec.ts b/packages/shell-api/src/change-stream-cursor.spec.ts index 368f74c59..83fd198e0 100644 --- a/packages/shell-api/src/change-stream-cursor.spec.ts +++ b/packages/shell-api/src/change-stream-cursor.spec.ts @@ -13,7 +13,7 @@ import { } from './enums'; import type { ChangeStream, Document } from '@mongosh/service-provider-core'; import { startTestCluster } from '../../../testing/integration-testing-hooks'; -import { CliServiceProvider } from '../../service-provider-server/lib'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import ShellInstanceState from './shell-instance-state'; import Mongo from './mongo'; import { ensureMaster, ensureResult } from '../test/helpers'; @@ -121,7 +121,7 @@ describe('ChangeStreamCursor', function () { const [srv0] = startTestCluster('change-stream-cursor', { topology: 'replset', }); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let mongo: Mongo; let db: Database; @@ -130,7 +130,7 @@ describe('ChangeStreamCursor', function () { before(async function () { this.timeout(100_000); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await srv0.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/field-level-encryption.spec.ts b/packages/shell-api/src/field-level-encryption.spec.ts index e2f12ca00..6225a036e 100644 --- a/packages/shell-api/src/field-level-encryption.spec.ts +++ b/packages/shell-api/src/field-level-encryption.spec.ts @@ -28,7 +28,7 @@ import type { ClientSideFieldLevelEncryptionOptions } from './field-level-encryp import { ClientEncryption, KeyVault } from './field-level-encryption'; import Mongo from './mongo'; import ShellInstanceState from './shell-instance-state'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { makeFakeHTTPConnection, @@ -762,7 +762,7 @@ describe('Field Level Encryption', function () { beforeEach(async function () { dbname = `test_fle_${Date.now()}`; uri = await testServer.connectionString(); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( uri, dummyOptions, {}, diff --git a/packages/shell-api/src/helpers.spec.ts b/packages/shell-api/src/helpers.spec.ts index b33cdae55..381c97b03 100644 --- a/packages/shell-api/src/helpers.spec.ts +++ b/packages/shell-api/src/helpers.spec.ts @@ -11,8 +11,8 @@ import { Database, Mongo, ShellInstanceState } from './index'; import constructShellBson from './shell-bson'; import type { ServiceProvider } from '@mongosh/service-provider-core'; import { bson } from '@mongosh/service-provider-core'; -import type { DevtoolsConnectOptions } from '../../service-provider-server'; -import { CliServiceProvider } from '../../service-provider-server'; // avoid cyclic dep just for test +import type { DevtoolsConnectOptions } from '../../service-provider-node-driver'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; // avoid cyclic dep just for test import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { makeFakeConfigDatabase } from '../test/shard-test-fake-data'; import sinon from 'ts-sinon'; @@ -134,7 +134,7 @@ describe('getPrintableShardStatus', function () { let inBalancerRound = false; beforeEach(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await testServer.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/integration.spec.ts b/packages/shell-api/src/integration.spec.ts index e759bc644..58f15ce4e 100644 --- a/packages/shell-api/src/integration.spec.ts +++ b/packages/shell-api/src/integration.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { CliServiceProvider } from '../../service-provider-server'; // avoid cyclic dep just for test +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; // avoid cyclic dep just for test import ShellInstanceState from './shell-instance-state'; import type Cursor from './cursor'; import Explainable from './explainable'; @@ -33,7 +33,7 @@ const compileExpr = (templ: TemplateStringsArray, ...subs: string[]): any => { describe('Shell API (integration)', function () { const testServer = startSharedTestServer(); this.timeout(60000); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; const getIndexNames = async ( dbName: string, @@ -209,7 +209,7 @@ describe('Shell API (integration)', function () { }; before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await testServer.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/mongo.spec.ts b/packages/shell-api/src/mongo.spec.ts index da3780fd4..dcbd6556a 100644 --- a/packages/shell-api/src/mongo.spec.ts +++ b/packages/shell-api/src/mongo.spec.ts @@ -29,7 +29,7 @@ import { MongoshInternalError, MongoshUnimplementedError, } from '@mongosh/errors'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { skipIfServerVersion, startSharedTestServer, @@ -967,7 +967,7 @@ describe('Mongo', function () { beforeEach(async function () { uri = await testServer.connectionString(); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( uri, dummyOptions, {}, diff --git a/packages/shell-api/src/replica-set.spec.ts b/packages/shell-api/src/replica-set.spec.ts index b2610d4e8..f03129b3c 100644 --- a/packages/shell-api/src/replica-set.spec.ts +++ b/packages/shell-api/src/replica-set.spec.ts @@ -22,7 +22,7 @@ import { startTestCluster, skipIfApiStrict, } from '../../../testing/integration-testing-hooks'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import Database from './database'; import { ADMIN_DB, @@ -830,7 +830,7 @@ describe('ReplicaSet', function () { let cfg: Partial; let additionalServer: MongodSetup; - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let db: Database; let rs: ReplicaSet; @@ -847,7 +847,7 @@ describe('ReplicaSet', function () { }; additionalServer = srv3; - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( `${await srv0.connectionString()}?directConnection=true`, dummyOptions, {}, @@ -1103,10 +1103,10 @@ describe('ReplicaSet', function () { { args: ['--replSet', replId] } ); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; beforeEach(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( `${await srv0.connectionString()}?directConnection=true`, dummyOptions, {}, diff --git a/packages/shell-api/src/session.spec.ts b/packages/shell-api/src/session.spec.ts index c6133100f..f3003caeb 100644 --- a/packages/shell-api/src/session.spec.ts +++ b/packages/shell-api/src/session.spec.ts @@ -18,7 +18,7 @@ import { ALL_SERVER_VERSIONS, ALL_TOPOLOGIES, } from './enums'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startTestCluster, skipIfServerVersion, @@ -178,7 +178,7 @@ describe('Session', function () { }); describe('integration', function () { const [srv0] = startTestCluster('session', { topology: 'replset' }); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let mongo: Mongo; let session: Session; @@ -194,7 +194,7 @@ describe('Session', function () { beforeEach(async function () { databaseName = `test-${Date.now()}`; - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await srv0.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts index c8ec6a3cd..9910c0496 100644 --- a/packages/shell-api/src/shard.spec.ts +++ b/packages/shell-api/src/shard.spec.ts @@ -23,7 +23,7 @@ import { bson } from '@mongosh/service-provider-core'; import { EventEmitter } from 'events'; import ShellInstanceState from './shell-instance-state'; import { UpdateResult } from './result'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startTestCluster, skipIfServerVersion, @@ -1986,7 +1986,7 @@ describe('Shard', function () { }); describe('integration', function () { - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let sh: Shard; const dbName = 'test'; @@ -2005,7 +2005,7 @@ describe('Shard', function () { ); before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), dummyOptions, {}, @@ -2065,7 +2065,7 @@ describe('Shard', function () { before(async function () { try { - apiStrictServiceProvider = await CliServiceProvider.connect( + apiStrictServiceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), { ...dummyOptions, @@ -2986,7 +2986,7 @@ describe('Shard', function () { }); describe('integration chunks', function () { - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let sh: Shard; const dbName = 'test'; @@ -3005,7 +3005,7 @@ describe('Shard', function () { ); before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), dummyOptions, {}, From 16b453eab33eb0f664928b62c35d43043b1f0c9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:42:14 +0000 Subject: [PATCH 30/39] chore: update auto-generated files (#2234) * chore: update THIRD_PARTY_NOTICES * chore: update AUTHORS --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 6 +++--- packages/service-provider-node-driver/AUTHORS | 20 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 1170815d7..2028f2231 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -91,7 +91,7 @@ Package|Version|License **[@mongosh/js-multiline-to-singleline](#2dcbeb51aa76c387d04422e84b56be8b65a87471bf5be038ca68d82f13a5d839)**|0.0.0-dev.0|Apache-2.0 **[@mongosh/logging](#a17a0e5de5551ca1d63cf325d510d17b6a0a1821718c63117a4dbccd2b1293e7)**|0.0.0-dev.0|Apache-2.0 **[@mongosh/service-provider-core](#b179d40f2285db3339c362199a8bc0598efaff1c4c727364e26b21325764e981)**|0.0.0-dev.0|Apache-2.0 -**[@mongosh/service-provider-server](#b512a107cca2856de34b86ca46809ec1b31a5d964d47102efd920074c19a86c7)**|0.0.0-dev.0|Apache-2.0 +**[@mongosh/service-provider-node-driver](#48f5e5df1f8b3f9562c58f987046b55160319224cf59e0ced75ab2037ecf0de3)**|0.0.0-dev.0|Apache-2.0 **[@mongosh/shell-api](#066d6484afa772c771ab73975e5fcac49bf481b96140400d853ecd0b2b9f3629)**|0.0.0-dev.0|Apache-2.0 **[@mongosh/shell-evaluator](#f2b3f8a68c8c280f279921c6fe4cc918d362f7f44cc9b2c52a8e26b75a5b4bb5)**|0.0.0-dev.0|Apache-2.0 **[@mongosh/snippet-manager](#006cfa776d20db3be61c3aa50333c13f27382e2b5a835f17fd767b3033ee8578)**|0.0.0-dev.0|Apache-2.0 @@ -9684,8 +9684,8 @@ License files: limitations under the License. - -### [@mongosh/service-provider-server](https://www.npmjs.com/package/@mongosh/service-provider-server) (version 0.0.0-dev.0) + +### [@mongosh/service-provider-node-driver](https://www.npmjs.com/package/@mongosh/service-provider-node-driver) (version 0.0.0-dev.0) License tags: Apache-2.0 License files: diff --git a/packages/service-provider-node-driver/AUTHORS b/packages/service-provider-node-driver/AUTHORS index a1daa2b1b..844477fad 100644 --- a/packages/service-provider-node-driver/AUTHORS +++ b/packages/service-provider-node-driver/AUTHORS @@ -1,21 +1 @@ -Durran Jordan -Maurizio Casimirri -Anna Herlihy -Massimiliano Marcon -Rhys Howell -Irina Shestak Anna Henningsen -Sergey Petushkov -Michael Rose -Alena Khineika -github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Alena Khineika -Denise <9276441+denise-sanders@users.noreply.github.com> -Le Roux Bodenstein -Leonardo Rossi -Himanshu Singh -Martin Rodriguez Reboredo -Basit <1305718+mabaasit@users.noreply.github.com> -Paula Stachova -Alena Khineika -Gagik Amaryan From bdf8d5526debc11ea280f1a9902e2ca17bc6da48 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Thu, 24 Oct 2024 12:24:56 +0200 Subject: [PATCH 31/39] feat(tests): Add individual evergreen test results with XUnit (#2227) Allows for individual testing results to be viewed and makes it easier to detect specific flaky tests with Foliage in the future. --- .evergreen.yml | 310 +++++++++++++++++- .evergreen/evergreen.yml.in | 12 +- .evergreen/run-e2e-tests.sh | 3 +- .gitignore | 2 + .logs/empty.xml | 3 + configs/mocha-config-mongosh/reporter.ts | 31 ++ packages/arg-parser/package.json | 2 +- packages/async-rewriter2/package.json | 2 +- packages/autocomplete/package.json | 2 +- packages/browser-runtime-core/package.json | 2 +- .../browser-runtime-electron/package.json | 2 +- packages/build/package.json | 2 +- packages/cli-repl/package.json | 2 +- packages/e2e-tests/package.json | 2 +- packages/editor/package.json | 2 +- packages/errors/package.json | 2 +- packages/history/package.json | 2 +- packages/i18n/package.json | 2 +- packages/java-shell/package.json | 2 +- .../js-multiline-to-singleline/package.json | 2 +- packages/logging/package.json | 2 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 2 +- .../service-provider-node-driver/package.json | 2 +- packages/shell-api/package.json | 2 +- packages/shell-evaluator/package.json | 2 +- packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- 28 files changed, 380 insertions(+), 25 deletions(-) create mode 100644 .logs/empty.xml create mode 100644 configs/mocha-config-mongosh/reporter.ts diff --git a/.evergreen.yml b/.evergreen.yml index f35a98c84..7d2ff0b9d 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -60,6 +60,9 @@ post: visibility: signed content_type: application/x-gzip optional: true + - command: attach.xunit_results + params: + file: src/.logs/*.xml # Functions are any command that can be run. @@ -194,6 +197,7 @@ functions: MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_run_only_in_package} AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} + TASK_NAME: ${task_name} - command: s3.put params: aws_key: ${aws_key} @@ -6618,7 +6622,7 @@ functions: AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl} - E2E_TASK_NAME: ${task_name} + TASK_NAME: ${task_name} ### # PACKAGING AND UPLOADING @@ -7288,6 +7292,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_arg_parser" mongosh_run_only_in_package: "arg-parser" + task_name: ${task_name} - name: test_n16_arg_parser tags: ["unit-test"] depends_on: @@ -7305,6 +7310,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_arg_parser" mongosh_run_only_in_package: "arg-parser" + task_name: ${task_name} - name: test_n20_async_rewriter2 tags: ["unit-test"] depends_on: @@ -7322,6 +7328,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_async_rewriter2" mongosh_run_only_in_package: "async-rewriter2" + task_name: ${task_name} - name: test_n16_async_rewriter2 tags: ["unit-test"] depends_on: @@ -7339,6 +7346,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_async_rewriter2" mongosh_run_only_in_package: "async-rewriter2" + task_name: ${task_name} - name: test_n20_autocomplete tags: ["unit-test"] depends_on: @@ -7356,6 +7364,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_autocomplete" mongosh_run_only_in_package: "autocomplete" + task_name: ${task_name} - name: test_n16_autocomplete tags: ["unit-test"] depends_on: @@ -7373,6 +7382,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_autocomplete" mongosh_run_only_in_package: "autocomplete" + task_name: ${task_name} - name: test_n20_browser_repl tags: ["unit-test"] depends_on: @@ -7390,6 +7400,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_browser_repl" mongosh_run_only_in_package: "browser-repl" + task_name: ${task_name} - name: test_n16_browser_repl tags: ["unit-test"] depends_on: @@ -7407,6 +7418,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_browser_repl" mongosh_run_only_in_package: "browser-repl" + task_name: ${task_name} - name: test_n20_browser_runtime_core tags: ["unit-test"] depends_on: @@ -7424,6 +7436,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_browser_runtime_core" mongosh_run_only_in_package: "browser-runtime-core" + task_name: ${task_name} - name: test_n16_browser_runtime_core tags: ["unit-test"] depends_on: @@ -7441,6 +7454,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_browser_runtime_core" mongosh_run_only_in_package: "browser-runtime-core" + task_name: ${task_name} - name: test_n20_browser_runtime_electron tags: ["unit-test"] depends_on: @@ -7458,6 +7472,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_browser_runtime_electron" mongosh_run_only_in_package: "browser-runtime-electron" + task_name: ${task_name} - name: test_n16_browser_runtime_electron tags: ["unit-test"] depends_on: @@ -7475,6 +7490,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_browser_runtime_electron" mongosh_run_only_in_package: "browser-runtime-electron" + task_name: ${task_name} - name: test_n20_build tags: ["unit-test"] depends_on: @@ -7492,6 +7508,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_build" mongosh_run_only_in_package: "build" + task_name: ${task_name} - name: test_n16_build tags: ["unit-test"] depends_on: @@ -7509,6 +7526,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_build" mongosh_run_only_in_package: "build" + task_name: ${task_name} - name: test_m42xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7526,6 +7544,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m42xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7543,6 +7562,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m44xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7560,6 +7580,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m44xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7577,6 +7598,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m50xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7594,6 +7616,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m50xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7611,6 +7634,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m60xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7628,6 +7652,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m60xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7645,6 +7670,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m70xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7662,6 +7688,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m70xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7679,6 +7706,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m80xc_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7696,6 +7724,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m80xe_n20_cli_repl tags: ["unit-test"] depends_on: @@ -7713,6 +7742,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_mlatest_n20_cli_repl tags: ["unit-test","mlatest"] depends_on: @@ -7730,6 +7760,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m42xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7747,6 +7778,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m42xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7764,6 +7796,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m44xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7781,6 +7814,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m44xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7798,6 +7832,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m50xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7815,6 +7850,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m50xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7832,6 +7868,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m60xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7849,6 +7886,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m60xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7866,6 +7904,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m70xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7883,6 +7922,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m70xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7900,6 +7940,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m80xc_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7917,6 +7958,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_m80xe_n16_cli_repl tags: ["unit-test"] depends_on: @@ -7934,6 +7976,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_mlatest_n16_cli_repl tags: ["unit-test","mlatest"] depends_on: @@ -7951,6 +7994,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_cli_repl" mongosh_run_only_in_package: "cli-repl" + task_name: ${task_name} - name: test_n20_connectivity_tests tags: ["unit-test"] depends_on: @@ -7968,6 +8012,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_connectivity_tests" mongosh_run_only_in_package: "connectivity-tests" + task_name: ${task_name} - name: test_n16_connectivity_tests tags: ["unit-test"] depends_on: @@ -7985,6 +8030,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_connectivity_tests" mongosh_run_only_in_package: "connectivity-tests" + task_name: ${task_name} - name: test_m42xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8002,6 +8048,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m42xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8019,6 +8066,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m44xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8036,6 +8084,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m44xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8053,6 +8102,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m50xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8070,6 +8120,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m50xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8087,6 +8138,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m60xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8104,6 +8156,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m60xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8121,6 +8174,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m70xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8138,6 +8192,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m70xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8155,6 +8210,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m80xc_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8172,6 +8228,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m80xe_n20_e2e_tests tags: ["unit-test"] depends_on: @@ -8189,6 +8246,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_mlatest_n20_e2e_tests tags: ["unit-test","mlatest"] depends_on: @@ -8206,6 +8264,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m42xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8223,6 +8282,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m42xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8240,6 +8300,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m44xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8257,6 +8318,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m44xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8274,6 +8336,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m50xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8291,6 +8354,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m50xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8308,6 +8372,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m60xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8325,6 +8390,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m60xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8342,6 +8408,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m70xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8359,6 +8426,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m70xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8376,6 +8444,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m80xc_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8393,6 +8462,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_m80xe_n16_e2e_tests tags: ["unit-test"] depends_on: @@ -8410,6 +8480,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_mlatest_n16_e2e_tests tags: ["unit-test","mlatest"] depends_on: @@ -8427,6 +8498,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_e2e_tests" mongosh_run_only_in_package: "e2e-tests" + task_name: ${task_name} - name: test_n20_editor tags: ["unit-test"] depends_on: @@ -8444,6 +8516,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_editor" mongosh_run_only_in_package: "editor" + task_name: ${task_name} - name: test_n16_editor tags: ["unit-test"] depends_on: @@ -8461,6 +8534,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_editor" mongosh_run_only_in_package: "editor" + task_name: ${task_name} - name: test_n20_errors tags: ["unit-test"] depends_on: @@ -8478,6 +8552,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_errors" mongosh_run_only_in_package: "errors" + task_name: ${task_name} - name: test_n16_errors tags: ["unit-test"] depends_on: @@ -8495,6 +8570,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_errors" mongosh_run_only_in_package: "errors" + task_name: ${task_name} - name: test_n20_history tags: ["unit-test"] depends_on: @@ -8512,6 +8588,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_history" mongosh_run_only_in_package: "history" + task_name: ${task_name} - name: test_n16_history tags: ["unit-test"] depends_on: @@ -8529,6 +8606,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_history" mongosh_run_only_in_package: "history" + task_name: ${task_name} - name: test_n20_i18n tags: ["unit-test"] depends_on: @@ -8546,6 +8624,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_i18n" mongosh_run_only_in_package: "i18n" + task_name: ${task_name} - name: test_n16_i18n tags: ["unit-test"] depends_on: @@ -8563,6 +8642,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_i18n" mongosh_run_only_in_package: "i18n" + task_name: ${task_name} - name: test_m42xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8580,6 +8660,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m42xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8597,6 +8678,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m44xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8614,6 +8696,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m44xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8631,6 +8714,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m50xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8648,6 +8732,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m50xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8665,6 +8750,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m60xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8682,6 +8768,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m60xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8699,6 +8786,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m70xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8716,6 +8804,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m70xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8733,6 +8822,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m80xc_n20_java_shell tags: ["unit-test"] depends_on: @@ -8750,6 +8840,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m80xe_n20_java_shell tags: ["unit-test"] depends_on: @@ -8767,6 +8858,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_mlatest_n20_java_shell tags: ["unit-test","mlatest"] depends_on: @@ -8784,6 +8876,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m42xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8801,6 +8894,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m42xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8818,6 +8912,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m44xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8835,6 +8930,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m44xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8852,6 +8948,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m50xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8869,6 +8966,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m50xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8886,6 +8984,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m60xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8903,6 +9002,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m60xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8920,6 +9020,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m70xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8937,6 +9038,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m70xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8954,6 +9056,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m80xc_n16_java_shell tags: ["unit-test"] depends_on: @@ -8971,6 +9074,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_m80xe_n16_java_shell tags: ["unit-test"] depends_on: @@ -8988,6 +9092,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_mlatest_n16_java_shell tags: ["unit-test","mlatest"] depends_on: @@ -9005,6 +9110,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_java_shell" mongosh_run_only_in_package: "java-shell" + task_name: ${task_name} - name: test_n20_js_multiline_to_singleline tags: ["unit-test"] depends_on: @@ -9022,6 +9128,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_js_multiline_to_singleline" mongosh_run_only_in_package: "js-multiline-to-singleline" + task_name: ${task_name} - name: test_n16_js_multiline_to_singleline tags: ["unit-test"] depends_on: @@ -9039,6 +9146,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_js_multiline_to_singleline" mongosh_run_only_in_package: "js-multiline-to-singleline" + task_name: ${task_name} - name: test_n20_logging tags: ["unit-test"] depends_on: @@ -9056,6 +9164,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_logging" mongosh_run_only_in_package: "logging" + task_name: ${task_name} - name: test_n16_logging tags: ["unit-test"] depends_on: @@ -9073,6 +9182,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_logging" mongosh_run_only_in_package: "logging" + task_name: ${task_name} - name: test_m42xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9090,6 +9200,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m42xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9107,6 +9218,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m44xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9124,6 +9236,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m44xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9141,6 +9254,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m50xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9158,6 +9272,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m50xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9175,6 +9290,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m60xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9192,6 +9308,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m60xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9209,6 +9326,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m70xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9226,6 +9344,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m70xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9243,6 +9362,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m80xc_n20_mongosh tags: ["unit-test"] depends_on: @@ -9260,6 +9380,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m80xe_n20_mongosh tags: ["unit-test"] depends_on: @@ -9277,6 +9398,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_mlatest_n20_mongosh tags: ["unit-test","mlatest"] depends_on: @@ -9294,6 +9416,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m42xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9311,6 +9434,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m42xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9328,6 +9452,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m44xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9345,6 +9470,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m44xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9362,6 +9488,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m50xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9379,6 +9506,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m50xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9396,6 +9524,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m60xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9413,6 +9542,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m60xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9430,6 +9560,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m70xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9447,6 +9578,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m70xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9464,6 +9596,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m80xc_n16_mongosh tags: ["unit-test"] depends_on: @@ -9481,6 +9614,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m80xe_n16_mongosh tags: ["unit-test"] depends_on: @@ -9498,6 +9632,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_mlatest_n16_mongosh tags: ["unit-test","mlatest"] depends_on: @@ -9515,6 +9650,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_mongosh" mongosh_run_only_in_package: "mongosh" + task_name: ${task_name} - name: test_m42xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9532,6 +9668,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m42xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9549,6 +9686,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m44xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9566,6 +9704,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m44xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9583,6 +9722,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m50xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9600,6 +9740,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m50xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9617,6 +9758,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m60xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9634,6 +9776,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m60xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9651,6 +9794,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m70xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9668,6 +9812,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m70xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9685,6 +9830,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m80xc_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9702,6 +9848,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m80xe_n20_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9719,6 +9866,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_mlatest_n20_node_runtime_worker_thread tags: ["unit-test","mlatest"] depends_on: @@ -9736,6 +9884,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m42xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9753,6 +9902,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m42xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9770,6 +9920,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m44xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9787,6 +9938,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m44xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9804,6 +9956,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m50xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9821,6 +9974,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m50xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9838,6 +9992,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m60xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9855,6 +10010,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m60xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9872,6 +10028,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m70xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9889,6 +10046,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m70xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9906,6 +10064,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m80xc_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9923,6 +10082,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_m80xe_n16_node_runtime_worker_thread tags: ["unit-test"] depends_on: @@ -9940,6 +10100,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_mlatest_n16_node_runtime_worker_thread tags: ["unit-test","mlatest"] depends_on: @@ -9957,6 +10118,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" + task_name: ${task_name} - name: test_n20_service_provider_core tags: ["unit-test"] depends_on: @@ -9974,6 +10136,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_service_provider_core" mongosh_run_only_in_package: "service-provider-core" + task_name: ${task_name} - name: test_n16_service_provider_core tags: ["unit-test"] depends_on: @@ -9991,6 +10154,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_service_provider_core" mongosh_run_only_in_package: "service-provider-core" + task_name: ${task_name} - name: test_m42xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10008,6 +10172,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m42xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10025,6 +10190,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m44xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10042,6 +10208,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m44xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10059,6 +10226,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m50xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10076,6 +10244,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m50xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10093,6 +10262,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m60xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10110,6 +10280,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m60xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10127,6 +10298,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m70xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10144,6 +10316,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m70xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10161,6 +10334,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m80xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10178,6 +10352,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m80xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10195,6 +10370,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_mlatest_n20_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: @@ -10212,6 +10388,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m42xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10229,6 +10406,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m42xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10246,6 +10424,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m44xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10263,6 +10442,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m44xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10280,6 +10460,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m50xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10297,6 +10478,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m50xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10314,6 +10496,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m60xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10331,6 +10514,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m60xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10348,6 +10532,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m70xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10365,6 +10550,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m70xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10382,6 +10568,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m80xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10399,6 +10586,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m80xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: @@ -10416,6 +10604,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_mlatest_n16_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: @@ -10433,6 +10622,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" + task_name: ${task_name} - name: test_m42xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10450,6 +10640,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m42xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10467,6 +10658,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m44xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10484,6 +10676,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m44xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10501,6 +10694,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m50xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10518,6 +10712,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m50xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10535,6 +10730,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m60xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10552,6 +10748,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m60xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10569,6 +10766,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m70xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10586,6 +10784,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m70xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10603,6 +10802,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m80xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -10620,6 +10820,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m80xe_n20_shell_api tags: ["unit-test"] depends_on: @@ -10637,6 +10838,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_mlatest_n20_shell_api tags: ["unit-test","mlatest"] depends_on: @@ -10654,6 +10856,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n20_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m42xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10671,6 +10874,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m42xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10688,6 +10892,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m42xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m44xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10705,6 +10910,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m44xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10722,6 +10928,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m44xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m50xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10739,6 +10946,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m50xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10756,6 +10964,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m50xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m60xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10773,6 +10982,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m60xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10790,6 +11000,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m60xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m70xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10807,6 +11018,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m70xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10824,6 +11036,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m70xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m80xc_n16_shell_api tags: ["unit-test"] depends_on: @@ -10841,6 +11054,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xc_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_m80xe_n16_shell_api tags: ["unit-test"] depends_on: @@ -10858,6 +11072,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "m80xe_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_mlatest_n16_shell_api tags: ["unit-test","mlatest"] depends_on: @@ -10875,6 +11090,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "mlatest_n16_shell_api" mongosh_run_only_in_package: "shell-api" + task_name: ${task_name} - name: test_n20_shell_evaluator tags: ["unit-test"] depends_on: @@ -10892,6 +11108,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_shell_evaluator" mongosh_run_only_in_package: "shell-evaluator" + task_name: ${task_name} - name: test_n16_shell_evaluator tags: ["unit-test"] depends_on: @@ -10909,6 +11126,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_shell_evaluator" mongosh_run_only_in_package: "shell-evaluator" + task_name: ${task_name} - name: test_n20_snippet_manager tags: ["unit-test"] depends_on: @@ -10926,6 +11144,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_snippet_manager" mongosh_run_only_in_package: "snippet-manager" + task_name: ${task_name} - name: test_n16_snippet_manager tags: ["unit-test"] depends_on: @@ -10943,6 +11162,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_snippet_manager" mongosh_run_only_in_package: "snippet-manager" + task_name: ${task_name} - name: test_n20_types tags: ["unit-test"] depends_on: @@ -10960,6 +11180,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n20_types" mongosh_run_only_in_package: "types" + task_name: ${task_name} - name: test_n16_types tags: ["unit-test"] depends_on: @@ -10977,6 +11198,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_types" mongosh_run_only_in_package: "types" + task_name: ${task_name} ### # INTEGRATION TESTS @@ -10993,6 +11215,7 @@ tasks: - func: test_vscode vars: node_js_version: "20.18.0" + task_name: ${task_name} - name: test_connectivity tags: ["extra-integration-test"] depends_on: @@ -11006,6 +11229,7 @@ tasks: - func: test_connectivity vars: node_js_version: "20.18.0" + task_name: ${task_name} - name: test_apistrict tags: ["extra-integration-test"] depends_on: @@ -11021,6 +11245,7 @@ tasks: node_js_version: "20.18.0" mongosh_server_test_version: "latest-alpha-enterprise" mongosh_test_force_api_strict: "1" + task_name: ${task_name} - name: compile_artifact tags: ["compile-artifact"] depends_on: @@ -12488,6 +12713,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky8" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_ubuntu2004 tags: ["connectivity-test"] depends_on: @@ -12506,6 +12732,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_node20 tags: ["connectivity-test"] depends_on: @@ -12524,6 +12751,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.node20" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_rocky9 tags: ["connectivity-test"] depends_on: @@ -12542,6 +12770,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky9" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_ubuntu2204 tags: ["connectivity-test"] depends_on: @@ -12560,6 +12789,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_openssl11_rocky8 tags: ["connectivity-test"] depends_on: @@ -12578,6 +12808,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky8" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_openssl11_ubuntu2004 tags: ["connectivity-test"] depends_on: @@ -12596,6 +12827,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_openssl3_node20 tags: ["connectivity-test"] depends_on: @@ -12614,6 +12846,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.node20" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_openssl3_rocky9 tags: ["connectivity-test"] depends_on: @@ -12632,6 +12865,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky9" + task_name: ${task_name} - name: executable_connectivity_test_linux_x64_openssl3_ubuntu2204 tags: ["connectivity-test"] depends_on: @@ -12650,6 +12884,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_rocky8 tags: ["connectivity-test"] depends_on: @@ -12668,6 +12903,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky8" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_ubuntu2004 tags: ["connectivity-test"] depends_on: @@ -12686,6 +12922,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_node20 tags: ["connectivity-test"] depends_on: @@ -12704,6 +12941,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.node20" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_rocky9 tags: ["connectivity-test"] depends_on: @@ -12722,6 +12960,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky9" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_ubuntu2204 tags: ["connectivity-test"] depends_on: @@ -12740,6 +12979,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_openssl11_rocky8 tags: ["connectivity-test"] depends_on: @@ -12758,6 +12998,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky8" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_openssl11_ubuntu2004 tags: ["connectivity-test"] depends_on: @@ -12776,6 +13017,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_openssl3_node20 tags: ["connectivity-test"] depends_on: @@ -12794,6 +13036,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.node20" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_openssl3_rocky9 tags: ["connectivity-test"] depends_on: @@ -12812,6 +13055,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.rocky9" + task_name: ${task_name} - name: executable_connectivity_test_linux_arm64_openssl3_ubuntu2204 tags: ["connectivity-test"] depends_on: @@ -12830,6 +13074,7 @@ tasks: node_js_version: "20.18.0" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204" + task_name: ${task_name} ### # PACKAGING @@ -15041,6 +15286,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-tgz + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu18_04_deb tags: ["smoke-test"] depends_on: @@ -15060,6 +15306,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu18.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu20_04_deb tags: ["smoke-test"] depends_on: @@ -15079,6 +15326,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu22_04_deb tags: ["smoke-test"] depends_on: @@ -15098,6 +15346,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu22_04_nohome_deb tags: ["smoke-test"] depends_on: @@ -15117,6 +15366,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-nohome-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu22_04_qemu_deb tags: ["smoke-test"] depends_on: @@ -15136,6 +15386,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-qemu-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_ubuntu24_04_deb tags: ["smoke-test"] depends_on: @@ -15155,6 +15406,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu24.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_debian10_deb tags: ["smoke-test"] depends_on: @@ -15174,6 +15426,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian10-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_debian11_deb tags: ["smoke-test"] depends_on: @@ -15193,6 +15446,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian11-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_debian12_deb tags: ["smoke-test"] depends_on: @@ -15212,6 +15466,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian12-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_centos7_rpm tags: ["smoke-test"] depends_on: @@ -15231,6 +15486,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: centos7-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_amazonlinux2_rpm tags: ["smoke-test"] depends_on: @@ -15250,6 +15506,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_amazonlinux2023_rpm tags: ["smoke-test"] depends_on: @@ -15269,6 +15526,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2023-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_rocky8_rpm tags: ["smoke-test"] depends_on: @@ -15288,6 +15546,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -15307,6 +15566,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -15326,6 +15586,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: fedora34-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_suse12_rpm tags: ["smoke-test"] depends_on: @@ -15345,6 +15606,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: suse12-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_suse15_rpm tags: ["smoke-test"] depends_on: @@ -15364,6 +15626,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: suse15-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_oraclelinux9_rpm tags: ["smoke-test"] depends_on: @@ -15383,6 +15646,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: oraclelinux9-rpm + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl11_ubuntu20_04_deb tags: ["smoke-test"] depends_on: @@ -15402,6 +15666,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl11_debian10_deb tags: ["smoke-test"] depends_on: @@ -15421,6 +15686,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian10-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl11_debian11_deb tags: ["smoke-test"] depends_on: @@ -15440,6 +15706,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian11-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl11_centos7_epel_rpm tags: ["smoke-test"] depends_on: @@ -15459,6 +15726,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: centos7-epel-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl11_amazonlinux2_rpm tags: ["smoke-test"] depends_on: @@ -15478,6 +15746,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl11_rocky8_rpm tags: ["smoke-test"] depends_on: @@ -15497,6 +15766,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl11_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -15516,6 +15786,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl11_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -15535,6 +15806,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: fedora34-rpm + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_deb tags: ["smoke-test"] depends_on: @@ -15554,6 +15826,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_fips_deb tags: ["smoke-test"] depends_on: @@ -15573,6 +15846,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-fips-deb + task_name: ${task_name} - name: pkg_test_docker_deb_x64_openssl3_debian12_deb tags: ["smoke-test"] depends_on: @@ -15592,6 +15866,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian12-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl3_rocky8_epel_rpm tags: ["smoke-test"] depends_on: @@ -15611,6 +15886,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-epel-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl3_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -15630,6 +15906,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl3_rocky9_fips_rpm tags: ["smoke-test"] depends_on: @@ -15649,6 +15926,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-fips-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_x64_openssl3_amazonlinux2023_rpm tags: ["smoke-test"] depends_on: @@ -15668,6 +15946,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2023-rpm + task_name: ${task_name} - name: pkg_test_docker_linux_arm64_ubuntu20_04_tgz tags: ["smoke-test"] depends_on: @@ -15687,6 +15966,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-tgz + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu18_04_deb tags: ["smoke-test"] depends_on: @@ -15706,6 +15986,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu18.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu20_04_deb tags: ["smoke-test"] depends_on: @@ -15725,6 +16006,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu22_04_deb tags: ["smoke-test"] depends_on: @@ -15744,6 +16026,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu22_04_nohome_deb tags: ["smoke-test"] depends_on: @@ -15763,6 +16046,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-nohome-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu22_04_qemu_deb tags: ["smoke-test"] depends_on: @@ -15782,6 +16066,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-qemu-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_ubuntu24_04_deb tags: ["smoke-test"] depends_on: @@ -15801,6 +16086,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu24.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_debian10_deb tags: ["smoke-test"] depends_on: @@ -15820,6 +16106,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian10-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_debian11_deb tags: ["smoke-test"] depends_on: @@ -15839,6 +16126,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian11-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_debian12_deb tags: ["smoke-test"] depends_on: @@ -15858,6 +16146,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian12-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_rocky8_rpm tags: ["smoke-test"] depends_on: @@ -15877,6 +16166,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -15896,6 +16186,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -15915,6 +16206,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: fedora34-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_amazonlinux2_rpm tags: ["smoke-test"] depends_on: @@ -15934,6 +16226,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_amazonlinux2023_rpm tags: ["smoke-test"] depends_on: @@ -15953,6 +16246,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2023-rpm + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl11_ubuntu20_04_deb tags: ["smoke-test"] depends_on: @@ -15972,6 +16266,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu20.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl11_debian10_deb tags: ["smoke-test"] depends_on: @@ -15991,6 +16286,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian10-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl11_debian11_deb tags: ["smoke-test"] depends_on: @@ -16010,6 +16306,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian11-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl11_rocky8_rpm tags: ["smoke-test"] depends_on: @@ -16029,6 +16326,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl11_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -16048,6 +16346,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl11_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -16067,6 +16366,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: fedora34-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl11_amazonlinux2_rpm tags: ["smoke-test"] depends_on: @@ -16086,6 +16386,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2-rpm + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_deb tags: ["smoke-test"] depends_on: @@ -16105,6 +16406,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_fips_deb tags: ["smoke-test"] depends_on: @@ -16124,6 +16426,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: ubuntu22.04-fips-deb + task_name: ${task_name} - name: pkg_test_docker_deb_arm64_openssl3_debian12_deb tags: ["smoke-test"] depends_on: @@ -16143,6 +16446,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: debian12-deb + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl3_rocky8_epel_rpm tags: ["smoke-test"] depends_on: @@ -16162,6 +16466,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky8-epel-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_rpm tags: ["smoke-test"] depends_on: @@ -16181,6 +16486,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_fips_rpm tags: ["smoke-test"] depends_on: @@ -16200,6 +16506,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: rocky9-fips-rpm + task_name: ${task_name} - name: pkg_test_docker_rpm_arm64_openssl3_amazonlinux2023_rpm tags: ["smoke-test"] depends_on: @@ -16219,6 +16526,7 @@ tasks: vars: node_js_version: "20.18.0" dockerfile: amazonlinux2023-rpm + task_name: ${task_name} - name: pkg_test_rpmextract_rpm_ppc64le tags: ["smoke-test"] depends_on: diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index c0827f931..b9d4c728b 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -130,6 +130,9 @@ post: visibility: signed content_type: application/x-gzip optional: true + - command: attach.xunit_results + params: + file: src/.logs/*.xml # Functions are any command that can be run. @@ -264,6 +267,7 @@ functions: MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_run_only_in_package} AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} + TASK_NAME: ${task_name} - command: s3.put params: aws_key: ${aws_key} @@ -517,7 +521,7 @@ functions: AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl} - E2E_TASK_NAME: ${task_name} + TASK_NAME: ${task_name} ### # PACKAGING AND UPLOADING @@ -1124,6 +1128,7 @@ tasks: mongosh_skip_node_version_check: "<% out(skipNodeVersionCheck) %>" mongosh_test_id: "<% out(id) %>" mongosh_run_only_in_package: "<% out(packageName) %>" + task_name: ${task_name} <% } %> ### @@ -1141,6 +1146,7 @@ tasks: - func: test_vscode vars: node_js_version: "<% out(NODE_JS_VERSION_20) %>" + task_name: ${task_name} - name: test_connectivity tags: ["extra-integration-test"] depends_on: @@ -1154,6 +1160,7 @@ tasks: - func: test_connectivity vars: node_js_version: "<% out(NODE_JS_VERSION_20) %>" + task_name: ${task_name} - name: test_apistrict tags: ["extra-integration-test"] depends_on: @@ -1169,6 +1176,7 @@ tasks: node_js_version: "<% out(NODE_JS_VERSION_20) %>" mongosh_server_test_version: "latest-alpha-enterprise" mongosh_test_force_api_strict: "1" + task_name: ${task_name} - name: compile_artifact tags: ["compile-artifact"] depends_on: @@ -1273,6 +1281,7 @@ tasks: node_js_version: "<% out(NODE_JS_VERSION_20) %>" test_mongosh_executable: dist/mongosh kerberos_jumphost_dockerfile: "Dockerfile.<% out(dockerFile) %>" + task_name: ${task_name} <% } } %> ### @@ -1406,6 +1415,7 @@ tasks: vars: node_js_version: "<% out(NODE_JS_VERSION_20) %>" dockerfile: <% out(dockerfile) %> + task_name: ${task_name} <% }; break; // We don't have docker for platforms other than x64, so for those we just // extract the archives locally. diff --git a/.evergreen/run-e2e-tests.sh b/.evergreen/run-e2e-tests.sh index 71f855c7b..116815d0d 100755 --- a/.evergreen/run-e2e-tests.sh +++ b/.evergreen/run-e2e-tests.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash set -e export NODE_JS_VERSION=${NODE_JS_VERSION} +export TASK_NAME=${TASK_NAME} -if [[ "$DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL" == "true" ]] && [[ ! "$E2E_TASK_NAME" =~ openssl(3|11) ]]; then +if [[ "$DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL" == "true" ]] && [[ ! "$TASK_NAME" =~ openssl(3|11) ]]; then # On RHEL9 and based-distros, an additional configuration option # `rh-allow-sha1-signatures` is present which is not recognizable to the # OpenSSL version bundled with Node.js and hence the mongosh binary fails to diff --git a/.gitignore b/.gitignore index bba985e3b..82c170d79 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ mongocryptd.pid .sbom .nvm snapshot.blob +.logs/* +!.logs/empty.xml diff --git a/.logs/empty.xml b/.logs/empty.xml new file mode 100644 index 000000000..ca36217f6 --- /dev/null +++ b/.logs/empty.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/configs/mocha-config-mongosh/reporter.ts b/configs/mocha-config-mongosh/reporter.ts new file mode 100644 index 000000000..d8a5c9794 --- /dev/null +++ b/configs/mocha-config-mongosh/reporter.ts @@ -0,0 +1,31 @@ +import { reporters } from 'mocha'; +import type { MochaOptions, Runner } from 'mocha'; +import path from 'path'; + +// Import the built-in reporters +const Spec = reporters.Spec; +const XUnit = reporters.XUnit; + +export class MochaReporter extends reporters.Base { + constructor(runner: Runner, options: MochaOptions) { + super(runner, options); + const suiteName = process.env.TASK_NAME ?? path.basename(process.cwd()); + + new Spec(runner); + + runner.on('suite', (suite) => { + if (suite.parent?.root) { + suite.title = `${suiteName}__${suite.title}`; + } + }); + + new XUnit(runner, { + reporterOptions: { + suiteName, + output: path.join(__dirname, '..', '..', '.logs', `${suiteName}.xml`), + }, + }); + } +} + +module.exports = MochaReporter; diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index f17d7a9c3..28d6b66dd 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -11,7 +11,7 @@ "unsafe-perm": true }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json index 708a4f1b7..0d2e5be0e 100644 --- a/packages/async-rewriter2/package.json +++ b/packages/async-rewriter2/package.json @@ -6,7 +6,7 @@ "scripts": { "pretest": "npm run compile", "benchmark": "node -r ts-node/register benchmark/index.ts", - "test": "mocha --experimental-vm-modules -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha --experimental-vm-modules -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json index bf8a8ec88..b3d2e4b97 100644 --- a/packages/autocomplete/package.json +++ b/packages/autocomplete/package.json @@ -17,7 +17,7 @@ "node": ">=14.15.1" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 2e7be050d..5ac050940 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -15,7 +15,7 @@ "url": "git://github.com/mongodb-js/mongosh.git" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 5a77f920b..70946b7d0 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -15,7 +15,7 @@ "url": "git://github.com/mongodb-js/mongosh.git" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/build/package.json b/packages/build/package.json index adb70b500..89587a507 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -15,7 +15,7 @@ "scripts": { "compile": "tsc -p tsconfig.json", "prepublish": "npm run compile", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 30000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 30000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 9f3dbb40f..ae7e4d19d 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -21,7 +21,7 @@ "compile": "tsc -p tsconfig.json", "start": "node bin/mongosh.js", "pretest": "npm run compile", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index e23ee3794..130829be5 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -11,7 +11,7 @@ "url": "git://github.com/mongodb-js/mongosh.git" }, "scripts": { - "test": "mocha -r ts-node/register -r \"../../scripts/import-expansions.js\" -r \"./test/test-shell-context.ts\" --timeout 15000 --colors \"./test/*.spec.ts\"", + "test": "mocha -r ts-node/register -r \"../../scripts/import-expansions.js\" -r \"./test/test-shell-context.ts\" --timeout 15000 --colors --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./test/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/editor/package.json b/packages/editor/package.json index c19b63c03..57e07395a 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -11,7 +11,7 @@ "unsafe-perm": true }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./{src,lib}/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/errors/package.json b/packages/errors/package.json index 1df02b0e7..f873de241 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -17,7 +17,7 @@ "node": ">=14.15.1" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/history/package.json b/packages/history/package.json index c10707bba..21df6a136 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -11,7 +11,7 @@ "unsafe-perm": true }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./{src,lib}/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 2888e6917..e717cf762 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -14,7 +14,7 @@ "scripts": { "compile": "tsc -p tsconfig.json", "prepublish": "npm run compile", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json index 6f6283180..f541d15ef 100644 --- a/packages/java-shell/package.json +++ b/packages/java-shell/package.json @@ -12,7 +12,7 @@ }, "scripts": { "webpack-shell-api": "webpack --mode production", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 --colors -r ts-node/register \"./src/test/js/run-tests.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 --colors -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/test/js/run-tests.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm run test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci" diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json index c1953234f..06b21592a 100644 --- a/packages/js-multiline-to-singleline/package.json +++ b/packages/js-multiline-to-singleline/package.json @@ -11,7 +11,7 @@ "unsafe-perm": true }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./{src,lib}/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/logging/package.json b/packages/logging/package.json index 42f23d7d9..d185dbab2 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -33,7 +33,7 @@ "prettier": "^2.8.8" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index e162cf72a..5205581c9 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -17,7 +17,7 @@ "node": ">=14.15.1" }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" -r \"./tests/register-worker.js \" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" -r \"./tests/register-worker.js \" --timeout 15000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "pretest-ci": "node ../../scripts/run-if-package-requested.js npm run webpack-build -- --no-stats --no-devtool", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 798136d70..6f482ac01 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -14,7 +14,7 @@ "scripts": { "compile": "tsc -p tsconfig.json", "prepublish": "npm run compile", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 633c7c810..733cb7102 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -13,7 +13,7 @@ }, "scripts": { "compile": "tsc -p tsconfig.json", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 31047d155..b987ede8c 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -20,7 +20,7 @@ "depcheck": "depcheck", "report-missing-help": "ts-node bin/report-missing-help.ts", "report-supported-api": "ts-node bin/report-supported-api.ts", - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json index d1f9f06f5..7952764ee 100644 --- a/packages/shell-evaluator/package.json +++ b/packages/shell-evaluator/package.json @@ -4,7 +4,7 @@ "description": "MongoDB Top Level API Package", "main": "./lib/index.js", "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./{src,lib}/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index c99d437e6..ced102cf0 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -11,7 +11,7 @@ "unsafe-perm": true }, "scripts": { - "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"", + "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./{src,lib}/**/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", diff --git a/packages/types/package.json b/packages/types/package.json index 782e5f133..b40fdd2e5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -24,7 +24,7 @@ "eslint": "eslint", "lint": "npm run eslint . && npm run prettier -- --check .", "prepublish": "npm run compile", - "test": "mocha --timeout 15000 -r ts-node/register \"./src/*.spec.ts\"", + "test": "mocha --timeout 15000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/*.spec.ts\"", "test-ci": "node ../../scripts/run-if-package-requested.js npm test", "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test", "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci", From 4ced9688d02c86d9c1ead67d2edfa355d370992e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:33:14 +0000 Subject: [PATCH 32/39] chore: update auto-generated files (#2235) * chore: update THIRD_PARTY_NOTICES * chore: update AUTHORS --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- packages/java-shell/AUTHORS | 1 + packages/service-provider-node-driver/AUTHORS | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 2028f2231..f90b531de 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Wed Oct 23 2024. +This document was automatically generated on Thu Oct 24 2024. ## List of dependencies diff --git a/packages/java-shell/AUTHORS b/packages/java-shell/AUTHORS index 311ae4dc5..872be8a82 100644 --- a/packages/java-shell/AUTHORS +++ b/packages/java-shell/AUTHORS @@ -13,3 +13,4 @@ Le Roux Bodenstein Alena Khineika Leonardo Rossi Martin Rodriguez Reboredo +Gagik Amaryan diff --git a/packages/service-provider-node-driver/AUTHORS b/packages/service-provider-node-driver/AUTHORS index 844477fad..67fd284e6 100644 --- a/packages/service-provider-node-driver/AUTHORS +++ b/packages/service-provider-node-driver/AUTHORS @@ -1 +1,3 @@ Anna Henningsen +github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> +Gagik Amaryan From e91cd2909b796bd3255dbb15beece36ce20fd893 Mon Sep 17 00:00:00 2001 From: Gagik Amaryan Date: Fri, 25 Oct 2024 09:01:17 +0200 Subject: [PATCH 33/39] feat(shell-api): add shardedDataDistribution to sh.status() MONGOSH-1326 (#2214) --- packages/shell-api/src/helpers.spec.ts | 47 ++++++++- packages/shell-api/src/helpers.ts | 136 +++++++++++++++++++++---- packages/shell-api/src/shard.spec.ts | 83 +++++++++++++-- packages/shell-api/src/shard.ts | 3 +- 4 files changed, 234 insertions(+), 35 deletions(-) diff --git a/packages/shell-api/src/helpers.spec.ts b/packages/shell-api/src/helpers.spec.ts index 381c97b03..f39227fe0 100644 --- a/packages/shell-api/src/helpers.spec.ts +++ b/packages/shell-api/src/helpers.spec.ts @@ -1,3 +1,4 @@ +import type { ShardedDataDistribution } from './helpers'; import { assertArgsDefinedType, coerceToJSNumber, @@ -19,6 +20,7 @@ import sinon from 'ts-sinon'; import chai, { expect } from 'chai'; import { EventEmitter } from 'events'; import sinonChai from 'sinon-chai'; +import { stub } from 'sinon'; chai.use(sinonChai); const fakeConfigDb = makeFakeConfigDatabase( @@ -133,6 +135,21 @@ describe('getPrintableShardStatus', function () { let serviceProvider: ServiceProvider; let inBalancerRound = false; + const mockedShardedDataDistribution: ShardedDataDistribution = [ + { + ns: 'test.ns', + shards: [ + { + shardName: 'test', + numOrphanedDocs: 1, + numOwnedDocuments: 5, + orphanedSizeBytes: 20, + ownedSizeBytes: 80, + }, + ], + }, + ]; + beforeEach(async function () { serviceProvider = await NodeDriverServiceProvider.connect( await testServer.connectionString(), @@ -186,6 +203,20 @@ describe('getPrintableShardStatus', function () { }); it('returns an object with sharding information', async function () { + const mockedAdminDb = { + aggregate: stub() + .withArgs([{ $shardedDataDistribution: {} }]) + .resolves({ + toArray: stub().resolves(mockedShardedDataDistribution), + }), + }; + const getSiblingDB = stub(); + getSiblingDB.withArgs('admin').returns(mockedAdminDb); + getSiblingDB.withArgs('config').returns(configDatabase); + + configDatabase.getSiblingDB = getSiblingDB; + configDatabase._maybeCachedHello = stub().returns({ msg: 'isdbgrid' }); + const status = await getPrintableShardStatus(configDatabase, false); expect(status.shardingVersion.clusterId).to.be.instanceOf(bson.ObjectId); expect(status.shards.map(({ host }: { host: string }) => host)).to.include( @@ -202,6 +233,10 @@ describe('getPrintableShardStatus', function () { ); expect(status.databases).to.have.lengthOf(1); expect(status.databases[0].database._id).to.equal('config'); + + expect(status.shardedDataDistribution).to.equal( + mockedShardedDataDistribution + ); }); describe('hides all internal deprecated fields in shardingVersion', function () { @@ -214,7 +249,9 @@ describe('getPrintableShardStatus', function () { ]) { it(`does not show ${hiddenField} in shardingVersion`, async function () { const status = await getPrintableShardStatus(configDatabase, false); - expect(status.shardingVersion[hiddenField]).to.equal(undefined); + expect((status.shardingVersion as any)[hiddenField]).to.equal( + undefined + ); }); } }); @@ -235,8 +272,10 @@ describe('getPrintableShardStatus', function () { it('returns an object with verbose sharding information if requested', async function () { const status = await getPrintableShardStatus(configDatabase, true); - expect(status['most recently active mongoses'][0].up).to.be.a('number'); - expect(status['most recently active mongoses'][0].waiting).to.be.a( + expect((status['most recently active mongoses'][0] as any).up).to.be.a( + 'number' + ); + expect((status['most recently active mongoses'][0] as any).waiting).to.be.a( 'boolean' ); }); @@ -281,7 +320,7 @@ describe('getPrintableShardStatus', function () { status.balancer['Collections with active migrations'] ).to.have.lengthOf(1); expect( - status.balancer['Collections with active migrations'].join('') + status.balancer['Collections with active migrations']?.join('') ).to.include('asdf'); }); diff --git a/packages/shell-api/src/helpers.ts b/packages/shell-api/src/helpers.ts index 0b1affb42..180137a60 100644 --- a/packages/shell-api/src/helpers.ts +++ b/packages/shell-api/src/helpers.ts @@ -26,7 +26,7 @@ import type { bson, } from '@mongosh/service-provider-core'; import type { ClientSideFieldLevelEncryptionOptions } from './field-level-encryption'; -import { type AutoEncryptionOptions } from 'mongodb'; +import type { AutoEncryptionOptions, Long, ObjectId, Timestamp } from 'mongodb'; import { shellApiType } from './enums'; import type { AbstractCursor } from './abstract-cursor'; import type ChangeStreamCursor from './change-stream-cursor'; @@ -226,8 +226,8 @@ export function processDigestPassword( export async function getPrintableShardStatus( configDB: Database, verbose: boolean -): Promise { - const result = {} as any; +): Promise { + const result = {} as ShardingStatusResult; // configDB is a DB object that contains the sharding metadata of interest. const mongosColl = configDB.getCollection('mongos'); @@ -259,9 +259,12 @@ export async function getPrintableShardStatus( ); } - result.shardingVersion = version; + result.shardingVersion = version as { + _id: number; + clusterId: ObjectId; + }; - result.shards = shards; + result.shards = shards as ShardingStatusResult['shards']; // (most recently) active mongoses const mongosActiveThresholdMs = 60000; @@ -280,9 +283,8 @@ export async function getPrintableShardStatus( } } - mongosAdjective = `${mongosAdjective} mongoses`; if (mostRecentMongosTime === null) { - result[mongosAdjective] = 'none'; + result[`${mongosAdjective} mongoses`] = 'none'; } else { const recentMongosQuery = { ping: { @@ -295,25 +297,27 @@ export async function getPrintableShardStatus( }; if (verbose) { - result[mongosAdjective] = await (await mongosColl.find(recentMongosQuery)) + result[`${mongosAdjective} mongoses`] = await ( + await mongosColl.find(recentMongosQuery) + ) .sort({ ping: -1 }) .toArray(); } else { - result[mongosAdjective] = ( + result[`${mongosAdjective} mongoses`] = ( (await ( await mongosColl.aggregate([ { $match: recentMongosQuery }, { $group: { _id: '$mongoVersion', num: { $sum: 1 } } }, { $sort: { num: -1 } }, ]) - ).toArray()) as any[] + ).toArray()) as { _id: string; num: number }[] ).map((z: { _id: string; num: number }) => { return { [z._id]: z.num }; }); } } - const balancerRes: Record = {}; + const balancerRes = {} as ShardingStatusResult['balancer']; await Promise.all([ (async (): Promise => { // Is autosplit currently enabled @@ -331,13 +335,13 @@ export async function getPrintableShardStatus( })(), (async (): Promise => { // Is the balancer currently active - let balancerRunning = 'unknown'; + let balancerRunning: 'yes' | 'no' | 'unknown' = 'unknown'; try { const balancerStatus = await configDB.adminCommand({ balancerStatus: 1, }); balancerRunning = balancerStatus.inBalancerRound ? 'yes' : 'no'; - } catch (err: any) { + } catch { // pass, ignore all error messages } balancerRes['Currently running'] = balancerRunning; @@ -364,7 +368,7 @@ export async function getPrintableShardStatus( if (activeLocks?.length > 0) { balancerRes['Collections with active migrations'] = activeLocks.map( (lock) => { - return `${lock._id} started at ${lock.when}`; + return `${lock._id} started at ${lock.when}` as const; } ); } @@ -418,8 +422,23 @@ export async function getPrintableShardStatus( const yesterday = new Date(); yesterday.setDate(yesterday.getDate() - 1); + type MigrationResult = + | { + _id: 'Success'; + count: number; + from: never; + to: never; + } + // Failed migration + | { + _id: string; + count: number; + from: string; + to: string; + }; + // Successful migrations. - let migrations = await ( + let migrations = (await ( await changelogColl.aggregate([ { $match: { @@ -437,11 +456,11 @@ export async function getPrintableShardStatus( }, }, ]) - ).toArray(); + ).toArray()) as MigrationResult[]; // Failed migrations. migrations = migrations.concat( - await ( + (await ( await changelogColl.aggregate([ { $match: { @@ -472,11 +491,12 @@ export async function getPrintableShardStatus( }, }, ]) - ).toArray() + ).toArray()) as MigrationResult[] ); - const migrationsRes: Record = {}; - migrations.forEach((x: any) => { + const migrationsRes: ShardingStatusResult['balancer']['Migration Results for the last 24 hours'] = + {}; + migrations.forEach((x) => { if (x._id === 'Success') { migrationsRes[x.count] = x._id; } else { @@ -500,7 +520,7 @@ export async function getPrintableShardStatus( // All databases in config.databases + those implicitly referenced // by a sharded collection in config.collections // (could become a single pipeline using $unionWith when we drop 4.2 server support) - const [databases, collections] = await Promise.all([ + const [databases, collections, shardedDataDistribution] = await Promise.all([ (async () => await (await configDB.getCollection('databases').find()) .sort({ _id: 1 }) @@ -513,7 +533,22 @@ export async function getPrintableShardStatus( ) .sort({ _id: 1 }) .toArray())(), + (async () => { + try { + // $shardedDataDistribution is available since >= 6.0.3 + const adminDB = configDB.getSiblingDB('admin'); + return (await ( + await adminDB.aggregate([{ $shardedDataDistribution: {} }]) + ).toArray()) as ShardedDataDistribution; + } catch { + // Pass, most likely an older version. + return undefined; + } + })(), ]); + + result.shardedDataDistribution = shardedDataDistribution; + // Special case the config db, since it doesn't have a record in config.databases. databases.push({ _id: 'config', primary: 'config', partitioned: true }); @@ -648,6 +683,65 @@ export async function getPrintableShardStatus( return result; } +export type ShardingStatusResult = { + shardingVersion: { + _id: number; + clusterId: ObjectId; + /** This gets deleted when it is returned from getPrintableShardStatus */ + currentVersion?: number; + }; + shards: { + _id: string; + host: string; + state: number; + tags: string[]; + topologyTime: Timestamp; + replSetConfigVersion: Long; + }[]; + [mongoses: `${string} mongoses`]: + | 'none' + | { + [version: string]: + | number + | { + up: number; + waiting: boolean; + }; + }[]; + autosplit: { + 'Currently enabled': 'yes' | 'no'; + }; + balancer: { + 'Currently enabled': 'yes' | 'no'; + 'Currently running': 'yes' | 'no' | 'unknown'; + 'Failed balancer rounds in last 5 attempts': number; + 'Migration Results for the last 24 hours': + | 'No recent migrations' + | { + [count: number]: + | 'Success' + | `Failed with error '${string}', from ${string} to ${string}`; + }; + 'Balancer active window is set between'?: `${string} and ${string} server local time`; + 'Last reported error'?: string; + 'Time of Reported error'?: string; + 'Collections with active migrations'?: `${string} started at ${string}`[]; + }; + shardedDataDistribution?: ShardedDataDistribution; + databases: { database: Document; collections: Document }[]; +}; + +export type ShardedDataDistribution = { + ns: string; + shards: { + shardName: string; + numOrphanedDocs: number; + numOwnedDocuments: number; + orphanedSizeBytes: number; + ownedSizeBytes: number; + }[]; +}[]; + export async function getConfigDB(db: Database): Promise { const helloResult = await db._maybeCachedHello(); if (helloResult.msg !== 'isdbgrid') { diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts index 9910c0496..ad2abce97 100644 --- a/packages/shell-api/src/shard.spec.ts +++ b/packages/shell-api/src/shard.spec.ts @@ -2043,6 +2043,70 @@ describe('Shard', function () { return serviceProvider.close(true); }); + describe('collection.status()', function () { + let db: Database; + + const dbName = 'shard-status-test'; + const ns = `${dbName}.test`; + + beforeEach(async function () { + db = sh._database.getSiblingDB(dbName); + await db.getCollection('test').insertOne({ key: 1 }); + await db.getCollection('test').createIndex({ key: 1 }); + }); + afterEach(async function () { + await db.dropDatabase(); + }); + describe('unsharded collections', function () { + describe('with >= 6.0.3', function () { + skipIfServerVersion(mongos, '< 6.0.3'); + + it('returns shardedDataDistribution as an empty array', async function () { + const status = await sh.status(); + expect(status.value.shardedDataDistribution).deep.equals([]); + }); + }); + + describe('with < 6.0.3', function () { + skipIfServerVersion(mongos, '>= 6.0.3'); + + it('returns shardedDataDistribution as undefined', async function () { + const status = await sh.status(); + expect(status.value.shardedDataDistribution).equals(undefined); + }); + }); + }); + + describe('sharded collections', function () { + beforeEach(async function () { + expect((await sh.enableSharding(dbName)).ok).to.equal(1); + expect( + (await sh.shardCollection(ns, { key: 1 })).collectionsharded + ).to.equal(ns); + }); + + describe('with >= 6.0.3', function () { + skipIfServerVersion(mongos, '< 6.0.3'); + + it('returns correct shardedDataDistribution', async function () { + const status = await sh.status(); + + expect(status.value.shardedDataDistribution?.length).equals(1); + expect(status.value.shardedDataDistribution?.[0].ns).equals(ns); + }); + }); + + describe('with < 6.0.3', function () { + skipIfServerVersion(mongos, '>= 6.0.3'); + + it('returns shardedDataDistribution as undefined', async function () { + const status = await sh.status(); + expect(status.value.shardedDataDistribution).equals(undefined); + }); + }); + }); + }); + describe('sharding info', function () { it('returns the status', async function () { const result = await sh.status(); @@ -2121,7 +2185,7 @@ describe('Shard', function () { expect( (await sh.status()).value.databases.find( (d: Document) => d.database._id === 'test' - ).collections[ns].shardKey + )?.collections[ns].shardKey ).to.deep.equal({ key: 1 }); const db = instanceState.currentDb.getSiblingDB(dbName); @@ -2166,13 +2230,13 @@ describe('Shard', function () { describe('tags', function () { it('creates a zone', async function () { expect((await sh.addShardTag(`${shardId}-1`, 'zone1')).ok).to.equal(1); - expect((await sh.status()).value.shards[1].tags).to.deep.equal([ + expect((await sh.status()).value.shards[1]?.tags).to.deep.equal([ 'zone1', ]); expect((await sh.addShardToZone(`${shardId}-0`, 'zone0')).ok).to.equal( 1 ); - expect((await sh.status()).value.shards[0].tags).to.deep.equal([ + expect((await sh.status()).value.shards[0]?.tags).to.deep.equal([ 'zone0', ]); }); @@ -2241,7 +2305,7 @@ describe('Shard', function () { const tags = (await sh.status()).value.databases.find( (d: Document) => d.database._id === 'test' - ).collections[ns].tags; + )?.collections[ns].tags; expect(tags.length).to.equal(19); }); it('cuts a tag list when there are more than 20 tags', async function () { @@ -2251,7 +2315,7 @@ describe('Shard', function () { const tags = (await sh.status()).value.databases.find( (d: Document) => d.database._id === 'test' - ).collections[ns].tags; + )?.collections[ns].tags; expect(tags.length).to.equal(21); expect( tags.indexOf( @@ -2885,6 +2949,7 @@ describe('Shard', function () { }); }); }); + describe('collection.isCapped', function () { it('returns true for config.changelog', async function () { const ret = await sh._database @@ -2929,7 +2994,7 @@ describe('Shard', function () { (item: Document) => item.database._id === 'db' ); // Cannot get strict guarantees about the value of this field since SERVER-63983 - expect(databasesDbItem.database.partitioned).to.be.oneOf([ + expect(databasesDbItem?.database.partitioned).to.be.oneOf([ false, undefined, ]); @@ -2937,7 +3002,7 @@ describe('Shard', function () { (item: Document) => item.database._id === 'dbSh' ); // Cannot get strict guarantees about the value of this field since SERVER-60926 and SERVER-63983 - expect(databasesDbShItem.database.partitioned).to.be.oneOf([ + expect(databasesDbShItem?.database.partitioned).to.be.oneOf([ true, false, undefined, @@ -3051,7 +3116,7 @@ describe('Shard', function () { } const chunks = (await sh.status()).value.databases.find( (d: Document) => d.database._id === 'test' - ).collections[ns].chunks; + )?.collections[ns].chunks; expect(chunks.length).to.equal(20); }); @@ -3059,7 +3124,7 @@ describe('Shard', function () { await sh.splitAt(ns, { key: 20 }); const chunks = (await sh.status()).value.databases.find( (d: Document) => d.database._id === 'test' - ).collections[ns].chunks; + )?.collections[ns].chunks; expect(chunks.length).to.equal(21); expect( chunks.indexOf( diff --git a/packages/shell-api/src/shard.ts b/packages/shell-api/src/shard.ts index cd2882115..293ca6fca 100644 --- a/packages/shell-api/src/shard.ts +++ b/packages/shell-api/src/shard.ts @@ -12,6 +12,7 @@ import type { Document, CheckMetadataConsistencyOptions, } from '@mongosh/service-provider-core'; +import type { ShardingStatusResult } from './helpers'; import { assertArgsDefinedType, getConfigDB, @@ -205,7 +206,7 @@ export default class Shard extends ShellApiWithMongoClass { async status( verbose = false, configDB?: Database - ): Promise> { + ): Promise> { const result = await getPrintableShardStatus( configDB ?? (await getConfigDB(this._database)), verbose From 06916e56bbc7a560c60e081b789484695fc70a0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 07:09:54 +0000 Subject: [PATCH 34/39] chore: update auto-generated files (#2237) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index f90b531de..8605999b9 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Thu Oct 24 2024. +This document was automatically generated on Fri Oct 25 2024. ## List of dependencies From c8d82fd69456049ff4f01f052c4f892aac0b28c1 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Fri, 25 Oct 2024 16:59:21 +0200 Subject: [PATCH 35/39] chore(ci): Add a workflow to validate PR titles (#2240) * Add a workflow to validate PR titles * Change the example jira ticket --- .github/workflows/check-pr-title.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/check-pr-title.yml diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml new file mode 100644 index 000000000..d5da06db5 --- /dev/null +++ b/.github/workflows/check-pr-title.yml @@ -0,0 +1,24 @@ +name: "Check PR Title" +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited] + +jobs: + check-pr-title: + name: Check PR Title + runs-on: ubuntu-latest + steps: + - name: Enforce conventional commit style + uses: realm/ci-actions/title-checker@main + with: + regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*' + error-hint: 'Invalid PR title. Make sure it follows the conventional commit specification (i.e. "(): ") or add the no-title-validation label' + ignore-labels: 'no-title-validation' + - name: Enforce JIRA ticket in title + uses: realm/ci-actions/title-checker@main + # Skip the JIRA ticket check for PRs opened by bots + if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }} + with: + regex: '[A-Z]{4,10}-[0-9]{1,5}$' + error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. MONGOSH-1234 or add the no-title-validation label' + ignore-labels: 'no-title-validation' From f0c7ce759d50d072934ae9519447a848f536b2b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:07:52 +0000 Subject: [PATCH 36/39] chore: update auto-generated files (#2241) chore: update AUTHORS Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 8cf8fb71f..5e66e8a9b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,3 +41,4 @@ Alena Khineika Orgad Shaneh Kræn Hansen Gagik Amaryan +Nikola Irinchev From 0d07bca84d1e13a918228b13ba67eb1195c0129d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 03:19:27 +0000 Subject: [PATCH 37/39] chore: update auto-generated files (#2242) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 8605999b9..4c9e3ae53 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Fri Oct 25 2024. +This document was automatically generated on Sun Oct 27 2024. ## List of dependencies From 6fcad34eeb7f41031218efe7baeede7a8151fe14 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 28 Oct 2024 17:16:29 +0100 Subject: [PATCH 38/39] chore(deps): bump driver, bson to latest MONGOSH-1890 MONGOSH-1889 (#2243) --- package-lock.json | 80 +++++++++---------- packages/arg-parser/package.json | 2 +- packages/browser-repl/package.json | 2 +- packages/browser-runtime-core/package.json | 2 +- packages/cli-repl/package.json | 2 +- packages/e2e-tests/package.json | 4 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 4 +- .../service-provider-node-driver/package.json | 2 +- packages/shell-api/package.json | 4 +- packages/shell-api/src/shell-bson.spec.ts | 1 + packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- 13 files changed, 55 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e0a59245..f1d8b178a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12784,9 +12784,9 @@ } }, "node_modules/bson": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz", - "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz", + "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig==", "license": "Apache-2.0", "engines": { "node": ">=16.20.1" @@ -22836,9 +22836,9 @@ } }, "node_modules/mongodb": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", - "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz", + "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", @@ -30953,7 +30953,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8" }, "engines": { @@ -31054,7 +31054,7 @@ "karma-mocha-reporter": "^2.2.5", "karma-typescript": "^5.5.4", "karma-webpack": "^5.0.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "path-browserify": "^1.0.1", "prettier": "^2.8.8", "prop-types": "^15.7.2", @@ -31175,7 +31175,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -31328,7 +31328,7 @@ "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-crypt-library-dummy": "^1.0.2", "prettier": "^2.8.8", "webpack-merge": "^5.8.0" @@ -31385,13 +31385,13 @@ "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -31720,7 +31720,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -31739,8 +31739,8 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.8.0", - "mongodb": "^6.9.0", + "bson": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -31770,7 +31770,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -31841,10 +31841,10 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8", "semver": "^7.5.3" }, @@ -31884,7 +31884,7 @@ "@mongosh/errors": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -31918,7 +31918,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8" }, "engines": { @@ -37100,7 +37100,7 @@ "@mongosh/i18n": "0.0.0-dev.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-connection-string-url": "^3.0.1", "prettier": "^2.8.8" } @@ -37176,7 +37176,7 @@ "karma-mocha-reporter": "^2.2.5", "karma-typescript": "^5.5.4", "karma-webpack": "^5.0.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "numeral": "^2.0.6", "path-browserify": "^1.0.1", "prettier": "^2.8.8", @@ -37256,7 +37256,7 @@ "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -37381,7 +37381,7 @@ "is-recoverable-error": "^1.0.3", "js-yaml": "^4.1.0", "macos-export-certificate-and-key": "^1.2.2", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-connection-string-url": "^3.0.1", "mongodb-crypt-library-dummy": "^1.0.2", "mongodb-crypt-library-version": "^1.0.5", @@ -37436,13 +37436,13 @@ "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2", @@ -37628,7 +37628,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "interruptor": "^1.0.1", @@ -37648,10 +37648,10 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-build-info": "^1.7.2", "mongodb-client-encryption": "^6.1.0", "mongodb-connection-string-url": "^3.0.1", @@ -37674,7 +37674,7 @@ "depcheck": "^1.4.7", "eslint": "^7.25.0", "kerberos": "2.1.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-client-encryption": "^6.1.0", "mongodb-connection-string-url": "^3.0.1", "prettier": "^2.8.8", @@ -37693,10 +37693,10 @@ "@mongosh/i18n": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-redact": "^1.1.2", "prettier": "^2.8.8", "semver": "^7.5.3" @@ -37730,7 +37730,7 @@ "@mongosh/types": "0.0.0-dev.0", "@types/cross-spawn": "^6.0.2", "@types/tar": "^4.0.4", - "bson": "^6.8.0", + "bson": "^6.9.0", "cross-spawn": "^7.0.3", "depcheck": "^1.4.7", "escape-string-regexp": "^4.0.0", @@ -37750,7 +37750,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8" } }, @@ -42754,9 +42754,9 @@ } }, "bson": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz", - "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==" + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz", + "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig==" }, "buffer": { "version": "4.9.2", @@ -50400,9 +50400,9 @@ "dev": true }, "mongodb": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", - "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz", + "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg==", "requires": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index 28d6b66dd..fb5f1e68d 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 682a50213..7640c4f91 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -69,7 +69,7 @@ "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 5ac050940..2806aae0e 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -42,7 +42,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index ae7e4d19d..9d3c819ab 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -93,7 +93,7 @@ "yargs-parser": "^20.2.4" }, "devDependencies": { - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 130829be5..2b60cd517 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -39,13 +39,13 @@ "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2" diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 5205581c9..0d682a30f 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -42,7 +42,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 6f482ac01..2e2aad1e8 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -45,8 +45,8 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.8.0", - "mongodb": "^6.9.0", + "bson": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 733cb7102..143c5eab3 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -53,7 +53,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index b987ede8c..df069b6ea 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -52,10 +52,10 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8", "semver": "^7.5.3" } diff --git a/packages/shell-api/src/shell-bson.spec.ts b/packages/shell-api/src/shell-bson.spec.ts index de656c6a7..93fda391a 100644 --- a/packages/shell-api/src/shell-bson.spec.ts +++ b/packages/shell-api/src/shell-bson.spec.ts @@ -774,6 +774,7 @@ describe('Shell BSON', function () { delete bsonProperties.getInc; // private delete bsonProperties.is; // private delete bsonProperties._fromString; // private + delete bsonProperties.validateHexString; // private try { expect(shellProperties).to.deep.equal(bsonProperties); diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index ced102cf0..ce30b6d89 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -39,7 +39,7 @@ "@mongosh/errors": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.8.0", + "bson": "^6.9.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", diff --git a/packages/types/package.json b/packages/types/package.json index b40fdd2e5..9391cc47f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.9.0", + "mongodb": "^6.10.0", "prettier": "^2.8.8" } } From e78998f6c73b2aefa47cecd09860ff23c49d1971 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:25:21 +0000 Subject: [PATCH 39/39] chore: update auto-generated files (#2244) chore: update THIRD_PARTY_NOTICES Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- THIRD_PARTY_NOTICES.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 4c9e3ae53..4c77c5efb 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,5 +1,5 @@ The following third-party software is used by and included in **mongosh**. -This document was automatically generated on Sun Oct 27 2024. +This document was automatically generated on Mon Oct 28 2024. ## List of dependencies @@ -179,7 +179,7 @@ Package|Version|License **[bplist-parser](#a012056f1b32796d923573a3b1ef72cf36943d95e5e2f6af0f7eeab57a21be24)**|0.2.0|MIT **[brace-expansion](#2ba3ee23cc6a2718243e9c0c59ce154058f292965f563aa291b459a414e863cb)**|1.1.11|MIT **[browserslist](#a95274c46e5fc3c90b90fdf6cc259a6b44331ddca76e255afd128465621592ed)**|4.23.3|MIT -**[bson](#d6c506bcc160fe77704fb17890d28ffb1d1c30b72dbce07bd5e970af63932d46)**|6.8.0|Apache-2.0 +**[bson](#b5de8374b38fe7ca4367cde774b5448c4317dd3c937fef241731cd6b39dceeaa)**|6.9.0|Apache-2.0 **[buffer-alloc-unsafe](#1022220a813dd092d3ced592ac36121a00bd08a9c2020e08ad370dc29ed217f0)**|1.1.0|MIT **[buffer-alloc](#d5cbc95b9dde4a46cd45334630efe3bc9025c904074bee845376bd60651441c0)**|1.2.0|MIT **[buffer-fill](#c3747dfd267829ceeb564a1717d0c65d88d2b366e215f640067abefac59e3fd4)**|1.0.0|MIT @@ -348,7 +348,7 @@ Package|Version|License **[mongodb-crypt-library-version](#003bd2892d6f6fdac0613ba8f9a2fbb054ddd1c26901e1d2fc7e83861b21cf4d)**|1.0.5|Apache-2.0 **[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)**|1.4.2|Apache-2.0 **[mongodb-redact](#d246d19a773f4cc2f2d0431d018a38295c9f9b1b45cfbe7ee16230056b667453)**|1.1.2|Apache-2.0 -**[mongodb](#8359f923d8c3b1a357d06d091825d7c04bb269086e94b6f8617edd5b4b03fa2b)**|6.9.0|Apache-2.0 +**[mongodb](#435929756f32840b6ee67bc26155513cd7001bd8bab6e30ddaec63024b6fdcd1)**|6.10.0|Apache-2.0 **[ms](#484b814b85d5028e34246147c8fc901d33570202bd7cdc3703c0ed1078eba0aa)**|2.0.0|MIT **[ms](#0a987b2f79ff37005e452a5afa7dacd3042061a7077054d2ba9cabacd88506d2)**|2.1.2|MIT **[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**|2.1.3|MIT @@ -20637,8 +20637,8 @@ License files: - -### [bson](https://www.npmjs.com/package/bson) (version 6.8.0) + +### [bson](https://www.npmjs.com/package/bson) (version 6.9.0) License tags: Apache-2.0 License files: @@ -27892,8 +27892,8 @@ License files: - -### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.9.0) + +### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.10.0) License tags: Apache-2.0 License files: