@teamkeel/functions-runtime 0.402.0 → 0.403.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.402.0",
+  "version": "0.403.0",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {

package/src/File.js

@@ -9,6 +9,37 @@ const { useDatabase } = require("./database");
 const { DatabaseError } = require("./errors");
 const KSUID = require("ksuid");
 
+const s3Client = (() => {
+  if (!process.env.KEEL_FILES_BUCKET_NAME) {
+    return null;
+  }
+
+  // Set in integration tests to send all AWS API calls to a test server
+  // for mocking
+  const endpoint = process.env.TEST_AWS_ENDPOINT;
+
+  return new S3Client({
+    region: process.env.KEEL_REGION,
+
+    // If a test endpoint is provided then use some test credentials rather than fromEnv()
+    credentials: endpoint
+      ? {
+          accessKeyId: "test",
+          secretAccessKey: "test",
+        }
+      : fromEnv(),
+
+    // If a custom endpoint is set we need to use a custom resolver. Just settng the base endpoint isn't enough for S3 as it
+    // as the default resolver uses the bucket name as a sub-domain, which likely won't work with the custom endpoint.
+    // By impleenting a full resolver we can force it to be the endpoint we want.
+    endpointProvider: () => {
+      return {
+        url: URL.parse(endpoint),
+      };
+    },
+  });
+})();
+
 class InlineFile {
   constructor({ filename, contentType }) {
     this._filename = filename;
@@ -109,12 +140,7 @@ class File extends InlineFile {
       return Buffer.from(arrayBuffer);
     }
 
-    if (isS3Storage()) {
-      const s3Client = new S3Client({
-        credentials: fromEnv(),
-        region: process.env.KEEL_REGION,
-      });
-
+    if (s3Client) {
       const params = {
         Bucket: process.env.KEEL_FILES_BUCKET_NAME,
         Key: "files/" + this.key,
@@ -157,12 +183,7 @@ class File extends InlineFile {
   }
 
   async getPresignedUrl() {
-    if (isS3Storage()) {
-      const s3Client = new S3Client({
-        credentials: fromEnv(),
-        region: process.env.KEEL_REGION,
-      });
-
+    if (s3Client) {
       const command = new GetObjectCommand({
         Bucket: process.env.KEEL_FILES_BUCKET_NAME,
         Key: "files/" + this.key,
@@ -203,12 +224,7 @@ class File extends InlineFile {
 }
 
 async function storeFile(contents, key, filename, contentType, expires) {
-  if (isS3Storage()) {
-    const s3Client = new S3Client({
-      credentials: fromEnv(),
-      region: process.env.KEEL_REGION,
-    });
-
+  if (s3Client) {
     const params = {
       Bucket: process.env.KEEL_FILES_BUCKET_NAME,
       Key: "files/" + key,
@@ -269,10 +285,6 @@ async function storeFile(contents, key, filename, contentType, expires) {
   }
 }
 
-function isS3Storage() {
-  return "KEEL_FILES_BUCKET_NAME" in process.env;
-}
-
 module.exports = {
   InlineFile,
   File,