[dev] [Marfuen] mariano/more-5 (#1585)

* chore(s3): update S3 bucket handling to use environment variable

---------

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>

Author: github-actions[bot]

apps/app/src/ai/tools/store-to-s3.ts

@@ -1,4 +1,5 @@
-import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { s3Client } from '@/app/s3';
+import { PutObjectCommand } from '@aws-sdk/client-s3';
 import type { UIMessage, UIMessageStreamWriter } from 'ai';
 import { tool } from 'ai';
 import z from 'zod/v3';
@@ -8,25 +9,14 @@ interface Params {
   writer: UIMessageStreamWriter<UIMessage<never, DataPart>>;
 }
 
-const DEFAULTS = {
-  bucket: 'comp-testing-lambda-tasks',
-  region: 'us-east-1',
-  orgId: 'org_689ce3dced87cc45f600a04b',
-  taskId: 'tsk_689ce3dd6f19f4cf1f0ea061',
-};
-
 const inputSchema = z.object({
   content: z.string().min(1).describe('The full file content to store'),
-  bucket: z.string().optional().describe('Target S3 bucket'),
-  region: z.string().optional().describe('AWS region for the S3 bucket'),
   orgId: z.string().optional().describe('Organization identifier'),
   taskId: z.string().optional().describe('Task identifier'),
   contentType: z.string().optional().describe('MIME type, defaults to text/plain for generic code'),
 });
 interface ToolInput {
   content: string;
-  bucket?: string;
-  region?: string;
   orgId?: string;
   taskId?: string;
   contentType?: string;
@@ -41,7 +31,7 @@ export const storeToS3 = ({ writer }: Params) => {
       const { toolCallId } = ctx;
       const parsed: unknown = inputSchema.parse(args);
       const input = parsed as ToolInput;
-      const { content, bucket, region, orgId, taskId, contentType } = input;
+      const { content, orgId, taskId, contentType } = input;
 
       // Validate task format: must export a function via module.exports
       // Validate task format: must export a function with only event parameter
@@ -79,10 +69,9 @@ export const storeToS3 = ({ writer }: Params) => {
         });
         return message;
       }
-      const resolvedBucket = bucket || DEFAULTS.bucket;
-      const resolvedRegion = region || DEFAULTS.region;
-      const resolvedOrgId = orgId || DEFAULTS.orgId;
-      const resolvedTaskId = taskId || DEFAULTS.taskId;
+      const resolvedBucket = process.env.TASKS_AUTOMATION_BUCKET;
+      const resolvedOrgId = orgId;
+      const resolvedTaskId = taskId;
       const keyBase = `${resolvedOrgId}/${resolvedTaskId}`;
       const key = `${keyBase}.automation.js`;
 
@@ -93,20 +82,11 @@ export const storeToS3 = ({ writer }: Params) => {
           status: 'uploading',
           bucket: resolvedBucket,
           key,
-          region: resolvedRegion,
         },
       });
 
       try {
-        const credentials =
-          process.env.APP_AWS_ACCESS_KEY_ID && process.env.APP_AWS_SECRET_ACCESS_KEY
-            ? {
-                accessKeyId: process.env.APP_AWS_ACCESS_KEY_ID as string,
-                secretAccessKey: process.env.APP_AWS_SECRET_ACCESS_KEY as string,
-              }
-            : undefined;
-        const s3 = new S3Client({ region: resolvedRegion, credentials });
-        await s3.send(
+        await s3Client.send(
           new PutObjectCommand({
             Bucket: resolvedBucket,
             Key: key,
@@ -130,7 +110,6 @@ export const storeToS3 = ({ writer }: Params) => {
             status: 'done',
             bucket: resolvedBucket,
             key,
-            region: resolvedRegion,
           },
         });
 
@@ -144,7 +123,6 @@ export const storeToS3 = ({ writer }: Params) => {
             status: 'error',
             bucket: resolvedBucket,
             key,
-            region: resolvedRegion,
             error: { message },
           },
         });

apps/app/src/app/api/tasks-automations/chat/prompt.md

@@ -276,8 +276,6 @@ Most APIs require specific identifiers:
    - Reply with ONLY "✓ Created automation script and saved to S3"
 
 2. S3 Storage Details:
-   - Bucket: `comp-testing-lambda-tasks`
-   - Region: `us-east-1`
    - Key: `{ORG_ID}/{TASK_ID}.automation.js` (from ACTUAL_VALUES_JSON)
    - The storeToS3 tool will handle all metadata automatically
 

apps/app/src/app/api/tasks-automations/lambda/upload/route.ts

@@ -2,27 +2,15 @@ import { s3Client } from '@/app/s3';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { NextResponse } from 'next/server';
 
-const DEFAULTS = {
-  bucket: 'comp-testing-lambda-tasks',
-  region: 'us-east-1',
-};
-
 export async function POST(req: Request) {
   try {
-    const {
-      orgId,
-      taskId,
-      content,
-      bucket,
-      region,
-    }: { orgId: string; taskId: string; content: string; bucket?: string; region?: string } =
+    const { orgId, taskId, content }: { orgId: string; taskId: string; content: string } =
       await req.json();
     if (!orgId || !taskId || typeof content !== 'string') {
       return NextResponse.json({ error: 'Missing orgId, taskId or content' }, { status: 400 });
     }
 
-    const resolvedBucket = bucket || DEFAULTS.bucket;
-    const resolvedRegion = region || DEFAULTS.region;
+    const resolvedBucket = process.env.TASKS_AUTOMATION_BUCKET;
     const key = `${orgId}/${taskId}.js`;
 
     await s3Client.send(

apps/app/src/app/api/tasks-automations/s3/get/route.ts

@@ -16,7 +16,7 @@ export async function GET(req: Request) {
     // Get object from S3
     const { Body } = await s3Client.send(
       new GetObjectCommand({
-        Bucket: process.env.TASKS_AUTOMATION_BUCKET || 'comp-testing-lambda-tasks',
+        Bucket: process.env.TASKS_AUTOMATION_BUCKET,
         Key: key,
       }),
     );

apps/app/src/app/api/tasks-automations/s3/list/route.ts

@@ -16,7 +16,7 @@ export async function GET(req: Request) {
     // List objects in the organization's folder
     const response = await s3Client.send(
       new ListObjectsV2Command({
-        Bucket: process.env.TASKS_AUTOMATION_BUCKET || 'comp-testing-lambda-tasks',
+        Bucket: process.env.TASKS_AUTOMATION_BUCKET,
         Prefix: `${orgId}/`,
         MaxKeys: 100,
       }),

apps/app/src/app/api/tasks-automations/s3/upload/route.ts

@@ -14,11 +14,12 @@ export async function POST(req: Request) {
 
     // Determine the S3 key based on the type
     const s3Key = type === 'lambda' ? `${orgId}/${taskId}.js` : `${orgId}/${taskId}.${type}.js`;
+    const bucket = process.env.TASKS_AUTOMATION_BUCKET;
 
     // Upload to S3
     await s3Client.send(
       new PutObjectCommand({
-        Bucket: process.env.TASKS_AUTOMATION_BUCKET || 'comp-testing-lambda-tasks',
+        Bucket: bucket,
         Key: s3Key,
         Body: content,
         ContentType: 'application/javascript',
@@ -35,7 +36,7 @@ export async function POST(req: Request) {
 
     return NextResponse.json({
       success: true,
-      bucket: 'comp-testing-lambda-tasks',
+      bucket: bucket,
       key: s3Key,
       message: 'Script uploaded successfully',
     });

apps/app/src/app/api/tasks-automations/trigger/execute/route.ts

@@ -17,7 +17,7 @@ export async function POST(req: Request) {
     try {
       const { Body } = await s3Client.send(
         new GetObjectCommand({
-          Bucket: process.env.TASKS_AUTOMATION_BUCKET || 'comp-testing-lambda-tasks',
+          Bucket: process.env.TASKS_AUTOMATION_BUCKET,
           Key: `${orgId}/${taskId}.automation.js`,
         }),
       );

apps/app/src/jobs/tasks/automation/execute-script.ts

@@ -1,6 +1,7 @@
 import { getModelOptions } from '@/ai/gateway';
+import { s3Client } from '@/app/s3';
 import { decrypt, type EncryptedData } from '@/lib/encryption';
-import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { db } from '@db';
 import { logger, queue, task } from '@trigger.dev/sdk';
 import { generateObject } from 'ai';
@@ -37,32 +38,16 @@ export const executeAutomationScript = task({
     const { orgId, taskId } = payload;
     const logs: string[] = [];
 
-    if (
-      !process.env.APP_AWS_REGION ||
-      !process.env.APP_AWS_ACCESS_KEY_ID ||
-      !process.env.APP_AWS_SECRET_ACCESS_KEY
-    ) {
-      throw new Error('AWS S3 credentials or configuration missing. Check environment variables.');
-    }
-
     try {
       logger.info(`Executing automation script for task ${taskId} in org ${orgId}`);
 
       // Fetch the script from S3
       const scriptKey = `${orgId}/${taskId}.automation.js`;
       logs.push(`[SYSTEM] Fetching script from S3: ${scriptKey}`);
 
-      const s3Client = new S3Client({
-        region: process.env.APP_AWS_REGION,
-        credentials: {
-          accessKeyId: process.env.APP_AWS_ACCESS_KEY_ID,
-          secretAccessKey: process.env.APP_AWS_SECRET_ACCESS_KEY,
-        },
-      });
-
       const { Body } = await s3Client.send(
         new GetObjectCommand({
-          Bucket: process.env.TASKS_AUTOMATION_BUCKET || 'comp-testing-lambda-tasks',
+          Bucket: process.env.TASKS_AUTOMATION_BUCKET,
           Key: scriptKey,
         }),
       );