Moved the uploadAdvisory method to helpers.

Signed-off-by: Vilem Obratil <vobratil@redhat.com>

Author: vobratil

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

@@ -10,7 +10,7 @@ import {
   SETUP_TIMEOUT,
 } from "../../common/constants";
 import { test as setup } from "../fixtures";
-import { uploadSboms } from "../helpers/upload";
+import { uploadAdvisories, uploadSboms } from "../helpers/upload";
 
 setup.describe("Ingest initial data", () => {
   setup.skip(
@@ -22,22 +22,9 @@ setup.describe("Ingest initial data", () => {
     setup.setTimeout(SETUP_TIMEOUT);
 
     logger.info("Setup: start uploading assets");
-    await uploadSboms(axios, SBOM_FILES, "../../common/assets/sbom/");
-    await uploadAdvisories(axios, ADVISORY_FILES);
+    await uploadSboms(axios, "../../common/assets/sbom/", SBOM_FILES);
+    await uploadAdvisories(axios, "../../common/assets/csaf/", ADVISORY_FILES);
     logger.info("Setup: upload finished successfully");
   });
 });
 
-const uploadAdvisories = async (axios: AxiosInstance, files: string[]) => {
-  const uploads = files.map((e) => {
-    const filePath = path.join(__dirname, `../../common/assets/csaf/${e}`);
-    fs.statSync(filePath); // Verify file exists
-
-    const fileStream = fs.createReadStream(filePath);
-    return axios.post("/api/v2/advisory", fileStream, {
-      headers: { "Content-Type": "application/json+bzip2" },
-    });
-  });
-
-  await Promise.all(uploads);
-};

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

@@ -39,7 +39,7 @@ test.describe("Performance / Deletion", { tag: "@performance" }, () => {
   test.beforeEach(async ({ axios }) => {
     logger.info("Uploading SBOMs before deletion performance tests.");
 
-    var uploads = await uploadSboms(axios, SBOM_FILES, SBOM_DIR);
+    var uploads = await uploadSboms(axios, SBOM_DIR, SBOM_FILES);
 
     uploads.forEach((upload) => sbomIds.push(upload.id));
 

e2e/tests/api/helpers/upload.ts

@@ -5,21 +5,36 @@ import type { AxiosInstance } from "axios";
 
 export async function uploadSboms(
   axios: AxiosInstance,
-  files: string[],
   sbomDirPath: string,
+  files: string[]
 ) {
   const uploads = files.map((e) => {
     const filePath = path.join(__dirname, `${sbomDirPath}/${e}`);
     fs.statSync(filePath); // Verify file exists
 
     const fileStream = fs.createReadStream(filePath);
-    const promise = axios.post("/api/v2/sbom", fileStream, {
+    return axios.post("/api/v2/sbom", fileStream, {
       headers: { "Content-Type": "application/json+bzip2" },
     });
 
-    return promise;
   });
 
   const responses = await Promise.all(uploads);
   return responses.map((response) => response.data);
 }
+
+export async function uploadAdvisories(axios: AxiosInstance, advisoryDirPath: string, files: string[]) {
+
+  const uploads = files.map((e) => {
+      const filePath = path.join(__dirname, `${advisoryDirPath}/${e}`);
+      fs.statSync(filePath); // Verify file exists
+  
+      const fileStream = fs.createReadStream(filePath);
+      return axios.post("/api/v2/advisory", fileStream, {
+        headers: { "Content-Type": "application/json+bzip2" },
+      });
+    });
+
+    const responses = await Promise.all(uploads)
+    return responses
+}