Merge branch 'main' into NODE-5988/6.x-raw-results-doc-MongoServerError

Author: aditi-khare-mongoDB

package-lock.json

@@ -25,7 +25,7 @@
     "email": "[email protected]"
   },
   "dependencies": {
-    "@mongodb-js/saslprep": "^1.1.0",
+    "@mongodb-js/saslprep": "^1.1.5",
     "bson": "^6.4.0",
     "mongodb-connection-string-url": "^3.0.0"
   },

package.json

@@ -319,7 +319,6 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
   const useTLS = options.tls ?? false;
   const noDelay = options.noDelay ?? true;
   const connectTimeoutMS = options.connectTimeoutMS ?? 30000;
-  const rejectUnauthorized = options.rejectUnauthorized ?? true;
   const existingSocket = options.existingSocket;
 
   let socket: Stream;
@@ -375,10 +374,6 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
     return socket;
   } catch (error) {
     socket.destroy();
-    if ('authorizationError' in socket && socket.authorizationError != null && rejectUnauthorized) {
-      // TODO(NODE-5192): wrap this with a MongoError subclass
-      throw socket.authorizationError;
-    }
     throw error;
   } finally {
     socket.setTimeout(0);

src/cmap/connect.ts

@@ -220,7 +220,8 @@ export function createStdioLogger(stream: {
 }): MongoDBLogWritable {
   return {
     write: promisify((log: Log, cb: (error?: Error) => void): unknown => {
-      stream.write(inspect(log, { compact: true, breakLength: Infinity }), 'utf-8', cb);
+      const logLine = inspect(log, { compact: true, breakLength: Infinity });
+      stream.write(`${logLine}\n`, 'utf-8', cb);
       return;
     })
   };

src/mongo_logger.ts

@@ -88,15 +88,17 @@ describe('MONGODB-AWS', function () {
   });
 
   describe('with missing aws token', () => {
-    let awsSessionToken;
+    let awsSessionToken: string | undefined;
 
-    beforeEach(function () {
+    beforeEach(() => {
       awsSessionToken = process.env.AWS_SESSION_TOKEN;
       delete process.env.AWS_SESSION_TOKEN;
     });
 
-    afterEach(async () => {
-      process.env.AWS_SESSION_TOKEN = awsSessionToken;
+    afterEach(() => {
+      if (awsSessionToken != null) {
+        process.env.AWS_SESSION_TOKEN = awsSessionToken;
+      }
     });
 
     it('should not throw an exception when aws token is missing', async function () {

test/integration/auth/mongodb_aws.test.ts

@@ -5,19 +5,8 @@ import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
 
 const SKIPPED_TESTS = [
   'callback succeeds after multiple connection errors',
-  'callback is not retried after non-transient error',
   'callback is not retried after non-transient error (DuplicateKeyError)',
-  'withTransaction succeeds if callback aborts',
-  'unpin after transient error within a transaction',
-  'withTransaction succeeds if callback commits',
-  'withTransaction still succeeds if callback aborts and runs extra op',
-  'withTransaction still succeeds if callback commits and runs extra op',
-  'withTransaction commits after callback returns (second transaction)',
-  'withTransaction commits after callback returns',
-  'withTransaction and no transaction options set',
-  'withTransaction inherits transaction options from defaultTransactionOptions',
-  'withTransaction explicit transaction options override defaultTransactionOptions',
-  'withTransaction explicit transaction options'
+  'withTransaction succeeds if callback aborts'
 ];
 
 describe('Transactions Convenient API Spec Unified Tests', function () {
@@ -33,7 +22,7 @@ describe('Transactions Convenient API Spec Unified Tests', function () {
 
   runUnifiedSuite(loadSpecTests(path.join('transactions-convenient-api', 'unified')), test => {
     return SKIPPED_TESTS.includes(test.description)
-      ? 'TODO(NODE-5855/DRIVERS-2816): Skipping failing transaction tests'
+      ? 'TODO(NODE-5855): Skipping failing transaction tests'
       : false;
   });
 });

test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts

@@ -7,6 +7,7 @@ import {
   ChangeStream,
   ClientEncryption,
   ClientSession,
+  type ClusterTime,
   Collection,
   type CommandFailedEvent,
   type CommandStartedEvent,
@@ -556,6 +557,7 @@ export class EntitiesMap<E = Entity> extends Map<string, E> {
 
   static async createEntities(
     config: TestConfiguration,
+    clusterTime: ClusterTime | null,
     entities?: EntityDescription[],
     entityMap?: EntitiesMap
   ): Promise<EntitiesMap> {
@@ -627,6 +629,10 @@ export class EntitiesMap<E = Entity> extends Map<string, E> {
           }
         }
         const session = client.startSession(options);
+        // Advance the session cluster time. See DRIVERS-2816.
+        if (clusterTime) {
+          session.advanceClusterTime(clusterTime);
+        }
         map.set(entity.session.id, session);
       } else if ('bucket' in entity) {
         const db = map.getEntity('db', entity.bucket.database);

test/tools/unified-spec-runner/entities.ts

@@ -45,7 +45,7 @@ operations.set('createEntities', async ({ entities, operation, testConfig }) =>
   if (!operation.arguments?.entities) {
     throw new Error('encountered createEntities operation without entities argument');
   }
-  await EntitiesMap.createEntities(testConfig, operation.arguments.entities!, entities);
+  await EntitiesMap.createEntities(testConfig, null, operation.arguments.entities!, entities);
 });
 
 operations.set('abortTransaction', async ({ entities, operation }) => {

test/tools/unified-spec-runner/operations.ts

@@ -160,8 +160,15 @@ async function runUnifiedTest(
       }
     }
 
+    const ping = await utilClient.db().admin().command({ ping: 1 });
+    const clusterTime = ping.$clusterTime;
+
     trace('createEntities');
-    entities = await EntitiesMap.createEntities(ctx.configuration, unifiedSuite.createEntities);
+    entities = await EntitiesMap.createEntities(
+      ctx.configuration,
+      clusterTime,
+      unifiedSuite.createEntities
+    );
 
     // Workaround for SERVER-39704:
     // test runners MUST execute a non-transactional distinct command on

test/tools/unified-spec-runner/runner.ts

@@ -896,7 +896,8 @@ describe('Connection String', function () {
         });
         const log: Log = { t: new Date(), c: 'ConnectionStringStdErr', s: 'error' };
         client.options.mongoLoggerOptions.logDestination.write(log);
-        expect(stderrStub.write).calledWith(inspect(log, { breakLength: Infinity, compact: true }));
+        const logLine = inspect(log, { breakLength: Infinity, compact: true });
+        expect(stderrStub.write).calledWith(`${logLine}\n`);
       });
     });
 
@@ -907,7 +908,8 @@ describe('Connection String', function () {
         });
         const log: Log = { t: new Date(), c: 'ConnectionStringStdOut', s: 'error' };
         client.options.mongoLoggerOptions.logDestination.write(log);
-        expect(stdoutStub.write).calledWith(inspect(log, { breakLength: Infinity, compact: true }));
+        const logLine = inspect(log, { breakLength: Infinity, compact: true });
+        expect(stdoutStub.write).calledWith(`${logLine}\n`);
       });
     });