Adds extra linting rules

.golangci.yaml

@@ -10,9 +10,11 @@ linters:
   - ginkgolinter
   - gofmt
   - goimports
+  - gosec
   - importas
   - misspell
   - nestif
+  - nonamedreturns
   - prealloc
   - revive
   - stylecheck
@@ -28,8 +30,29 @@ linters-settings:
 
   importas:
     alias:
+    - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+      alias: metav1
+    - pkg: k8s.io/apimachinery/pkg/api/errors
+      alias: apierrors
+    - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+      alias: apiextensionsv1
+    - pkg: k8s.io/apimachinery/pkg/util/runtime
+      alias: utilruntime
+    - pkg: "^k8s\\.io/api/([^/]+)/(v[^/]+)$"
+      alias: $1$2
+    - pkg: sigs.k8s.io/controller-runtime
+      alias: ctrl
+    - pkg: github.com/operator-framework/rukpak/api/v1alpha1
+      alias: rukpakv1alpha1
   goimports:
     local-prefixes: github.com/operator-framework/deppy
 
+issues:
+  exclude-rules:
+  - path: "internal/solver/bench_test.go"
+    text: "G404: Use of weak random number generator"
+    linters:
+      - gosec
+
 output:
   format: tab

internal/solver/search_test.go

@@ -20,16 +20,16 @@ type TestScopeCounter struct {
 	inter.S
 }
 
-func (c *TestScopeCounter) Test(dst []z.Lit) (result int, out []z.Lit) {
-	result, out = c.S.Test(dst)
+func (c *TestScopeCounter) Test(dst []z.Lit) (int, []z.Lit) {
+	result, out := c.S.Test(dst)
 	*c.depth++
-	return
+	return result, out
 }
 
-func (c *TestScopeCounter) Untest() (result int) {
-	result = c.S.Untest()
+func (c *TestScopeCounter) Untest() int {
+	result := c.S.Untest()
 	*c.depth--
-	return
+	return result
 }
 
 func TestSearch(t *testing.T) {

internal/solver/solve.go

@@ -35,16 +35,19 @@ const (
 // containing only those Variables that were selected for
 // installation. If no solution is possible, or if the provided
 // Context times out or is cancelled, an error is returned.
-func (s *solver) Solve(_ context.Context) (result []deppy.Variable, err error) {
-	defer func() {
-		// This likely indicates a bug, so discard whatever
-		// return values were produced.
-		if derr := s.litMap.Error(); derr != nil {
-			result = nil
-			err = derr
-		}
-	}()
+func (s *solver) Solve(_ context.Context) ([]deppy.Variable, error) {
+	result, err := s.solve()
+
+	// This likely indicates a bug, so discard whatever
+	// return values were produced.
+	if derr := s.litMap.Error(); derr != nil {
+		return nil, derr
+	}
+
+	return result, err
+}
 
+func (s *solver) solve() ([]deppy.Variable, error) {
 	// teach all constraints to the solver
 	s.litMap.AddConstraints(s.g)
 

pkg/deppy/input/cache_entity_source.go

@@ -29,7 +29,8 @@ func (c CacheEntitySource) Get(_ context.Context, id deppy.Identifier) (*Entity,
 
 func (c CacheEntitySource) Filter(_ context.Context, filter Predicate) (EntityList, error) {
 	resultSet := EntityList{}
-	for _, entity := range c.entities {
+	for i := range c.entities {
+		entity := c.entities[i]
 		if filter(&entity) {
 			resultSet = append(resultSet, entity)
 		}
@@ -39,7 +40,8 @@ func (c CacheEntitySource) Filter(_ context.Context, filter Predicate) (EntityLi
 
 func (c CacheEntitySource) GroupBy(_ context.Context, fn GroupByFunction) (EntityListMap, error) {
 	resultSet := EntityListMap{}
-	for _, entity := range c.entities {
+	for i := range c.entities {
+		entity := c.entities[i]
 		keys := fn(&entity)
 		for _, key := range keys {
 			resultSet[key] = append(resultSet[key], entity)
@@ -49,7 +51,8 @@ func (c CacheEntitySource) GroupBy(_ context.Context, fn GroupByFunction) (Entit
 }
 
 func (c CacheEntitySource) Iterate(_ context.Context, fn IteratorFunction) error {
-	for _, entity := range c.entities {
+	for i := range c.entities {
+		entity := c.entities[i]
 		if err := fn(&entity); err != nil {
 			return err
 		}