Cleaned up the deleteSboms helper function.

Signed-off-by: Vilem Obratil <[email protected]>

Author: vobratil

e2e/tests/api/dependencies/global.setup.ts

@@ -1,8 +1,3 @@
-import fs from "node:fs";
-import path from "node:path";
-
-import type { AxiosInstance } from "axios";
-
 import {
   ADVISORY_FILES,
   logger,

e2e/tests/api/features/performance-delete.ts

@@ -38,11 +38,15 @@ test.describe("Performance / Deletion", { tag: "@performance" }, () => {
   test.beforeEach(async ({ axios }) => {
     logger.info("Uploading SBOMs before deletion performance tests.");
 
-    var uploadResponses = await uploadSboms(axios, SBOM_DIR, SBOM_FILES);
+    const uploadResponses = await uploadSboms(axios, SBOM_DIR, SBOM_FILES);
 
-    uploadResponses.forEach((response) => sbomIds.push(response.data.id));
+    uploadResponses.forEach((response) => {
+      sbomIds.push(response.data.id);
+    });
 
-    sbomIds.forEach((id) => logger.info(id));
+    sbomIds.forEach((id) => {
+      logger.info(id);
+    });
 
     logger.info(`Uploaded ${sbomIds.length} SBOMs.`);
   });
@@ -103,15 +107,20 @@ test.describe("Performance / Deletion", { tag: "@performance" }, () => {
   test.afterEach(async ({ axios }) => {
     logger.info("Cleaning up SBOMs after deletion performance tests.");
 
-    await deleteSboms(axios, sbomIds).then((success) => {
-      if (success) {
-        logger.info("All SBOMs were deleted successfully.");
-      } else {
-        logger.warn(
-          "One or more SBOMs could not be deleted. Check the logs and/or consider deleting the SBOMs manually.",
-        );
-      }
-    });
+    const deleteResponses = await deleteSboms(axios, sbomIds);
+
+    if (
+      deleteResponses.every(
+        (result) =>
+          result.status === "fulfilled" && result.value?.status === 200,
+      )
+    ) {
+      logger.info("All SBOMS have been deleted successfully.");
+    } else {
+      logger.warn(
+        "Some SBOM deletions were unsuccessful. Check the logs and/or consider deleting the SBOMs manually.",
+      );
+    }
 
     sbomIds = [];
   });

e2e/tests/api/helpers/delete.ts

@@ -15,16 +15,10 @@ export async function deleteSboms(axios: AxiosInstance, sbomIds: string[]) {
   }
 
   const deletionPromises = existingSbomIds.map((sbomId) =>
-    axios.delete(`/api/v2/sbom/${sbomId}`).catch((error) => {
-      logger.error(`Failed to delete SBOM with ID: ${sbomId}`, error);
-    }),
+    axios.delete(`/api/v2/sbom/${sbomId}`),
   );
 
-  const results = await Promise.allSettled(deletionPromises);
+  const responses = await Promise.allSettled(deletionPromises);
 
-  const allSuccessful = results.every(
-    (result) => result.status === "fulfilled" && result.value?.status === 200,
-  );
-
-  return allSuccessful;
+  return responses;
 }