From 6b64b5bf9cf45d02f138c40e6dd81076a25b0450 Mon Sep 17 00:00:00 2001
From: Artsiom Siamashka <artsiom.siamashka@pivotics.com>
Date: Tue, 14 Oct 2025 20:16:09 +0200
Subject: [PATCH] Refactored sec scan function

---
 vars/secops.groovy | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vars/secops.groovy b/vars/secops.groovy
index 97fd879..60c4489 100644
--- a/vars/secops.groovy
+++ b/vars/secops.groovy
@@ -1,6 +1,10 @@
 def secScan(script, image) {
+    def reportDir = "/var/jenkins_home/secscan_reports/${script.env.JOB_NAME}/"
+    def imageName = image.split("/").last().replaceAll("[:/]", "_")
+    def timestamp = new Date().format("yyyyMMdd_HHmmss")
+    def reportName = "secscan_report_${imageName}_${timestamp}.html"
     sh """
-        mkdir -p /var/jenkins_home/secscan_reports/${script.env.JOB_NAME}/
+        mkdir -p ${reportDir}
         docker run \
         -v ./trivy_cache:/root/.cache \
         -v /var/run/docker.sock:/var/run/docker.sock \
@@ -9,6 +13,6 @@ def secScan(script, image) {
         --template "@contrib/html.tpl" \
         -o /dev/stdout \
         image --exit-code 1 --severity HIGH,CRITICAL \
-        ${image} > /var/jenkins_home/secscan_reports/${script.env.JOB_NAME}/secscan_report_\$(date +"%Y%m%d_%H%M%S")_${image}.html
+        ${image} > ${reportDir}/${reportName}
     """
 }
\ No newline at end of file