bump golangci-lint

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
         cache: true
     - uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.55.2
+        version: v1.64.2
         args: --verbose
         skip-cache: true
     - name: Test

.golangci.yml

@@ -4,19 +4,37 @@ issues:
 linters:
   disable-all: true
   enable:
-  - errorlint
-  - gocritic
-  - gofmt
-  - goimports
-  - gomodguard
-  - gosimple
-  - govet
-  - ineffassign
-  - misspell
-  - nakedret
-  - revive
-  - testifylint
+    - copyloopvar
+    - depguard
+    - errcheck
+    - errorlint
+    - gocritic
+    - gocyclo
+    - gofmt
+    - goimports
+    - gomodguard
+    - revive
+    - gosimple
+    - govet
+    - ineffassign
+    - lll
+    - misspell
+    - nakedret
+    - nolintlint
+    - revive
+    - staticcheck
+    - testifylint
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
 linters-settings:
+  depguard:
+    rules:
+      all:
+        deny:
+          - pkg: gopkg.in/yaml.v2
+            desc: 'compose-go uses yaml.v3'
   gocritic:
     # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
     # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
@@ -35,6 +53,8 @@ linters-settings:
           recommendations:
           - errors
           - fmt
+  lll:
+    line-length: 200
   testifylint:
     disable:
     - float-compare

ci/Dockerfile

@@ -16,7 +16,7 @@ FROM golang:1.21
 
 WORKDIR /go/src
 
-ARG GOLANGCILINT_VERSION=v1.55.2
+ARG GOLANGCILINT_VERSION=v1.64.5
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION}
 RUN go install github.com/kunalkushwaha/ltag@latest && rm -rf /go/src/github.com/kunalkushwaha
 

cli/options.go

@@ -18,7 +18,6 @@ package cli
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -30,7 +29,6 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/consts"
 	"github.com/compose-spec/compose-go/v2/dotenv"
-	"github.com/compose-spec/compose-go/v2/errdefs"
 	"github.com/compose-spec/compose-go/v2/loader"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/compose-spec/compose-go/v2/utils"
@@ -551,14 +549,6 @@ func withListeners(options *ProjectOptions) func(*loader.Options) {
 	}
 }
 
-// getConfigPaths retrieves the config files for project based on project options
-func (o *ProjectOptions) getConfigPaths() ([]string, error) {
-	if len(o.ConfigPaths) != 0 {
-		return absolutePaths(o.ConfigPaths)
-	}
-	return nil, fmt.Errorf("no configuration file provided: %w", errdefs.ErrNotFound)
-}
-
 func findFiles(names []string, pwd string) []string {
 	candidates := []string{}
 	for _, n := range names {

cli/options_test.go

@@ -167,8 +167,9 @@ func TestProjectName(t *testing.T) {
 	})
 
 	t.Run("by COMPOSE_PROJECT_NAME", func(t *testing.T) {
-		os.Setenv("COMPOSE_PROJECT_NAME", "my_project_from_env") //nolint:errcheck
-		defer os.Unsetenv("COMPOSE_PROJECT_NAME")                //nolint:errcheck
+		err := os.Setenv("COMPOSE_PROJECT_NAME", "my_project_from_env")
+		assert.NilError(t, err)
+		defer os.Unsetenv("COMPOSE_PROJECT_NAME")
 		opts, err := NewProjectOptions([]string{"testdata/simple/compose.yaml"}, WithOsEnv)
 		assert.NilError(t, err)
 		p, err := ProjectFromOptions(context.TODO(), opts)
@@ -254,7 +255,7 @@ services:
 		os.Stdin = originalStdin
 	}()
 
-	w.WriteString(composeData)
+	_, _ = w.WriteString(composeData)
 	w.Close()
 
 	os.Stdin = r

dotenv/godotenv.go

@@ -30,7 +30,7 @@ var startsWithDigitRegex = regexp.MustCompile(`^\s*\d.*`) // Keys starting with
 // LookupFn represents a lookup function to resolve variables from
 type LookupFn func(string) (string, bool)
 
-var noLookupFn = func(s string) (string, bool) {
+var noLookupFn = func(_ string) (string, bool) {
 	return "", false
 }
 

dotenv/godotenv_test.go

@@ -269,7 +269,6 @@ func TestExpanding(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestVariableStringValueSeparator(t *testing.T) {
@@ -470,7 +469,7 @@ func TestLinesToIgnore(t *testing.T) {
 
 	for n, c := range cases {
 		t.Run(n, func(t *testing.T) {
-			got := string(newParser().getStatementStart(c.input))
+			got := newParser().getStatementStart(c.input)
 			if got != c.want {
 				t.Errorf("Expected:\t %q\nGot:\t %q", c.want, got)
 			}
@@ -718,7 +717,7 @@ func TestLoadWithFormat(t *testing.T) {
 		"ZOT": "QIX",
 	}
 
-	custom := func(r io.Reader, f string, lookup func(key string) (string, bool)) (map[string]string, error) {
+	custom := func(r io.Reader, _ string, lookup func(key string) (string, bool)) (map[string]string, error) {
 		vars := map[string]string{}
 		scanner := bufio.NewScanner(r)
 		for scanner.Scan() {

dotenv/godotenv_var_expansion_test.go

@@ -14,7 +14,7 @@ var envMap = map[string]string{
 	"TEST_VAR":  "Test Value",
 }
 
-var notFoundLookup = func(s string) (string, bool) {
+var notFoundLookup = func(_ string) (string, bool) {
 	return "", false
 }
 
@@ -45,7 +45,7 @@ func TestExpandIfEmptyOrUnset(t *testing.T) {
 		t.Run(expected.name, func(t *testing.T) {
 			result, err := expandVariables(expected.input, envMap, notFoundLookup)
 			require.NoError(t, err)
-			assert.Equal(t, result, expected.result)
+			assert.Equal(t, expected.result, result)
 		})
 	}
 }
@@ -77,7 +77,7 @@ func TestExpandIfUnset(t *testing.T) {
 		t.Run(expected.name, func(t *testing.T) {
 			result, err := expandVariables(expected.input, envMap, notFoundLookup)
 			require.NoError(t, err)
-			assert.Equal(t, result, expected.result)
+			assert.Equal(t, expected.result, result)
 		})
 	}
 }

dotenv/parser.go

@@ -115,7 +115,7 @@ loop:
 		switch rune {
 		case '=', ':', '\n':
 			// library also supports yaml-style value declaration
-			key = string(src[0:i])
+			key = src[0:i]
 			offset = i + 1
 			inherited = rune == '\n'
 			break loop
@@ -157,7 +157,7 @@ func (p *parser) extractVarValue(src string, envMap map[string]string, lookupFn
 		// Remove inline comments on unquoted lines
 		value, _, _ = strings.Cut(value, " #")
 		value = strings.TrimRightFunc(value, unicode.IsSpace)
-		retVal, err := expandVariables(string(value), envMap, lookupFn)
+		retVal, err := expandVariables(value, envMap, lookupFn)
 		return retVal, rest, err
 	}
 

dotenv/parser_test.go

@@ -39,7 +39,6 @@ func TestParseBytes(t *testing.T) {
 func TestParseVariable(t *testing.T) {
 	err := newParser().parse("%!(EXTRA string)=foo", map[string]string{}, nil)
 	assert.Error(t, err, "line 1: unexpected character \"%\" in variable name \"%!(EXTRA string)=foo\"")
-
 }
 
 func TestMemoryExplosion(t *testing.T) {