core(deps): bump golang-cilint to v2.0.2 (#83)

Author: ChristopherHX

.github/actions/choco/Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG CHOCOVERSION=1.1.0
 
 RUN apk add --no-cache bash ca-certificates git \
-  && apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add mono mono-dev \
+  && apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community add mono mono-dev \
   && cert-sync /etc/ssl/certs/ca-certificates.crt \
   && wget "https://github.com/chocolatey/choco/archive/${CHOCOVERSION}.tar.gz" -O- | tar -xzf - \
   && cd choco-"${CHOCOVERSION}" \

.github/workflows/checks.yml

@@ -22,9 +22,9 @@ jobs:
         with:
           go-version-file: go.mod
           check-latest: true
-      - uses: golangci/golangci-lint-action@v6.5.0
+      - uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v1.64.8
+          version: v2.0.2
       - uses: megalinter/megalinter/flavors/[email protected]
         env:
           DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}

.golangci.yml

@@ -1,56 +1,65 @@
-# Minimum golangci-lint version required: v1.46.0
-run:
-  timeout: 3m
-
-issues:
-  exclude-dirs:
-    - report # megalinter results+fixes
-  max-issues-per-linter: 0
-  max-same-issues: 0
-
-linters-settings:
-  gocyclo:
-    # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 20
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-  importas:
-    alias:
-      - pkg: 'github.com/sirupsen/logrus'
-        alias: log
-      - pkg: 'github.com/stretchr/testify/assert'
-        alias: assert
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: github.com/pkg/errors
-            desc: Please use "errors" package from standard library
-          - pkg: gotest.tools/v3
-            desc: Please keep tests unified using only github.com/stretchr/testify
-          - pkg: log
-            desc: Please keep logging unified using only github.com/sirupsen/logrus
+version: "2"
 linters:
   enable:
-    - gosimple
-    - staticcheck
-    - unused
-    - govet
-    - revive
-    - gocyclo
-    - gosec
-    - unconvert
-    - dupl
-    - nakedret
-    - prealloc
+    - contextcheck
     - copyloopvar
-    - gocritic
-    - goimports
-    - whitespace
-    - misspell
     - depguard
+    - dupl
+    - gocritic
+    - gocyclo
+    - gosec
     - importas
-    - contextcheck
+    - misspell
+    - nakedret
     - nolintlint
+    - prealloc
     - revive
+    - unconvert
+    - whitespace
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/pkg/errors
+              desc: Please use "errors" package from standard library
+            - pkg: gotest.tools/v3
+              desc: Please keep tests unified using only github.com/stretchr/testify
+            - pkg: log
+              desc: Please keep logging unified using only github.com/sirupsen/logrus
+    gocritic:
+      disabled-checks:
+        - ifElseChain
+    gocyclo:
+      min-complexity: 20
+    importas:
+      alias:
+        - pkg: github.com/sirupsen/logrus
+          alias: log
+        - pkg: github.com/stretchr/testify/assert
+          alias: assert
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - report
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - report
+      - third_party$
+      - builtin$
+      - examples$

cmd/execute_test.go

