address linter complaints

paketo-buildpacks · Mar 24, 2022 · ca29922 · ca29922
1 parent f9cc5a1
commit ca29922
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5
 	github.com/gabriel-vasile/mimetype v1.4.0
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-version v1.4.0
 	github.com/onsi/gomega v1.18.1
 	github.com/pelletier/go-toml v1.9.4
 	github.com/sclevine/spec v1.4.0

diff --git a/go.sum b/go.sum
@@ -1264,7 +1264,6 @@ github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4=
 github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/author.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/author.go
@@ -31,6 +31,7 @@ func encodeAuthor(p pkg.Package) string {
 	return ""
 }
 
+//nolint:unused
 func decodeAuthor(author string, metadata interface{}) {
 	switch meta := metadata.(type) {
 	case *pkg.NpmPackageJSONMetadata:

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/component.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/component.go
@@ -45,6 +45,7 @@ func hasMetadata(p pkg.Package) bool {
 	return p.Metadata != nil
 }
 
+//nolint:unused,deadcode
 func decodeComponent(c *cyclonedx.Component) *pkg.Package {
 	values := map[string]string{}
 	for _, p := range *c.Properties {
@@ -71,12 +72,14 @@ func decodeComponent(c *cyclonedx.Component) *pkg.Package {
 	return p
 }
 
+//nolint:unused
 func decodeLocations(vals map[string]string) []source.Location {
 	v := common.Decode(reflect.TypeOf([]source.Location{}), vals, "syft:location", CycloneDXFields)
 	out, _ := v.([]source.Location)
 	return out
 }
 
+//nolint:unused
 func decodePackageMetadata(vals map[string]string, c *cyclonedx.Component, typ pkg.MetadataType) interface{} {
 	if typ != "" && c.Properties != nil {
 		metaTyp, ok := pkg.MetadataTypeByName[typ]

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/cpe.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/cpe.go
@@ -30,6 +30,7 @@ func encodeCPEs(p pkg.Package) (out []cyclonedx.Property) {
 	return
 }
 
+//nolint:unused
 func decodeCPEs(c *cyclonedx.Component) (out []pkg.CPE) {
 	if c.CPE != "" {
 		cp, err := pkg.NewCPE(c.CPE)

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/description.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/description.go
@@ -14,6 +14,7 @@ func encodeDescription(p pkg.Package) string {
 	return ""
 }
 
+//nolint:unused
 func decodeDescription(description string, metadata interface{}) {
 	switch meta := metadata.(type) {
 	case *pkg.ApkMetadata:

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/external_references.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/external_references.go
@@ -67,6 +67,7 @@ func encodeExternalReferences(p pkg.Package) *[]cyclonedx.ExternalReference {
 	return nil
 }
 
+//nolint:unused
 func decodeExternalReferences(c *cyclonedx.Component, metadata interface{}) {
 	if c.ExternalReferences == nil {
 		return
@@ -90,6 +91,7 @@ func decodeExternalReferences(c *cyclonedx.Component, metadata interface{}) {
 	}
 }
 
+//nolint:unused
 func findExternalRef(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) *cyclonedx.ExternalReference {
 	if c.ExternalReferences != nil {
 		for _, r := range *c.ExternalReferences {
@@ -101,13 +103,15 @@ func findExternalRef(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType
 	return nil
 }
 
+//nolint:unused
 func refURL(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) string {
 	if r := findExternalRef(c, typ); r != nil {
 		return r.URL
 	}
 	return ""
 }
 
+//nolint:unused
 func refComment(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) string {
 	if r := findExternalRef(c, typ); r != nil {
 		return r.Comment

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/format.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/format.go
@@ -161,7 +161,7 @@ func toBomDescriptorComponent(srcMetadata source.Metadata) *cyclonedx.Component
 	switch srcMetadata.Scheme {
 	case source.ImageScheme:
 		bomRef, err := artifact.IDByHash(srcMetadata.ImageMetadata.ID)
-		if err != nil {
+		if err != nil { //nolint:staticcheck
 			// log.Warnf("unable to get fingerprint of image metadata=%s: %+v", srcMetadata.ImageMetadata.ID, err)
 		}
 		return &cyclonedx.Component{
@@ -172,7 +172,7 @@ func toBomDescriptorComponent(srcMetadata source.Metadata) *cyclonedx.Component
 		}
 	case source.DirectoryScheme, source.FileScheme:
 		bomRef, err := artifact.IDByHash(srcMetadata.Path)
-		if err != nil {
+		if err != nil { //nolint:staticcheck
 			// log.Warnf("unable to get fingerprint of source metadata path=%s: %+v", srcMetadata.Path, err)
 		}
 		return &cyclonedx.Component{

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/group.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/group.go
@@ -11,6 +11,7 @@ func encodeGroup(p pkg.Package) string {
 	return ""
 }
 
+//nolint:unused
 func decodeGroup(group string, metadata interface{}) {
 	if meta, ok := metadata.(*pkg.JavaMetadata); ok {
 		if meta.PomProperties == nil {

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/licenses.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/licenses.go
@@ -24,6 +24,7 @@ func encodeLicenses(p pkg.Package) *cyclonedx.Licenses {
 	return nil
 }
 
+//nolint:unused
 func decodeLicenses(c *cyclonedx.Component) (out []string) {
 	if c.Licenses != nil {
 		for _, l := range *c.Licenses {

diff --git a/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/publisher.go b/sbom/internal/formats/cyclonedx13/cyclonedxhelpers/publisher.go
@@ -18,6 +18,7 @@ func encodePublisher(p pkg.Package) string {
 	return ""
 }
 
+//nolint:unused
 func decodePublisher(publisher string, metadata interface{}) {
 	switch meta := metadata.(type) {
 	case *pkg.ApkMetadata:

diff --git a/sbom/internal/formats/syft2/to_format_model.go b/sbom/internal/formats/syft2/to_format_model.go
@@ -23,7 +23,7 @@ import (
 
 func ToFormatModel(s sbom.SBOM) model.Document {
 	src, err := toSourceModel(s.Source)
-	if err != nil {
+	if err != nil { //nolint:staticcheck
 		// log.Warnf("unable to create syft-json source object: %+v", err)
 	}
 

diff --git a/sbom/sbom_format.go b/sbom/sbom_format.go
@@ -59,14 +59,6 @@ func (f sbomFormat) Extension() string {
 	}
 }
 
-func formatIDs() (ids []sbom.FormatID) {
-	for _, f := range additionalFormats {
-		ids = append(ids, f.ID())
-	}
-	ids = append(syft.FormatIDs(), ids...)
-	return ids
-}
-
 func formatByMediaType(mediaType string) (sbomFormat, error) {
 	baseType, params, err := mime.ParseMediaType(mediaType)
 	if err != nil {

diff --git a/scribe/example_test.go b/scribe/example_test.go
@@ -136,7 +136,7 @@ func ExampleEmitter_LaunchProcesses() {
 	//     some-type:       some-command
 	//     web (default):   web-command
 	//     some-other-type: some-other-command some args
-
+	//
 	//   Assigning launch processes:
 	//     some-type:       some-command
 	//     web (default):   web-command