fix: Better error handling in vm scanner

ctrlplanedev · Jan 20, 2025 · 2de6509 · 2de6509
1 parent d96faab
commit 2de6509
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/apps/event-worker/src/resource-scan/google/vm.ts b/apps/event-worker/src/resource-scan/google/vm.ts
@@ -121,36 +121,35 @@ export const getGoogleVMResources = async (
     { workspaceId: workspace.id, config, googleServiceAccountEmail },
   );
 
-  return Promise.allSettled(
+  return Promise.all(
     config.projectIds.map(async (projectId) => {
-      const allResources: SCHEMA.InsertResource[] = [];
-      for await (const [_, instances] of vmClient.aggregatedListAsync({
-        project: projectId,
-        returnPartialSuccess: true,
-      })) {
-        if (instances.instances == null || instances.instances.length === 0)
-          continue;
-        const resources = instances.instances.map((instance) =>
-          instanceToResource(
-            instance,
-            workspace.id,
-            config.resourceProviderId,
-            projectId,
-          ),
+      try {
+        const allResources: SCHEMA.InsertResource[] = [];
+        for await (const [_, instances] of vmClient.aggregatedListAsync({
+          project: projectId,
+          returnPartialSuccess: true,
+        })) {
+          if (instances.instances == null || instances.instances.length === 0)
+            continue;
+          const resources = instances.instances.map((instance) =>
+            instanceToResource(
+              instance,
+              workspace.id,
+              config.resourceProviderId,
+              projectId,
+            ),
+          );
+          allResources.push(...resources);
+        }
+
+        return allResources;
+      } catch (error: any) {
+        log.error(
+          `Unable to list VMs for provider ${config.id} and project ${projectId}: ${error.message}`,
+          { error, projectId, providerId: config.resourceProviderId },
         );
-        allResources.push(...resources);
+        return [];
       }
-
-      return allResources;
     }),
-  ).then((results) =>
-    results.flatMap((result) => {
-      if (result.status === "fulfilled") return result.value;
-      log.error(
-        `Unable to list VMs for provider ${config.id}: ${result.reason}`,
-        { error: result.reason },
-      );
-      return [];
-    }),
-  );
+  ).then((results) => results.flat());
 };