Merge branch 'main' into NODE-7379

Author: tadjik1

.eslintrc.json

@@ -186,6 +186,7 @@
           {
             "patterns": [
               "**/../lib/**",
+              "**/../src/**",
               "mongodb-mock-server"
             ]
           }
@@ -224,7 +225,8 @@
           {
             "patterns": [
               "**/../lib/**",
-              "mongodb-mock-server"
+              "mongodb-mock-server",
+              "**/../src/**"
             ]
           }
         ]
@@ -332,6 +334,15 @@
             "disallowTypeAnnotations": false,
             "fixStyle": "separate-type-imports"
           }
+        ],
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              "**/../lib/**",
+              "**/../src/**"
+            ]
+          }
         ]
       }
     }

.evergreen/run-mongodb-aws-test.sh

@@ -9,4 +9,7 @@ source .evergreen/setup-mongodb-aws-auth-tests.sh
 # load node.js environment
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
+# clear AWS_PROFILE, so it doesn't interfere with env-creds
+unset AWS_PROFILE
+
 npm run check:aws

drivers-evergreen-tools

@@ -5,11 +5,11 @@ import type { Connection } from '../connection';
 import { type AuthContext, AuthProvider } from './auth_provider';
 import type { MongoCredentials } from './mongo_credentials';
 import { AutomatedCallbackWorkflow } from './mongodb_oidc/automated_callback_workflow';
-import { callback as azureCallback } from './mongodb_oidc/azure_machine_workflow';
-import { callback as gcpCallback } from './mongodb_oidc/gcp_machine_workflow';
-import { callback as k8sCallback } from './mongodb_oidc/k8s_machine_workflow';
+import { azureCallback } from './mongodb_oidc/azure_machine_workflow';
+import { gcpCallback } from './mongodb_oidc/gcp_machine_workflow';
+import { k8sCallback } from './mongodb_oidc/k8s_machine_workflow';
 import { TokenCache } from './mongodb_oidc/token_cache';
-import { callback as testCallback } from './mongodb_oidc/token_machine_workflow';
+import { tokenMachineCallback as testCallback } from './mongodb_oidc/token_machine_workflow';
 
 /** Error when credentials are missing. */
 const MISSING_CREDENTIALS_ERROR = 'AuthContext must provide credentials.';

src/cmap/auth/mongodb_oidc.ts

@@ -19,7 +19,7 @@ const TOKEN_RESOURCE_MISSING_ERROR =
  * @param params - The OIDC callback parameters.
  * @returns The OIDC response.
  */
-export const callback: OIDCCallbackFunction = async (
+export const azureCallback: OIDCCallbackFunction = async (
   params: OIDCCallbackParams
 ): Promise<OIDCResponse> => {
   const tokenAudience = params.tokenAudience;

src/cmap/auth/mongodb_oidc/azure_machine_workflow.ts

@@ -18,7 +18,7 @@ const TOKEN_RESOURCE_MISSING_ERROR =
  * @param params - The OIDC callback parameters.
  * @returns The OIDC response.
  */
-export const callback: OIDCCallbackFunction = async (
+export const gcpCallback: OIDCCallbackFunction = async (
   params: OIDCCallbackParams
 ): Promise<OIDCResponse> => {
   const tokenAudience = params.tokenAudience;

src/cmap/auth/mongodb_oidc/gcp_machine_workflow.ts

@@ -17,7 +17,7 @@ const AWS_FILENAME = 'AWS_WEB_IDENTITY_TOKEN_FILE';
  * @param params - The OIDC callback parameters.
  * @returns The OIDC response.
  */
-export const callback: OIDCCallbackFunction = async (): Promise<OIDCResponse> => {
+export const k8sCallback: OIDCCallbackFunction = async (): Promise<OIDCResponse> => {
   let filename: string;
   if (process.env[AZURE_FILENAME]) {
     filename = process.env[AZURE_FILENAME];

src/cmap/auth/mongodb_oidc/k8s_machine_workflow.ts

@@ -12,7 +12,7 @@ const TOKEN_MISSING_ERROR = 'OIDC_TOKEN_FILE must be set in the environment.';
  * @param params - The OIDC callback parameters.
  * @returns The OIDC response.
  */
-export const callback: OIDCCallbackFunction = async (): Promise<OIDCResponse> => {
+export const tokenMachineCallback: OIDCCallbackFunction = async (): Promise<OIDCResponse> => {
   const tokenFile = process.env.OIDC_TOKEN_FILE;
   if (!tokenFile) {
     throw new MongoAWSError(TOKEN_MISSING_ERROR);

src/cmap/auth/mongodb_oidc/token_machine_workflow.ts

@@ -224,6 +224,7 @@ export interface HandshakeDocument extends Document {
   compression: string[];
   saslSupportedMechs?: string;
   loadBalanced?: boolean;
+  backpressure: true;
 }
 
 /**
@@ -241,6 +242,7 @@ export async function prepareHandshakeDocument(
 
   const handshakeDoc: HandshakeDocument = {
     [serverApi?.version || options.loadBalanced === true ? 'hello' : LEGACY_HELLO_COMMAND]: 1,
+    backpressure: true,
     helloOk: true,
     client: clientMetadata,
     compression: compressors

src/cmap/connect.ts

@@ -586,6 +586,9 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
         this.throwIfAborted();
       }
     } catch (error) {
+      if (options.session != null && !(error instanceof MongoServerError)) {
+        updateSessionFromResponse(options.session, MongoDBResponse.empty);
+      }
       if (this.shouldEmitAndLogCommand) {
         this.emitAndLogCommand(
           this.monitorCommands,