chore: Update syft bootstrap tools to latest versions. (#1682)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

syft/cpe/cpe.go

@@ -106,9 +106,8 @@ func stripSlashes(s string) string {
 	for i, c := range s {
 		if c == '\\' && i+1 < len(s) && strings.ContainsRune(allowedCPEPunctuation, rune(s[i+1])) {
 			continue
-		} else {
-			sb.WriteRune(c)
 		}
+		sb.WriteRune(c)
 	}
 	return sb.String()
 }

syft/pkg/cataloger/catalog.go

@@ -105,7 +105,7 @@ func runCataloger(cataloger pkg.Cataloger, resolver source.FileResolver) (catalo
 // request.
 //
 //nolint:funlen
-func Catalog(resolver source.FileResolver, release *linux.Release, parallelism int, catalogers ...pkg.Cataloger) (*pkg.Catalog, []artifact.Relationship, error) {
+func Catalog(resolver source.FileResolver, _ *linux.Release, parallelism int, catalogers ...pkg.Cataloger) (*pkg.Catalog, []artifact.Relationship, error) {
 	catalog := pkg.NewCatalog()
 	var allRelationships []artifact.Relationship
 

syft/pkg/cataloger/erlang/erlang_parser.go

@@ -82,11 +82,12 @@ func printError(data []byte, i int) string {
 		if c == '\n' {
 			prev = append(prev, curr.String())
 			curr.Reset()
+
 			if idx >= i {
 				break
-			} else {
-				line++
 			}
+
+			line++
 			char = 1
 			continue
 		}

syft/pkg/cataloger/javascript/parse_package_lock.go

@@ -104,9 +104,8 @@ func parsePackageLock(resolver source.FileResolver, _ *generic.Environment, read
 			if name == "" {
 				if pkgMeta.Name == "" {
 					continue
-				} else {
-					name = pkgMeta.Name
 				}
+				name = pkgMeta.Name
 			}
 
 			// handles alias names

syft/source/mock_resolver.go

@@ -199,7 +199,7 @@ func (r MockResolver) FilesByBasename(filenames ...string) ([]Location, error) {
 	return results, nil
 }
 
-func (r MockResolver) FilesByBasenameGlob(globs ...string) ([]Location, error) {
+func (r MockResolver) FilesByBasenameGlob(_ ...string) ([]Location, error) {
 	// TODO implement me
 	panic("implement me")
 }