@@ -33,13 +33,13 @@ func testMain(args []string) (exitCode int) {
 func TestMainHelp(t *testing.T) {
 	exitCode := testMain([]string{"cmd", "--help"})
 	if exitCode != 0 {
-		t.Errorf("Expected exit code 0, got %d", exitCode)
+		t.Errorf("expected exit code 0, got %d", exitCode)
 	}
 }
 
 func TestMainNoArgsError(t *testing.T) {
 	exitCode := testMain([]string{"cmd"})
 	if exitCode != 1 {
-		t.Errorf("Expected exit code 1, got %d", exitCode)
+		t.Errorf("expected exit code 1, got %d", exitCode)
 	}
 }

cmd/root.go

@@ -280,7 +280,7 @@ func readArgsFile(file string, split bool) []string {
 	defer func() {
 		err := f.Close()
 		if err != nil {
-			log.Errorf("Failed to close args file: %v", err)
+			log.Errorf("failed to close args file: %v", err)
 		}
 	}()
 	scanner := bufio.NewScanner(f)
@@ -555,7 +555,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
 		}
 		if plan != nil {
 			if len(plan.Stages) == 0 {
-				plannerErr = fmt.Errorf("Could not find any stages to run. View the valid jobs with `act --list`. Use `act --help` to find how to filter by Job ID/Workflow/Event Name")
+				plannerErr = fmt.Errorf("could not find any stages to run. View the valid jobs with `act --list`. Use `act --help` to find how to filter by Job ID/Workflow/Event Name")
 			}
 		}
 		if plan == nil && plannerErr != nil {

cmd/secrets.go

@@ -17,7 +17,7 @@ func newSecrets(secretList []string) secrets {
 		secretPairParts := strings.SplitN(secretPair, "=", 2)
 		secretPairParts[0] = strings.ToUpper(secretPairParts[0])
 		if strings.ToUpper(s[secretPairParts[0]]) == secretPairParts[0] {
-			log.Errorf("Secret %s is already defined (secrets are case insensitive)", secretPairParts[0])
+			log.Errorf("secret %s is already defined (secrets are case insensitive)", secretPairParts[0])
 		}
 		if len(secretPairParts) == 2 {
 			s[secretPairParts[0]] = secretPairParts[1]

pkg/artifacts/arifacts_v4.go

@@ -203,7 +203,7 @@ func (r artifactV4Routes) buildSignature(endp, expires, artifactName string, tas
 	mac.Write([]byte(endp))
 	mac.Write([]byte(expires))
 	mac.Write([]byte(artifactName))
-	mac.Write([]byte(fmt.Sprint(taskID)))
+	fmt.Fprint(mac, taskID)
 	return mac.Sum(nil)
 }
 
@@ -240,13 +240,13 @@ func (r artifactV4Routes) verifySignature(ctx *ArtifactContext, endp string) (in
 func (r *artifactV4Routes) parseProtbufBody(ctx *ArtifactContext, req protoreflect.ProtoMessage) bool {
 	body, err := io.ReadAll(ctx.Req.Body)
 	if err != nil {
-		log.Errorf("Error decode request body: %v", err)
+		log.Errorf("error decode request body: %v", err)
 		ctx.Error(http.StatusInternalServerError, "Error decode request body")
 		return false
 	}
 	err = protojson.Unmarshal(body, req)
 	if err != nil {
-		log.Errorf("Error decode request body: %v", err)
+		log.Errorf("error decode request body: %v", err)
 		ctx.Error(http.StatusInternalServerError, "Error decode request body")
 		return false
 	}
@@ -256,7 +256,7 @@ func (r *artifactV4Routes) parseProtbufBody(ctx *ArtifactContext, req protorefle
 func (r *artifactV4Routes) sendProtbufBody(ctx *ArtifactContext, req protoreflect.ProtoMessage) {
 	resp, err := protojson.Marshal(req)
 	if err != nil {
-		log.Errorf("Error encode response body: %v", err)
+		log.Errorf("error encode response body: %v", err)
 		ctx.Error(http.StatusInternalServerError, "Error encode response body")
 		return
 	}
@@ -318,11 +318,11 @@ func (r *artifactV4Routes) uploadArtifact(ctx *ArtifactContext) {
 
 		writer, ok := file.(io.Writer)
 		if !ok {
-			panic(errors.New("File is not writable"))
+			panic(errors.New("file is not writable"))
 		}
 
 		if ctx.Req.Body == nil {
-			panic(errors.New("No body given"))
+			panic(errors.New("no body given"))
 		}
 
 		_, err = io.Copy(writer, ctx.Req.Body)

pkg/artifacts/server.go

@@ -135,11 +135,11 @@ func uploads(router *httprouter.Router, baseDir string, fsys WriteFS) {
 
 		writer, ok := file.(io.Writer)
 		if !ok {
-			panic(errors.New("File is not writable"))
+			panic(errors.New("file is not writable"))
 		}
 
 		if req.Body == nil {
-			panic(errors.New("No body given"))
+			panic(errors.New("no body given"))
 		}
 
 		_, err = io.Copy(writer, req.Body)
@@ -310,7 +310,7 @@ func Serve(ctx context.Context, artifactPath string, addr string, port string) c
 		<-serverContext.Done()
 
 		if err := server.Shutdown(ctx); err != nil {
-			logger.Errorf("Failed shutdown gracefully - force shutdown: %v", err)
+			logger.Errorf("failed shutdown gracefully - force shutdown: %v", err)
 			server.Close()
 		}
 	}()

pkg/common/executor.go

@@ -227,7 +227,7 @@ func (e Executor) Finally(finally Executor) Executor {
 		defer func() {
 			err2 := finally(ctx)
 			if err2 != nil {
-				err = fmt.Errorf("Error occurred running finally: %v (original error: %v)", err2, err)
+				err = fmt.Errorf("error occurred running finally: %v (original error: %v)", err2, err)
 			}
 		}()
 		err = e(ctx)

pkg/common/git/git.go

@@ -74,7 +74,7 @@ func FindGitRevision(ctx context.Context, file string) (shortSha string, sha str
 	}
 
 	if head.Hash().IsZero() {
-		return "", "", fmt.Errorf("HEAD sha1 could not be resolved")
+		return "", "", fmt.Errorf("head sha1 could not be resolved")
 	}
 
 	hash := head.Hash().String()
@@ -261,7 +261,7 @@ func CloneIfRequired(ctx context.Context, refName plumbing.ReferenceName, input
 			} else if lgr, ok := logger.(*log.Logger); ok {
 				progressWriter = lgr.WriterLevel(log.DebugLevel)
 			} else {
-				log.Errorf("Unable to get writer from logger (type=%T)", logger)
+				log.Errorf("unable to get writer from logger (type=%T)", logger)
 				progressWriter = os.Stdout
 			}
 		}
@@ -279,7 +279,7 @@ func CloneIfRequired(ctx context.Context, refName plumbing.ReferenceName, input
 
 		r, err = git.PlainCloneContext(ctx, input.Dir, false, &cloneOptions)
 		if err != nil {
-			logger.Errorf("Unable to clone %v %s: %v", input.URL, refName, err)
+			logger.Errorf("unable to clone %v %s: %v", input.URL, refName, err)
 			return nil, err
 		}
 
@@ -340,7 +340,7 @@ func NewGitCloneExecutor(input NewGitCloneExecutorInput) common.Executor {
 		var hash *plumbing.Hash
 		rev := plumbing.Revision(input.Ref)
 		if hash, err = r.ResolveRevision(rev); err != nil {
-			logger.Errorf("Unable to resolve %s: %v", input.Ref, err)
+			logger.Errorf("unable to resolve %s: %v", input.Ref, err)
 		}
 
 		if hash.String() != input.Ref && len(input.Ref) >= 4 && strings.HasPrefix(hash.String(), input.Ref) {
@@ -369,7 +369,7 @@ func NewGitCloneExecutor(input NewGitCloneExecutorInput) common.Executor {
 		}
 
 		if hash, err = r.ResolveRevision(rev); err != nil {
-			logger.Errorf("Unable to resolve %s: %v", input.Ref, err)
+			logger.Errorf("unable to resolve %s: %v", input.Ref, err)
 			return err
 		}
 
@@ -390,7 +390,7 @@ func NewGitCloneExecutor(input NewGitCloneExecutorInput) common.Executor {
 				Branch: sourceRef,
 				Force:  true,
 			}); err != nil {
-				logger.Errorf("Unable to checkout %s: %v", sourceRef, err)
+				logger.Errorf("unable to checkout %s: %v", sourceRef, err)
 				return err
 			}
 		}
@@ -404,23 +404,23 @@ func NewGitCloneExecutor(input NewGitCloneExecutorInput) common.Executor {
 		if hash.String() != input.Ref && refType == "branch" {
 			logger.Debugf("Provided ref is not a sha. Updating branch ref after pull")
 			if hash, err = r.ResolveRevision(rev); err != nil {
-				logger.Errorf("Unable to resolve %s: %v", input.Ref, err)
+				logger.Errorf("unable to resolve %s: %v", input.Ref, err)
 				return err
 			}
 		}
 		if err = w.Checkout(&git.CheckoutOptions{
 			Hash:  *hash,
 			Force: true,
 		}); err != nil {
-			logger.Errorf("Unable to checkout %s: %v", *hash, err)
+			logger.Errorf("unable to checkout %s: %v", *hash, err)
 			return err
 		}
 
 		if err = w.Reset(&git.ResetOptions{
 			Mode:   git.HardReset,
 			Commit: *hash,
 		}); err != nil {
-			logger.Errorf("Unable to reset to %s: %v", hash.String(), err)
+			logger.Errorf("unable to reset to %s: %v", hash.String(), err)
 			return err
 		}