wip

Author: nbbeeken

.gitignore

@@ -99,6 +99,7 @@ test/lambda/env.json
 
 # files generated by tooling in drivers-evergreen-tools
 secrets-export.sh
+secrets-export.fish
 mo-expansion.sh
 mo-expansion.yml
 expansions.sh

etc/bash_to_fish.mjs

@@ -0,0 +1,39 @@
+import { createReadStream, promises as fs } from 'node:fs';
+import path from 'node:path';
+import readline from 'node:readline/promises';
+
+/**
+ * Takes an "exports" only bash script file
+ * and converts it to fish syntax.
+ * Will crash on any line that isn't:
+ * - a comment
+ * - an empty line
+ * - a bash 'set' call
+ * - export VAR=VAL
+ */
+
+const fileName = process.argv[2];
+const outFileName = path.basename(fileName, '.sh') + '.fish';
+const input = createReadStream(process.argv[2]);
+const lines = readline.createInterface({ input });
+const output = await fs.open(outFileName, 'w');
+
+for await (let line of lines) {
+  line = line.trim();
+
+  if (!line.startsWith('export ')) {
+    if (line.startsWith('#')) continue;
+    if (line === '') continue;
+    if (line.startsWith('set')) continue;
+    throw new Error('Cannot translate: ' + line);
+  }
+
+  const varVal = line.slice('export '.length);
+  const variable = varVal.slice(0, varVal.indexOf('='));
+  const value = varVal.slice(varVal.indexOf('=') + 1);
+  output.appendFile(`set -x ${variable} ${value}\n`);
+}
+
+output.close();
+input.close();
+lines.close();

src/client-side-encryption/state_machine.ts

@@ -12,10 +12,12 @@ import {
 } from '../bson';
 import { type ProxyOptions } from '../cmap/connection';
 import { CursorTimeoutContext } from '../cursor/abstract_cursor';
+import { type ListCollectionsCursor } from '../cursor/list_collections_cursor';
 import { getSocks, type SocksLib } from '../deps';
 import { MongoOperationTimeoutError } from '../error';
 import { type MongoClient, type MongoClientOptions } from '../mongo_client';
 import { type Abortable } from '../mongo_types';
+import { type CollectionInfo } from '../operations/list_collections';
 import { Timeout, type TimeoutContext, TimeoutError } from '../timeout';
 import {
   addAbortListener,
@@ -218,14 +220,15 @@ export class StateMachine {
             );
           }
 
-          const collInfo = await this.fetchCollectionInfo(
+          const collInfoCursor = this.fetchCollectionInfo(
             metaDataClient,
             context.ns,
             filter,
             options
           );
-          if (collInfo) {
-            context.addMongoOperationResponse(collInfo);
+
+          for await (const collInfo of collInfoCursor) {
+            context.addMongoOperationResponse(serialize(collInfo));
           }
 
           context.finishMongoOperation();
@@ -527,29 +530,24 @@ export class StateMachine {
    * @param filter - A filter for the listCollections command
    * @param callback - Invoked with the info of the requested collection, or with an error
    */
-  async fetchCollectionInfo(
+  fetchCollectionInfo(
     client: MongoClient,
     ns: string,
     filter: Document,
     options?: { timeoutContext?: TimeoutContext } & Abortable
-  ): Promise<Uint8Array | null> {
+  ): ListCollectionsCursor<CollectionInfo> {
     const { db } = MongoDBCollectionNamespace.fromString(ns);
 
     const cursor = client.db(db).listCollections(filter, {
       promoteLongs: false,
       promoteValues: false,
       timeoutContext:
         options?.timeoutContext && new CursorTimeoutContext(options?.timeoutContext, Symbol()),
-      signal: options?.signal
+      signal: options?.signal,
+      nameOnly: false
     });
 
-    // There is always exactly zero or one matching documents, so this should always exhaust the cursor
-    // in a single batch.  We call `toArray()` just to be safe and ensure that the cursor is always
-    // exhausted and closed.
-    const collections = await cursor.toArray();
-
-    const info = collections.length > 0 ? serialize(collections[0]) : null;
-    return info;
+    return cursor;
   }
 
   /**