Use golangci-lint 2.x

.golangci.yml

@@ -0,0 +1,28 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - client
+    - vendor
+
+run:
+  timeout: 10m

Makefile

@@ -220,7 +220,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

go.mod

@@ -1,8 +1,6 @@
 module stash.appscode.dev/cli
 
-go 1.24
-
-toolchain go1.24.4
+go 1.25.5
 
 require (
 	github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0

hack/gendocs/main.go

@@ -93,7 +93,7 @@ func main() {
 	filePrepender := func(filename string) string {
 		filename = filepath.Base(filename)
 		base := strings.TrimSuffix(filename, path.Ext(filename))
-		name := cases.Title(language.English).String(strings.Replace(base, "_", " ", -1))
+		name := cases.Title(language.English).String(strings.ReplaceAll(base, "_", " "))
 		parts := strings.Split(name, " ")
 		if len(parts) > 1 {
 			name = strings.Join(parts[1:], " ")
@@ -103,7 +103,7 @@ func main() {
 			Name    string
 			RootCmd bool
 		}{
-			strings.Replace(base, "_", "-", -1),
+			strings.ReplaceAll(base, "_", "-"),
 			name,
 			!strings.ContainsRune(base, '_'),
 		}

pkg/add_key.go

@@ -162,8 +162,10 @@ func (opt *keyOptions) addResticKey() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
-
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{
 		StorageSecret: secret,

pkg/check.go

@@ -132,7 +132,10 @@ func (opt *checkOptions) checkRepository(extraArgs []string) error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/copy_repository.go

@@ -33,7 +33,7 @@ func NewCmdCopyRepository() *cobra.Command {
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 || args[0] == "" {
-				return fmt.Errorf("Repository name is not provided")
+				return fmt.Errorf("repository name is not provided")
 			}
 
 			repositoryName := args[0]

pkg/create_repository.go

@@ -54,7 +54,7 @@ func NewCmdCreateRepository() *cobra.Command {
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 || args[0] == "" {
-				return fmt.Errorf("Repository name is not provided ")
+				return fmt.Errorf("repository name is not provided ")
 			}
 
 			repositoryName := args[0]

pkg/delete_snapshot.go

@@ -106,7 +106,10 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr
 			if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 				return err
 			}
-			defer os.RemoveAll(ScratchDir)
+			err = os.RemoveAll(ScratchDir)
+			if err != nil {
+				klog.Errorf("Error removing all: %v", err)
+			}
 
 			// configure restic wrapper
 			extraOpt := util.ExtraOptions{

pkg/download.go

@@ -171,7 +171,10 @@ func (opt *downloadOptions) downloadSnapshots() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/list_keys.go

@@ -97,7 +97,10 @@ func (opt *keyOptions) listResticKeys() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/migrate.go

@@ -130,7 +130,10 @@ func (opt *migrateOptions) migrateRepo() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/prune.go

@@ -146,7 +146,10 @@ func (opt *pruneOptions) pruneRepo(extraArgs []string) error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/purge_repos.go

@@ -363,7 +363,7 @@ func (opt *purgeOptions) findRepositoriesToPurge(rw *restic.ResticWrapper, repoB
 	script := opt.generateRepoListScript(repoBase, rw, subDirs)
 	out, err := runResticScriptViaDocker(script)
 	if err != nil {
-		return nil, fmt.Errorf("Error running repo check script: %v\nOutput:\n%s", err, out)
+		return nil, fmt.Errorf("error running repo check script: %v\nOutput:\n%s", err, out)
 	}
 
 	err = extractRepoListFromOutput(out, repoBase, subDirs, cutoffTime, &repos)

pkg/rebuild_index.go

@@ -106,7 +106,10 @@ func (opt *rebuildIndexOptions) rebuildIndex(extraArgs []string) error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/remove_key.go

@@ -93,7 +93,10 @@ func (opt *keyOptions) removeResticKey() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/unlock.go

@@ -120,7 +120,10 @@ func (opt *unlockOptions) unlockRepository() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{

pkg/update_key.go

@@ -119,7 +119,10 @@ func (opt *keyOptions) updateResticKey() error {
 	if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 		return err
 	}
-	defer os.RemoveAll(ScratchDir)
+	err = os.RemoveAll(ScratchDir)
+	if err != nil {
+		klog.Errorf("Error removing all: %v", err)
+	}
 
 	// configure restic wrapper
 	extraOpt := util.ExtraOptions{