refactor: modernize code (#350)

* chore: enable `modernize` linter

* refactor: modernize code

Author: G-Rath

.golangci.yaml

@@ -24,8 +24,6 @@ linters:
     - wrapcheck       # not (yet) convinced
     - wsl             # disagree with, for now
     - wsl_v5          # disagree with, for now
-
-    - modernize
   settings:
     depguard:
       rules:

main.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"sort"
 	"strings"
 
 	"github.com/fatih/color"
@@ -269,9 +268,7 @@ func findLockfiles(r *reporter.Reporter, pathToLockOrDirectory string, parseAs s
 		r.PrintErrorf("Error reading %s: %v\n", pathToLockOrDirectory, err)
 	}
 
-	sort.Slice(lockfiles, func(i, j int) bool {
-		return lockfiles[i] < lockfiles[j]
-	})
+	slices.Sort(lockfiles)
 
 	return lockfiles, err != nil
 }
@@ -734,9 +731,7 @@ func writeUpdatedConfigs(r *reporter.Reporter, vulnsPerConfig map[string]map[str
 		for id := range vulns {
 			ignores = append(ignores, id)
 		}
-		sort.Slice(ignores, func(i, j int) bool {
-			return ignores[i] < ignores[j]
-		})
+		slices.Sort(ignores)
 
 		err := configer.UpdateWithIgnores(configPath, ignores)
 
@@ -752,9 +747,7 @@ func writeUpdatedConfigs(r *reporter.Reporter, vulnsPerConfig map[string]map[str
 		}
 	}
 
-	sort.Slice(lines, func(i, j int) bool {
-		return lines[i] < lines[j]
-	})
+	slices.Sort(lines)
 
 	for _, line := range lines {
 		if strings.HasPrefix(line, "Error updating") {

pkg/database/api-check.go

@@ -149,11 +149,7 @@ func batchPkgs(pkgs []internal.PackageDetails, batchSize int) [][]internal.Packa
 	)
 
 	for i := 0; i < len(pkgs); i += batchSize {
-		end := i + batchSize
-
-		if end > len(pkgs) {
-			end = len(pkgs)
-		}
+		end := min(i+batchSize, len(pkgs))
 
 		batches = append(batches, pkgs[i:end])
 	}

pkg/database/api-check_test.go

@@ -21,7 +21,7 @@ type apiPackage struct {
 type apiQuery struct {
 	Commit  string     `json:"commit,omitempty"`
 	Version string     `json:"version,omitempty"`
-	Package apiPackage `json:"package,omitempty"`
+	Package apiPackage `json:"package"`
 }
 
 func jsonMarshalQueryBatchResponse(t *testing.T, vulns []objectsWithIDs) []byte {

pkg/database/api.go

@@ -24,7 +24,7 @@ type apiQuery struct {
 	Package struct {
 		Name      string             `json:"name"`
 		Ecosystem internal.Ecosystem `json:"ecosystem"`
-	} `json:"package,omitempty"`
+	} `json:"package"`
 }
 
 var ErrOfflineDatabaseNotSupported = errors.New("API database does not support being used offline")

pkg/lockfile/helpers_test.go

@@ -2,6 +2,7 @@ package lockfile_test
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"testing"
 
@@ -34,13 +35,7 @@ func packageToString(pkg lockfile.PackageDetails) string {
 func hasPackage(t *testing.T, packages []lockfile.PackageDetails, pkg lockfile.PackageDetails) bool {
 	t.Helper()
 
-	for _, details := range packages {
-		if details == pkg {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(packages, pkg)
 }
 
 func expectPackage(t *testing.T, packages []lockfile.PackageDetails, pkg lockfile.PackageDetails) {

pkg/lockfile/parse-npm-lock.go

@@ -3,6 +3,7 @@ package lockfile
 import (
 	"encoding/json"
 	"fmt"
+	"maps"
 	"os"
 	"path"
 	"strings"
@@ -43,13 +44,8 @@ func pkgDetailsMapToSlice(m map[string]PackageDetails) []PackageDetails {
 func mergePkgDetailsMap(m1 map[string]PackageDetails, m2 map[string]PackageDetails) map[string]PackageDetails {
 	details := map[string]PackageDetails{}
 
-	for name, detail := range m1 {
-		details[name] = detail
-	}
-
-	for name, detail := range m2 {
-		details[name] = detail
-	}
+	maps.Copy(details, m1)
+	maps.Copy(details, m2)
 
 	return details
 }

pkg/lockfile/parse-requirements-txt.go

@@ -128,7 +128,7 @@ func parseRequirementsTxt(pathToLockfile string, requiredAlready map[string]stru
 
 		line = removeComments(line)
 
-		if ar := strings.TrimPrefix(line, "-r "); ar != line {
+		if ar, ok := strings.CutPrefix(line, "-r "); ok {
 			ar = filepath.Join(filepath.Dir(pathToLockfile), ar)
 
 			if _, ok := requiredAlready[ar]; ok {

pkg/lockfile/parse.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 )
@@ -81,9 +82,7 @@ func (ps Packages) Ecosystems() []Ecosystem {
 
 	slicedEcosystems := toSliceOfEcosystems(ecosystems)
 
-	sort.Slice(slicedEcosystems, func(i, j int) bool {
-		return slicedEcosystems[i] < slicedEcosystems[j]
-	})
+	slices.Sort(slicedEcosystems)
 
 	return slicedEcosystems
 }