Merge pull request #80 from oss-serverless/v3-sdk-fixes

Fixes for the v3 SDK

Author: GrahamCampbell

lib/aws/client-factory.js

@@ -13,6 +13,7 @@ const { LambdaClient } = require('@aws-sdk/client-lambda');
 const { S3Client } = require('@aws-sdk/client-s3');
 const { SSMClient } = require('@aws-sdk/client-ssm');
 const { STSClient } = require('@aws-sdk/client-sts');
+const { Upload } = require('@aws-sdk/lib-storage');
 
 // Map service names to their client classes
 const CLIENT_MAP = {
@@ -63,12 +64,22 @@ class AWSClientFactory {
   /**
    * Send a command to an AWS service
    * @param {string} serviceName - Name of the AWS service
-   * @param {Object} command - AWS SDK v3 command instance
+   * @param {Object} command - AWS SDK v3 command instance or special upload indicator
    * @param {Object} clientConfig - Optional client configuration override
    * @returns {Promise} Result of the AWS API call
    */
   async send(serviceName, command, clientConfig = {}) {
     const client = this.getClient(serviceName, clientConfig);
+
+    if (serviceName === 'S3' && command._isUploadRequest) {
+      const upload = new Upload({
+        client,
+        params: command.params,
+      });
+
+      return upload.done();
+    }
+
     return client.send(command);
   }
 }

lib/aws/commands.js

@@ -230,11 +230,13 @@ const COMMAND_MAP = {
  */
 function getCommand(serviceName, methodName) {
   const serviceCommands = COMMAND_MAP[serviceName];
+
   if (!serviceCommands) {
     throw new Error(`Unknown AWS service: ${serviceName}`);
   }
 
   const CommandClass = serviceCommands[methodName];
+
   if (!CommandClass) {
     throw new Error(`Unknown method '${methodName}' for service '${serviceName}'`);
   }
@@ -250,7 +252,15 @@ function getCommand(serviceName, methodName) {
  * @returns {Object} Command instance
  */
 function createCommand(serviceName, methodName, params = {}) {
+  if (serviceName === 'S3' && methodName === 'upload') {
+    return {
+      _isUploadRequest: true,
+      params,
+    };
+  }
+
   const CommandClass = getCommand(serviceName, methodName);
+
   return new CommandClass(params);
 }
 

lib/plugins/aws/invoke.js

@@ -100,9 +100,21 @@ class AwsInvoke {
     return this.provider.request('Lambda', 'invoke', params);
   }
 
+  payloadToString(payload) {
+    if (payload instanceof Uint8Array) {
+      return new TextDecoder().decode(payload);
+    }
+
+    if (Buffer.isBuffer(payload)) {
+      return payload.toString();
+    }
+
+    return payload;
+  }
+
   log(invocationReply) {
     if (invocationReply.Payload) {
-      const response = JSON.parse(invocationReply.Payload);
+      const response = JSON.parse(this.payloadToString(invocationReply.Payload));
 
       writeText(JSON.stringify(response, null, 4));
     }

lib/plugins/aws/provider.js

@@ -1798,10 +1798,20 @@ class AwsProvider {
    * @private
    */
   _getV3BaseConfig() {
-    const credentials = this.getCredentials();
+    // Convert v2 credentials format to v3 format
+    const { credentials: v2Creds } = this.getCredentials();
+    const credentials =
+      v2Creds && v2Creds.accessKeyId
+        ? {
+            accessKeyId: v2Creds.accessKeyId,
+            secretAccessKey: v2Creds.secretAccessKey,
+            sessionToken: v2Creds.sessionToken,
+          }
+        : undefined;
+
     return buildClientConfig({
       region: this.getRegion(),
-      credentials: credentials.accessKeyId ? credentials : undefined,
+      credentials,
     });
   }
 

package.json

@@ -41,6 +41,7 @@
     "@aws-sdk/client-ssm": "^3.588.0",
     "@aws-sdk/client-sts": "^3.588.0",
     "@aws-sdk/lib-dynamodb": "^3.588.0",
+    "@aws-sdk/lib-storage": "^3.588.0",
     "@aws-sdk/credential-providers": "^3.588.0",
     "@serverless/utils": "^6.13.1",
     "ajv": "^8.12.0",