Merge pull request #13897 from Budibase/fix/aws-session-token-s3-ver2

Allow using an AWS_SESSION_TOKEN for object storage with AWS S3

packages/backend-core/src/environment.ts

@@ -126,6 +126,7 @@ const environment = {
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   AWS_REGION: process.env.AWS_REGION,
   MINIO_URL: process.env.MINIO_URL,
   MINIO_ENABLED: process.env.MINIO_ENABLED || 1,

packages/backend-core/src/objectStore/objectStore.ts

@@ -101,6 +101,11 @@ export function ObjectStore(
     }
   }
 
+  // for AWS Credentials using temporary session token
+  if (!env.MINIO_ENABLED && env.AWS_SESSION_TOKEN) {
+    config.sessionToken = env.AWS_SESSION_TOKEN
+  }
+
   // custom S3 is in use i.e. minio
   if (env.MINIO_URL) {
     if (opts.presigning && env.MINIO_ENABLED) {

packages/server/src/environment.ts

@@ -48,6 +48,7 @@ const environment = {
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
   AWS_REGION: process.env.AWS_REGION,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   REDIS_URL: process.env.REDIS_URL,

packages/worker/src/environment.ts

@@ -24,6 +24,7 @@ const environment = {
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,