fix(app): fix AWS cloud test error caused by improper usage of batchTriggerAndWait (#1608)

Co-authored-by: chasprowebdev <chasgarciaprowebdev@gmail.com>

Author: github-actions[bot]

apps/app/src/app/(app)/[orgId]/tests/dashboard/actions/run-tests.ts

@@ -1,8 +1,7 @@
 'use server';
 
-import { sendIntegrationResults } from '@/jobs/tasks/integration/integration-results';
+import { runIntegrationTests } from '@/jobs/tasks/integration/run-integration-tests';
 import { auth } from '@/utils/auth';
-import { db } from '@db';
 import { tasks } from '@trigger.dev/sdk';
 import { revalidatePath } from 'next/cache';
 import { headers } from 'next/headers';
@@ -27,54 +26,29 @@ export const runTests = async () => {
     };
   }
 
-  const integrations = await db.integration.findMany({
-    where: {
+  try {
+    const handle = await tasks.trigger<typeof runIntegrationTests>('run-integration-tests', {
       organizationId: orgId,
-      integrationId: {
-        in: ['aws', 'gcp', 'azure'],
-      },
-    },
-    select: {
-      id: true,
-      name: true,
-      integrationId: true,
-      settings: true,
-      userSettings: true,
-      organization: {
-        select: {
-          id: true,
-          name: true,
-        },
-      },
-    },
-  });
+    });
+
+    const headersList = await headers();
+    let path =
+      headersList.get("x-pathname") || headersList.get("referer") || "";
+    path = path.replace(/\/[a-z]{2}\//, "/");
+
+    revalidatePath(path);
 
-  if (!integrations) {
+    return {
+      success: true,
+      errors: null,
+      taskId: handle.id,
+    };
+  } catch (error) {
+    console.error('Error triggering integration tests:', error);
+    
     return {
       success: false,
-      errors: ['No integrations found'],
+      errors: [error instanceof Error ? error.message : 'Failed to trigger integration tests'],
     };
   }
-
-  const batchHandle = await tasks.batchTriggerAndWait<typeof sendIntegrationResults>(
-    'send-integration-results',
-    integrations.map((integration) => ({
-      payload: {
-        integration: {
-          id: integration.id,
-          name: integration.name,
-          integration_id: integration.integrationId,
-          settings: integration.settings,
-          user_settings: integration.userSettings,
-          organization: integration.organization,
-        },
-      },
-    })),
-  );
-
-  revalidatePath(`/${orgId}/tests/dashboard`);
-  return {
-    success: true,
-    errors: null,
-  };
 };

apps/app/src/jobs/tasks/integration/run-integration-tests.ts

@@ -0,0 +1,80 @@
+import { db } from '@db';
+import { logger, task } from '@trigger.dev/sdk';
+import { sendIntegrationResults } from './integration-results';
+
+export const runIntegrationTests = task({
+  id: 'run-integration-tests',
+  run: async (payload: { organizationId: string }) => {
+    const { organizationId } = payload;
+
+    logger.info(`Running integration tests for organization: ${organizationId}`);
+
+    const integrations = await db.integration.findMany({
+      where: {
+        organizationId: organizationId,
+        integrationId: {
+          in: ['aws', 'gcp', 'azure'],
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+        integrationId: true,
+        settings: true,
+        userSettings: true,
+        organization: {
+          select: {
+            id: true,
+            name: true,
+          },
+        },
+      },
+    });
+
+    if (!integrations || integrations.length === 0) {
+      logger.warn(`No integrations found for organization: ${organizationId}`);
+      return {
+        success: false,
+        error: 'No integrations found',
+        organizationId,
+      };
+    }
+
+    logger.info(`Found ${integrations.length} integrations to test for organization: ${organizationId}`);
+
+    const batchItems = integrations.map((integration) => ({
+      payload: {
+        integration: {
+          id: integration.id,
+          name: integration.name,
+          integration_id: integration.integrationId,
+          settings: integration.settings,
+          user_settings: integration.userSettings,
+          organization: integration.organization,
+        },
+      },
+    }));
+
+    try {
+      const batchHandle = await sendIntegrationResults.batchTriggerAndWait(batchItems);
+      
+      logger.info(`Successfully completed batch integration tests for organization: ${organizationId}`);
+      
+      return {
+        success: true,
+        organizationId,
+        integrationsCount: integrations.length,
+        batchHandleId: batchHandle.id,
+      };
+    } catch (error) {
+      logger.error(`Failed to run integration tests for organization ${organizationId}: ${error}`);
+      
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : String(error),
+        organizationId,
+        integrationsCount: integrations.length,
+      };
+    }
+  },
+});