From 667efdac83f3fc03427d2708add1f46052a2086a Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Sat, 22 Feb 2025 21:54:02 +0100 Subject: [PATCH] do not import "github.com/aquasecurity/trivy/pkg/fanal/image" --- pkg/util/trivy/image.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/util/trivy/image.go b/pkg/util/trivy/image.go index adf2e650004b69..068531fe00c53f 100644 --- a/pkg/util/trivy/image.go +++ b/pkg/util/trivy/image.go @@ -18,7 +18,6 @@ import ( "sync" "time" - fimage "github.com/aquasecurity/trivy/pkg/fanal/image" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" dimage "github.com/docker/docker/api/types/image" @@ -297,7 +296,12 @@ func (img *image) Name() string { } func (img *image) ID() (string, error) { - return fimage.ID(img) + // github.com/aquasecurity/trivy/pkg/fanal/image.ID(img) + h, err := img.ConfigName() + if err != nil { + return "", fmt.Errorf("unable to get the image ID: %w", err) + } + return h.String(), nil } func (img *image) Layers() ([]v1.Layer, error) {