From 7abd19eaf7335eec99aa13a3296771c51aa12256 Mon Sep 17 00:00:00 2001 From: Max Maass Date: Tue, 11 Jan 2022 08:20:25 +0100 Subject: [PATCH 1/2] Fix logging of cascading scan name Signed-off-by: Max Maass --- hooks/cascading-scans/hook/scan-helpers.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/cascading-scans/hook/scan-helpers.ts b/hooks/cascading-scans/hook/scan-helpers.ts index 2124d7c9f6..a7fa0d1f8d 100644 --- a/hooks/cascading-scans/hook/scan-helpers.ts +++ b/hooks/cascading-scans/hook/scan-helpers.ts @@ -135,7 +135,7 @@ export function mergeInheritedSelector(parentSelector: LabelSelector = {}, ruleS } export async function startSubsequentSecureCodeBoxScan(scan: Scan) { - console.log(`Starting Scan ${scan.metadata.name}`); + console.log(`Starting Scan ${scan.metadata.generateName}`); try { // Submitting the Scan to the kubernetes api @@ -148,7 +148,7 @@ export async function startSubsequentSecureCodeBoxScan(scan: Scan) { "false" ); } catch (error) { - console.error(`Failed to start Scan ${scan.metadata.name}`); + console.error(`Failed to start Scan ${scan.metadata.generateName}`); console.error(error); } } From 07fd2640e93ade6785b19b36d4f2d62c24ba50fb Mon Sep 17 00:00:00 2001 From: Max Maass Date: Tue, 11 Jan 2022 15:28:37 +0100 Subject: [PATCH 2/2] Log the final created scan name as well Signed-off-by: Max Maass --- hooks/cascading-scans/hook/scan-helpers.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hooks/cascading-scans/hook/scan-helpers.ts b/hooks/cascading-scans/hook/scan-helpers.ts index a7fa0d1f8d..52c52429f1 100644 --- a/hooks/cascading-scans/hook/scan-helpers.ts +++ b/hooks/cascading-scans/hook/scan-helpers.ts @@ -139,7 +139,7 @@ export async function startSubsequentSecureCodeBoxScan(scan: Scan) { try { // Submitting the Scan to the kubernetes api - await k8sApiCRD.createNamespacedCustomObject( + const createdScan = await k8sApiCRD.createNamespacedCustomObject( "execution.securecodebox.io", "v1", namespace, @@ -147,6 +147,7 @@ export async function startSubsequentSecureCodeBoxScan(scan: Scan) { scan, "false" ); + console.log(`-> Created scan ${createdScan.body["metadata"].name}`) } catch (error) { console.error(`Failed to start Scan ${scan.metadata.generateName}`); console.error(error);