Skip to content

Commit 9db8c29

Browse files
committed
Cleaned up the deleteSboms helper function.
Signed-off-by: Vilem Obratil <vobratil@redhat.com>
1 parent ca50795 commit 9db8c29

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,20 @@ test.describe("Performance / Deletion", { tag: "@performance" }, () => {
103103
test.afterEach(async ({ axios }) => {
104104
logger.info("Cleaning up SBOMs after deletion performance tests.");
105105

106-
await deleteSboms(axios, sbomIds).then((success) => {
107-
if (success) {
108-
logger.info("All SBOMs were deleted successfully.");
109-
} else {
110-
logger.warn(
111-
"One or more SBOMs could not be deleted. Check the logs and/or consider deleting the SBOMs manually.",
112-
);
113-
}
114-
});
106+
let responses = await deleteSboms(axios, sbomIds);
107+
108+
if (
109+
responses.every(
110+
(result) =>
111+
result.status === "fulfilled" && result.value?.status === 200,
112+
)
113+
) {
114+
logger.info("All SBOMS have been deleted successfully.");
115+
} else {
116+
logger.warn(
117+
"Some SBOM deletions were unsuccessful. Check the logs and/or consider deleting the SBOMs manually.",
118+
);
119+
}
115120

116121
sbomIds = [];
117122
});

e2e/tests/api/helpers/delete.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@ export async function deleteSboms(axios: AxiosInstance, sbomIds: string[]) {
1515
}
1616

1717
const deletionPromises = existingSbomIds.map((sbomId) =>
18-
axios.delete(`/api/v2/sbom/${sbomId}`).catch((error) => {
19-
logger.error(`Failed to delete SBOM with ID: ${sbomId}`, error);
20-
}),
18+
axios.delete(`/api/v2/sbom/${sbomId}`),
2119
);
2220

23-
const results = await Promise.allSettled(deletionPromises);
21+
const responses = await Promise.allSettled(deletionPromises);
2422

25-
const allSuccessful = results.every(
26-
(result) => result.status === "fulfilled" && result.value?.status === 200,
27-
);
28-
29-
return allSuccessful;
23+
return responses;
3024
}

0 commit comments

Comments
 (0)