remove an unused field

aquasecurity · Sep 14, 2022 · fcc2651 · fcc2651
1 parent 9eead27
commit fcc2651
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git a/pkg/fanal/artifact/sbom/sbom.go b/pkg/fanal/artifact/sbom/sbom.go
@@ -99,7 +99,6 @@ func (a Artifact) Inspect(_ context.Context) (types.ArtifactReference, error) {
 
 		// Keep an original report
 		CycloneDX: bom.CycloneDX,
-		SPDX:      bom.SPDX,
 	}, nil
 }
 

diff --git a/pkg/fanal/types/artifact.go b/pkg/fanal/types/artifact.go
@@ -4,7 +4,6 @@ import (
 	"time"
 
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/spdx/tools-golang/spdx"
 )
 
 type OS struct {
@@ -110,7 +109,6 @@ type ArtifactReference struct {
 
 	// SBOM
 	CycloneDX *CycloneDX
-	SPDX      *spdx.Document2_2
 }
 
 type ImageMetadata struct {

diff --git a/pkg/scanner/scan.go b/pkg/scanner/scan.go
@@ -162,7 +162,6 @@ func (s Scanner) ScanArtifact(ctx context.Context, options types.ScanOptions) (t
 			ImageConfig: artifactInfo.ImageMetadata.ConfigFile,
 		},
 		CycloneDX: artifactInfo.CycloneDX,
-		SPDX:      artifactInfo.SPDX,
 		Results:   results,
 	}, nil
 }

diff --git a/pkg/types/report.go b/pkg/types/report.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 
 	v1 "github.com/google/go-containerregistry/pkg/v1" // nolint: goimports
-	"github.com/spdx/tools-golang/spdx"
 
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 )
@@ -19,8 +18,6 @@ type Report struct {
 
 	// SBOM
 	CycloneDX *ftypes.CycloneDX `json:"-"` // Just for internal usage, not exported in JSON
-	SPDX      *spdx.Document2_2 `json:"-"` // Just for internal usage, not exported in JSON
-
 }
 
 // Metadata represents a metadata of artifact