fix: add back missing opt deps aws4

Author: mr-pinzhang

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

@@ -13,6 +13,3 @@ 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,8 +23,6 @@ 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

@@ -32,6 +32,7 @@
   "peerDependencies": {
     "@aws-sdk/credential-providers": "^3.632.0",
     "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
+    "aws4": "^1.13.2",
     "gcp-metadata": "^5.2.0",
     "kerberos": "^2.0.1",
     "mongodb-client-encryption": ">=6.0.0 <7",
@@ -45,6 +46,9 @@
     "@mongodb-js/zstd": {
       "optional": true
     },
+    "aws4": {
+      "optional": true
+    },
     "kerberos": {
       "optional": true
     },
@@ -68,6 +72,7 @@
     "@microsoft/api-extractor": "^7.49.2",
     "@microsoft/tsdoc-config": "^0.17.1",
     "@mongodb-js/zstd": "^2.0.0",
+    "@types/aws4": "^1.11.6",
     "@types/chai": "^4.3.17",
     "@types/chai-subset": "^1.3.5",
     "@types/express": "^4.17.21",
@@ -81,6 +86,7 @@
     "@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

@@ -138,8 +138,8 @@ export class MongoDBAWS extends AuthProvider {
     );
 
     const payload: AWSSaslContinuePayload = {
-      a: options.headers.Authorization,
-      d: options.headers['X-Amz-Date']
+      a: `${options.headers?.Authorization ?? ''}`,
+      d: `${options.headers?.['X-Amz-Date'] ?? ''}`
     };
 
     if (sessionToken) {

src/cmap/auth/mongodb_aws.ts

@@ -244,10 +244,10 @@ interface AWS4 {
   };
 }
 
-export const aws4: AWS4 | { kModuleError: MongoMissingDependencyError } = loadAws4();
+export const aws4 = loadAws4();
 
 function loadAws4() {
-  let aws4: AWS4 | { kModuleError: MongoMissingDependencyError };
+  let aws4: typeof import('aws4') | { kModuleError: MongoMissingDependencyError };
   try {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     aws4 = require('aws4');