From 89e7b65f5b3e5956ebe3c3a0cb30d40a341bcb63 Mon Sep 17 00:00:00 2001 From: Christian Dupuis Date: Thu, 19 Jan 2023 10:07:04 +0100 Subject: [PATCH] Lint --- sbom/syft.go | 7 ++++--- sbom/trivy.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sbom/syft.go b/sbom/syft.go index c98826b..cd98d3f 100644 --- a/sbom/syft.go +++ b/sbom/syft.go @@ -31,9 +31,10 @@ import ( "github.com/anchore/syft/syft/pkg/cataloger/deb" "github.com/anchore/syft/syft/pkg/cataloger/rpm" "github.com/anchore/syft/syft/source" - "github.com/atomist-skills/go-skill" "github.com/pkg/errors" + "github.com/atomist-skills/go-skill" + "github.com/docker/index-cli-plugin/registry" "github.com/docker/index-cli-plugin/sbom/detect" "github.com/docker/index-cli-plugin/sbom/util" @@ -57,7 +58,7 @@ func syftSbom(cache *registry.ImageCache, lm *types.LayerMapping, resultChan cha resultChan <- result return } - + d, qualifiers := osQualifiers(distro) result.Distro = d @@ -111,7 +112,7 @@ func syftSbom(cache *registry.ImageCache, lm *types.LayerMapping, resultChan cha } } } - + result.Packages = make([]types.Package, 0) packages := packageCatalog.Sorted() for _, p := range packages { diff --git a/sbom/trivy.go b/sbom/trivy.go index c4f0b8a..5911aa5 100644 --- a/sbom/trivy.go +++ b/sbom/trivy.go @@ -35,9 +35,10 @@ import ( "github.com/aquasecurity/trivy/pkg/fanal/image" stypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/fanal/utils" - "github.com/atomist-skills/go-skill" "github.com/pkg/errors" + "github.com/atomist-skills/go-skill" + "github.com/docker/index-cli-plugin/registry" "github.com/docker/index-cli-plugin/types" ) @@ -67,7 +68,7 @@ func trivySbom(cache *registry.ImageCache, lm *types.LayerMapping, resultChan ch resultChan <- result return } - + art, err := aimage.NewArtifact(img, cacheClient, configOptions()) if err != nil { result.Status = types.Failed @@ -226,7 +227,7 @@ func configOptions() artifact.Option { DisabledAnalyzers: []analyzer.Type{analyzer.TypeDockerfile, analyzer.TypeSecret, analyzer.TypeHelm, analyzer.TypeTerraform, analyzer.TypeJSON, analyzer.TypeYaml}, } if v, ok := os.LookupEnv("ATOMIST_OFFLINE"); ok { - if o, err := strconv.ParseBool(v); err == nil && o{ + if o, err := strconv.ParseBool(v); err == nil && o { opts.Offline = true } }