From f83c6ba87276d8fb842e264b7fdb7dc99b4ecc05 Mon Sep 17 00:00:00 2001 From: "agent-platform-auto-pr[bot]" <153269286+agent-platform-auto-pr[bot]@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:20:14 +0100 Subject: [PATCH] [Backport 7.64.x] trivy: fix skip/only dirs in os + languages mode (#34761) Co-authored-by: Paul Cacheux --- pkg/util/trivy/trivy.go | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/util/trivy/trivy.go b/pkg/util/trivy/trivy.go index 725fbf6dab7c1..aea5ece342e69 100644 --- a/pkg/util/trivy/trivy.go +++ b/pkg/util/trivy/trivy.go @@ -111,27 +111,27 @@ func getDefaultArtifactOption(opts sbom.ScanOptions) artifact.Option { } else if looselyCompareAnalyzers(opts.Analyzers, []string{OSAnalyzers, LanguagesAnalyzers}) { option.WalkerOption.SkipDirs = append( option.WalkerOption.SkipDirs, - "bin/**", - "boot/**", - "dev/**", - "media/**", - "mnt/**", - "proc/**", - "run/**", - "sbin/**", - "sys/**", - "tmp/**", - "usr/bin/**", - "usr/sbin/**", - "var/cache/**", - "var/lib/containerd/**", - "var/lib/containers/**", - "var/lib/docker/**", - "var/lib/libvirt/**", - "var/lib/snapd/**", - "var/log/**", - "var/run/**", - "var/tmp/**", + "/bin/**", + "/boot/**", + "/dev/**", + "/media/**", + "/mnt/**", + "/proc/**", + "/run/**", + "/sbin/**", + "/sys/**", + "/tmp/**", + "/usr/bin/**", + "/usr/sbin/**", + "/var/cache/**", + "/var/lib/containerd/**", + "/var/lib/containers/**", + "/var/lib/docker/**", + "/var/lib/libvirt/**", + "/var/lib/snapd/**", + "/var/log/**", + "/var/run/**", + "/var/tmp/**", ) }