Merge branch 'main' into login-docker-hub

Author: lerouxb

.evergreen.yml

@@ -1,16 +1,16 @@
 {
-  "version": "20.18.0",
+  "version": "20.18.1",
   "major": 20,
   "minor": 18,
-  "patch": 0,
+  "patch": 1,
   "tag": "",
   "codename": "iron",
   "versionName": "v20",
   "start": "2023-04-18T00:00:00.000Z",
   "lts": "2023-10-24T00:00:00.000Z",
   "maintenance": "2024-10-22T00:00:00.000Z",
   "end": "2026-04-30T00:00:00.000Z",
-  "releaseDate": "2024-10-03T00:00:00.000Z",
+  "releaseDate": "2024-11-20T00:00:00.000Z",
   "isLts": true,
   "files": [
     "aix-ppc64",
@@ -40,6 +40,6 @@
     "v8": "11.3.244.8",
     "uv": "1.46.0",
     "zlib": "1.3.0.1-motley",
-    "openssl": "3.0.13+quic"
+    "openssl": "3.0.15+quic"
   }
 }

.evergreen/node-20-latest.json

@@ -12,6 +12,10 @@ jobs:
   update_generated_files:
     name: Update automatically generated files
     runs-on: ubuntu-latest
+    env:
+      npm_config_loglevel: verbose
+      npm_config_foreground_scripts: "true"
+      PUPPETEER_SKIP_DOWNLOAD: "true"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -21,11 +25,12 @@ jobs:
           # this is important so git log can pick up on
           # the whole history to generate the list of AUTHORS
           fetch-depth: "0"
+          token: ${{ secrets.SVC_DEVTOOLSBOT_TOKEN }}
 
       - name: Set up Git
         run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
+          git config --local user.email "devtoolsbot@users.noreply.github.com"
+          git config --local user.name "devtoolsbot"
 
       - uses: actions/setup-node@v4
         with:
@@ -44,7 +49,7 @@ jobs:
       - name: Update THIRD_PARTY_NOTICES.md
         run: |
           npm run update-third-party-notices
-          git commit --no-allow-empty -m "chore: update THIRD_PARTY_NOTICES" THIRD_PARTY_NOTICES.md || true
+          git add THIRD_PARTY_NOTICES.md
 
       - name: Update AUTHORS
         run: |
@@ -73,20 +78,7 @@ jobs:
           npm run update-cli-usage-text packages/*/*.md *.md
           git add packages/*/*.md *.md
 
-      - name: Create pull request
-        id: cpr
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update auto-generated files
-          branch: ci/cron-tasks-update-files
-          title: "chore: update auto-generated files"
-          body: |
-            - Update auto-generated files
-
-      - name: Merge PR
-        env:
-          PULL_REQUEST_NUMBER: ${{steps.cpr.outputs.pull-request-number}}
-          # NOTE: we don't use a PAT so to not trigger further automation
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit and push
         run: |
-          gh pr merge $PULL_REQUEST_NUMBER --squash --delete-branch
+          git commit --no-allow-empty -m "chore: update auto-generated files" || true
+          git push

.github/workflows/cron-tasks.yml

@@ -11,43 +11,40 @@ jobs:
     name: Update Node.js versions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # don't checkout a detatched HEAD
           ref: ${{ github.head_ref }}
 
           # this is important so git log can pick up on
           # the whole history to generate the list of AUTHORS
-          fetch-depth: '0'
+          fetch-depth: "0"
 
       - name: Setup git
         run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
+          git config --local user.email "devtoolsbot@users.noreply.github.com"
+          git config --local user.name "devtoolsbot"
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-          cache: 'npm'
+          node-version: 20.x
+          cache: "npm"
 
-      - name: Install npm@8.19.4
+      - name: Install npm@10
         run: |
-          npm install -g npm@8.19.4
+          npm install -g npm@10
 
       - name: Bump packages
         run: |
           npm run update-node-js-versions
           npm run update-evergreen-config
-          git add .
-          git commit --no-allow-empty -m "chore: update node.js version" || true
 
       - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'chore: update node.js'
+          token: ${{ secrets.SVC_DEVTOOLSBOT_TOKEN }}
+          commit-message: "chore: update node.js version"
           branch: ci/update-node-js-versions
-          title: 'chore: update node.js'
+          title: "chore: update node.js"
           body: |
             - Update node.js

.github/workflows/update-node-js.yaml

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Thu Nov 21 2024.
+This document was automatically generated on Fri Nov 22 2024.
 
 ## List of dependencies
 

THIRD_PARTY_NOTICES.md

@@ -26,27 +26,30 @@ export default class StreamProcessor extends ShellApiWithMongoClass {
   }
 
   @returnsPromise
-  async start() {
+  async start(options: Document = {}) {
     return await this._streams._runStreamCommand({
       startStreamProcessor: this.name,
+      ...options,
     });
   }
 
   @returnsPromise
-  async stop() {
+  async stop(options: Document = {}) {
     return await this._streams._runStreamCommand({
       stopStreamProcessor: this.name,
+      ...options,
     });
   }
 
   @returnsPromise
-  async drop() {
-    return this._drop();
+  async drop(options: Document = {}) {
+    return this._drop(options);
   }
 
-  async _drop() {
+  async _drop(options: Document = {}) {
     return await this._streams._runStreamCommand({
       dropStreamProcessor: this.name,
+      ...options,
     });
   }
 

package-lock.json

@@ -164,18 +164,67 @@ describe('Streams', function () {
     });
   });
 
+  // Create a stream processor.
+  const createProcessor = async (name: string) => {
+    const runCmdStub = sinon
+      .stub(mongo._serviceProvider, 'runCommand')
+      .resolves({ ok: 1 });
+    const pipeline = [{ $match: { foo: 'bar' } }];
+    const processor = await streams.createStreamProcessor(name, pipeline);
+    expect(processor).to.eql(streams.getProcessor(name));
+    const cmd = { createStreamProcessor: name, pipeline };
+    expect(runCmdStub.calledOnceWithExactly('admin', cmd, {})).to.be.true;
+    return { runCmdStub, processor };
+  };
+
+  // Validate supplying options in start,stop, and drop commands.
+  describe('options', function () {
+    it('supplies options in start, stop, and drop', async function () {
+      const name = 'testOptions';
+      const { runCmdStub, processor } = await createProcessor(name);
+
+      // Start the stream processor with an extra option.
+      await processor.start({ resumeFromCheckpoint: false });
+      expect(
+        runCmdStub.calledWithExactly(
+          'admin',
+          { startStreamProcessor: name, resumeFromCheckpoint: false },
+          {}
+        )
+      ).to.be.true;
+
+      // Stop the stream processor with an extra option.
+      await processor.stop({ force: true });
+      expect(
+        runCmdStub.calledWithExactly(
+          'admin',
+          { stopStreamProcessor: name, force: true },
+          {}
+        )
+      ).to.be.true;
+
+      // Drop the stream processor with a few extra options.
+      const opts = {
+        force: true,
+        ttl: { unit: 'day', size: 30 },
+      };
+      await processor.drop(opts);
+      expect(
+        runCmdStub.calledWithExactly(
+          'admin',
+          {
+            dropStreamProcessor: name,
+            ...opts,
+          },
+          {}
+        )
+      ).to.be.true;
+    });
+  });
+
   describe('modify', function () {
     it('throws with invalid parameters', async function () {
-      // Create the stream processor.
-      const runCmdStub = sinon
-        .stub(mongo._serviceProvider, 'runCommand')
-        .resolves({ ok: 1 });
-      const name = 'p1';
-      const pipeline = [{ $match: { foo: 'bar' } }];
-      const processor = await streams.createStreamProcessor(name, pipeline);
-      expect(processor).to.eql(streams.getProcessor(name));
-      const cmd = { createStreamProcessor: name, pipeline };
-      expect(runCmdStub.calledOnceWithExactly('admin', cmd, {})).to.be.true;
+      const { processor } = await createProcessor('testModify');
 
       // No arguments to modify.
       const caught = await processor
@@ -206,17 +255,8 @@ describe('Streams', function () {
     });
 
     it('works with pipeline and options arguments', async function () {
-      const runCmdStub = sinon
-        .stub(mongo._serviceProvider, 'runCommand')
-        .resolves({ ok: 1 });
-
-      // Create the stream processor.
-      const name = 'p1';
-      const pipeline = [{ $match: { foo: 'bar' } }];
-      const processor = await streams.createStreamProcessor(name, pipeline);
-      expect(processor).to.eql(streams.getProcessor(name));
-      const cmd = { createStreamProcessor: name, pipeline };
-      expect(runCmdStub.calledOnceWithExactly('admin', cmd, {})).to.be.true;
+      const name = 'testModify';
+      const { runCmdStub, processor } = await createProcessor(name);
 
       // Start the stream processor.
       await processor.start();

packages/shell-api/src/stream-processor.ts

@@ -15,6 +15,7 @@ cd vscode
 npm install --force
 rm -rf node_modules/@mongosh
 (cd node_modules && ln -s "$mongosh_root_dir/packages" @mongosh)
-npm test
+# This test can require a lot of memory so we bump the maximum size.
+NODE_OPTIONS=--max-old-space-size=4096 npm test
 cd /tmp
 rm -rf "$test_root_dir"