chore: update Go, dependencies, linter, workflows

Author: ldez

.github/workflows/go-cross.yml

@@ -25,11 +25,11 @@ jobs:
 
       # https://github.com/marketplace/actions/checkout
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # https://github.com/marketplace/actions/setup-go-environment
       - name: Set up Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go-version }}
 

.github/workflows/main.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v2.0.1
+      GOLANGCI_LINT_VERSION: v2.6.1
       CGO_ENABLED: 0
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -31,11 +31,11 @@ jobs:
           git diff --exit-code go.mod
           git diff --exit-code go.sum
 
-      # https://golangci-lint.run/usage/install#other-ci
       - name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }}
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
-          golangci-lint --version
+        uses: golangci/[email protected]
+        with:
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
+          install-only: true
 
       - name: Make
         run: make

.github/workflows/release.yml

@@ -35,10 +35,10 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 

.golangci.yml

@@ -28,7 +28,8 @@ linters:
     - tparallel
     - varnamelen
     - wrapcheck
-    - wsl
+    - noinlineerr
+    - wsl # deprecated
   settings:
     depguard:
       rules:
@@ -102,6 +103,10 @@ linters:
         text: 'ST1000: at least one file in a package should have a package comment'
       - path: (.+)\.go$
         text: 'package-comments: should have a package comment'
+    paths:
+      - internal/traefikv1/
+      - internal/traefikv2/
+      - internal/traefikv3/
 
 issues:
   max-issues-per-linter: 0

cmd/kv.go

@@ -57,6 +57,7 @@ func createTLSConfig(cmd *cobra.Command) (*tls.Config, error) {
 	}
 
 	ca := cmd.Flag("tls.ca").Value.String()
+
 	caPool, err := getCertPool(ca)
 	if err != nil {
 		return nil, err
@@ -108,13 +109,15 @@ func getCAContent(ca string) ([]byte, error) {
 		if os.IsNotExist(err) {
 			return []byte(ca), nil
 		}
+
 		return nil, err
 	}
 
 	caContent, err := os.ReadFile(filepath.Clean(ca))
 	if err != nil {
 		return nil, err
 	}
+
 	return caContent, nil
 }
 
@@ -126,6 +129,7 @@ func getClientAuth(ca string, caOptional bool) tls.ClientAuthType {
 	if caOptional {
 		return tls.VerifyClientCertIfGiven
 	}
+
 	return tls.RequireAndVerifyClientCert
 }
 
@@ -158,5 +162,6 @@ func getCertificate(privateKey, certContent string) (tls.Certificate, error) {
 	if errCertIsFile != nil {
 		return tls.Certificate{}, errCertIsFile
 	}
+
 	return tls.Certificate{}, errKeyIsFile
 }

cmd/root.go

@@ -119,6 +119,7 @@ func tree(root, indent string) error {
 	}
 
 	fmt.Println(fi.Name())
+
 	if !fi.IsDir() {
 		return nil
 	}
@@ -129,6 +130,7 @@ func tree(root, indent string) error {
 	}
 
 	var names []string
+
 	for _, fi := range fis {
 		if fi.Name()[0] != '.' {
 			names = append(names, fi.Name())
@@ -137,8 +139,10 @@ func tree(root, indent string) error {
 
 	for i, name := range names {
 		add := "│  "
+
 		if i == len(names)-1 {
 			fmt.Print(indent + "└──")
+
 			add = "   "
 		} else {
 			fmt.Print(indent + "├──")

dumper/file/file.go

@@ -78,6 +78,7 @@ func dump(acmeFile string, baseConfig *dumper.BaseConfig) error {
 
 func dumpV1(acmeFile string, baseConfig *dumper.BaseConfig) error {
 	data := &traefikv1.StoredData{}
+
 	err := readJSONFile(acmeFile, data)
 	if err != nil {
 		return err
@@ -88,6 +89,7 @@ func dumpV1(acmeFile string, baseConfig *dumper.BaseConfig) error {
 
 func dumpV2(acmeFile string, baseConfig *dumper.BaseConfig) error {
 	data := map[string]*traefikv2.StoredData{}
+
 	err := readJSONFile(acmeFile, &data)
 	if err != nil {
 		return err
@@ -98,6 +100,7 @@ func dumpV2(acmeFile string, baseConfig *dumper.BaseConfig) error {
 
 func dumpV3(acmeFile string, baseConfig *dumper.BaseConfig) error {
 	data := map[string]*traefikv3.StoredData{}
+
 	err := readJSONFile(acmeFile, &data)
 	if err != nil {
 		return err
@@ -106,18 +109,20 @@ func dumpV3(acmeFile string, baseConfig *dumper.BaseConfig) error {
 	return dumperv3.Dump(data, baseConfig)
 }
 
-func readJSONFile(acmeFile string, data interface{}) error {
+func readJSONFile(acmeFile string, data any) error {
 	source, err := os.Open(filepath.Clean(acmeFile))
 	if err != nil {
 		return fmt.Errorf("failed to open file %q: %w", acmeFile, err)
 	}
+
 	defer func() { _ = source.Close() }()
 
 	err = json.NewDecoder(source).Decode(data)
 	if errors.Is(err, io.EOF) {
 		log.Printf("warn: file %q may not be ready: %v", acmeFile, err)
 		return nil
 	}
+
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal file %q: %w", acmeFile, err)
 	}
@@ -134,6 +139,7 @@ func watch(ctx context.Context, acmeFile string, baseConfig *dumper.BaseConfig)
 	defer func() { _ = watcher.Close() }()
 
 	done := make(chan bool)
+
 	go func() {
 		var previousHash []byte
 
@@ -151,7 +157,9 @@ func watch(ctx context.Context, acmeFile string, baseConfig *dumper.BaseConfig)
 				hash, errW := manageEvent(ctx, watcher, event, acmeFile, previousHash, baseConfig)
 				if errW != nil {
 					log.Println("error:", errW)
+
 					done <- true
+
 					return
 				}
 
@@ -163,7 +171,9 @@ func watch(ctx context.Context, acmeFile string, baseConfig *dumper.BaseConfig)
 				}
 
 				log.Println("error:", errW)
+
 				done <- true
+
 				return
 			}
 		}
@@ -226,9 +236,11 @@ func calculateHash(acmeFile string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	defer func() { _ = file.Close() }()
 
 	h := sha256.New()
+
 	_, err = io.Copy(h, file)
 	if err != nil {
 		return nil, err

dumper/kv/convert.go

@@ -62,6 +62,7 @@ func convertOldAccount(account *AccountOld) *traefikv1.StoredData {
 			Key:         oldCert.Certificate.PrivateKey,
 		})
 	}
+
 	storedData.Certificates = certs
 
 	return storedData

dumper/v1/dumper.go

@@ -52,6 +52,7 @@ func Dump(data *traefikv1.StoredData, baseConfig *dumper.BaseConfig) error {
 	}
 
 	privateKeyPem := extractPEMPrivateKey(data.Account)
+
 	return os.WriteFile(filepath.Join(baseConfig.DumpPath, keysSubDir, "letsencrypt"+baseConfig.KeyInfo.Ext), privateKeyPem, 0o600)
 }
 
@@ -81,6 +82,7 @@ func writeKey(dumpPath string, cert *traefikv1.Certificate, info dumper.FileInfo
 
 func extractPEMPrivateKey(account *traefikv1.Account) []byte {
 	var block *pem.Block
+
 	switch account.KeyType {
 	case certcrypto.RSA2048, certcrypto.RSA4096, certcrypto.RSA8192:
 		block = &pem.Block{

dumper/v1/filename.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package v1