From 2d136aaa933fd833cd7cbf361f6e8c2e10dbf6ea Mon Sep 17 00:00:00 2001
From: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
Date: Thu, 25 Jul 2024 23:01:31 +0200
Subject: [PATCH] Few fixes 2

Required-githooks: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
---
 .github/workflows/trivy_new.yml | 14 ++++++++++++--
 utils/trivy/trivy.yaml          |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/trivy_new.yml b/.github/workflows/trivy_new.yml
index 041cd21e52b..4a42503aff6 100644
--- a/.github/workflows/trivy_new.yml
+++ b/.github/workflows/trivy_new.yml
@@ -19,8 +19,7 @@ jobs:
           scan-type: 'fs'
           scan-ref: '.'
           trivy-config: 'utils/trivy/trivy.yaml'
-          output: 'trivy-report-daos.txt'
-          template: '@./utils/trivy/csv.tpl'
+          format: template
 
       - name: Prepare the report to be uploaded to the GitHub artifact store
         run: |
@@ -34,6 +33,17 @@ jobs:
           path: report/*
           name: trivy-report-daos
 
+      - name: Run Trivy vulnerability scanner in repo mode
+        uses: aquasecurity/trivy-action@0.24.0
+        with:
+          scan-type: 'fs'
+          scan-ref: '.'
+          trivy-config: 'utils/trivy/trivy.yaml'
+          format: 'table'
+
+      - name: Show results
+        run: cat trivy-report-daos.txt
+
       - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@0.24.0
         with:
diff --git a/utils/trivy/trivy.yaml b/utils/trivy/trivy.yaml
index f3790e27e48..fbd3d205bda 100644
--- a/utils/trivy/trivy.yaml
+++ b/utils/trivy/trivy.yaml
@@ -20,7 +20,6 @@ db:
 debug: false
 dependency-tree: true
 exit-code: 0
-format: template
 generate-default-config: false
 ignore-policy: ""
 ignorefile: ./utils/trivy/.trivyignore
@@ -198,6 +197,7 @@ misconfiguration:
 module:
   dir:
   enable-modules: []
+output: "trivy-report-daos.txt"
 output-plugin-arg: ""
 quiet: false
 registry: