undo aws4 change

Author: nbbeeken

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

@@ -13,3 +13,6 @@ source ./.evergreen/prepare-shell.sh # should not run git clone
 
 # load node.js
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
+
+# run the tests
+npm install aws4

.evergreen/setup-mongodb-aws-auth-tests.sh

@@ -23,6 +23,8 @@ cd $DRIVERS_TOOLS/.evergreen/auth_aws
 
 cd $BEFORE
 
+npm install --no-save aws4
+
 if [ $MONGODB_AWS_SDK = 'false' ]; then rm -rf ./node_modules/@aws-sdk/credential-providers; fi
 
 # revert to show test output

package-lock.json

@@ -81,7 +81,6 @@
     "@types/whatwg-url": "^11.0.5",
     "@typescript-eslint/eslint-plugin": "8.4.0",
     "@typescript-eslint/parser": "8.4.0",
-    "aws4": "^1.13.2",
     "chai": "^4.4.1",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.2",

package.json

@@ -1,10 +1,9 @@
 import type { Binary, BSONSerializeOptions } from '../../bson';
 import * as BSON from '../../bson';
-import { type AWS4, loadAws4 } from '../../deps';
+import { aws4 } from '../../deps';
 import {
   MongoCompatibilityError,
   MongoMissingCredentialsError,
-  type MongoMissingDependencyError,
   MongoRuntimeError
 } from '../../error';
 import { ByteUtils, maxWireVersion, ns, randomBytes } from '../../utils';
@@ -33,8 +32,6 @@ interface AWSSaslContinuePayload {
   t?: string;
 }
 
-let aws4: AWS4 | { kModuleError: MongoMissingDependencyError };
-
 export class MongoDBAWS extends AuthProvider {
   private credentialFetcher: AWSTemporaryCredentialProvider;
   constructor() {
@@ -51,7 +48,6 @@ export class MongoDBAWS extends AuthProvider {
       throw new MongoMissingCredentialsError('AuthContext must provide credentials.');
     }
 
-    aws4 ??= loadAws4();
     if ('kModuleError' in aws4) {
       throw aws4['kModuleError'];
     }

src/cmap/auth/mongodb_aws.ts

@@ -203,8 +203,7 @@ export function getSocks(): SocksLib | { kModuleError: MongoMissingDependencyErr
   }
 }
 
-/** @internal */
-export interface AWS4 {
+interface AWS4 {
   /**
    * Created these inline types to better assert future usage of this API
    * @param options - options for request
@@ -245,7 +244,9 @@ export interface AWS4 {
   };
 }
 
-export function loadAws4() {
+export const aws4: AWS4 | { kModuleError: MongoMissingDependencyError } = loadAws4();
+
+function loadAws4() {
   let aws4: AWS4 | { kModuleError: MongoMissingDependencyError };
   try {
     // eslint-disable-next-line @typescript-eslint/no-require-imports

src/deps.ts

@@ -62,9 +62,9 @@ describe('optionalRequire', function () {
       }
       const mdbAWS = new MongoDBAWS();
 
-      const error = await mdbAWS.auth(
-        new AuthContext({ hello: { maxWireVersion: 9 } }, true, null)
-      );
+      const error = await mdbAWS
+        .auth(new AuthContext({ hello: { maxWireVersion: 9 } }, true, null))
+        .catch(error => error);
 
       expect(error).to.be.instanceOf(MongoMissingDependencyError);
     });