From 020b677e4930510af9fe850b3e244da870bbd7f9 Mon Sep 17 00:00:00 2001 From: Pulok Saha Date: Tue, 9 Dec 2025 16:13:28 +0600 Subject: [PATCH 1/5] Use golangci-lint 2.x Signed-off-by: Pulok Saha --- .golangci.yml | 28 ++++++++++++++++++++++++++++ Makefile | 2 +- go.mod | 4 +--- hack/gendocs/main.go | 4 ++-- pkg/add_key.go | 6 ++++-- pkg/check.go | 5 ++++- pkg/copy_repository.go | 2 +- pkg/create_repository.go | 2 +- pkg/delete_snapshot.go | 5 ++++- pkg/download.go | 5 ++++- pkg/list_keys.go | 5 ++++- pkg/migrate.go | 5 ++++- pkg/prune.go | 5 ++++- pkg/purge_repos.go | 2 +- pkg/rebuild_index.go | 5 ++++- pkg/remove_key.go | 5 ++++- pkg/unlock.go | 5 ++++- pkg/update_key.go | 5 ++++- 18 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 .golangci.yml diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 000000000..cdd2defce --- /dev/null +++ b/.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 diff --git a/Makefile b/Makefile index a55f72bbc..e961164b7 100644 --- a/Makefile +++ b/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 $@ diff --git a/go.mod b/go.mod index 0799f7bb7..b222f4046 100644 --- a/go.mod +++ b/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 diff --git a/hack/gendocs/main.go b/hack/gendocs/main.go index 83ea9d34e..a5e35e137 100644 --- a/hack/gendocs/main.go +++ b/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, '_'), } diff --git a/pkg/add_key.go b/pkg/add_key.go index fac760adf..d257c4d0c 100644 --- a/pkg/add_key.go +++ b/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, diff --git a/pkg/check.go b/pkg/check.go index 4847624e3..7939de45d 100644 --- a/pkg/check.go +++ b/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{ diff --git a/pkg/copy_repository.go b/pkg/copy_repository.go index 238d698c2..9571f9799 100644 --- a/pkg/copy_repository.go +++ b/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] diff --git a/pkg/create_repository.go b/pkg/create_repository.go index 7e1502cd3..0ba2622d0 100644 --- a/pkg/create_repository.go +++ b/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] diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go index eaf9372de..2e25fcba1 100644 --- a/pkg/delete_snapshot.go +++ b/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{ diff --git a/pkg/download.go b/pkg/download.go index f38ef2f84..e79222aec 100644 --- a/pkg/download.go +++ b/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{ diff --git a/pkg/list_keys.go b/pkg/list_keys.go index 93deb4dcf..e758248f1 100644 --- a/pkg/list_keys.go +++ b/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{ diff --git a/pkg/migrate.go b/pkg/migrate.go index db6b296d9..5c5b2d2d3 100644 --- a/pkg/migrate.go +++ b/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{ diff --git a/pkg/prune.go b/pkg/prune.go index 08d6b4990..04db4a728 100644 --- a/pkg/prune.go +++ b/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{ diff --git a/pkg/purge_repos.go b/pkg/purge_repos.go index f96c65a41..9908fe033 100644 --- a/pkg/purge_repos.go +++ b/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) diff --git a/pkg/rebuild_index.go b/pkg/rebuild_index.go index 22cad8c90..e49f6a004 100644 --- a/pkg/rebuild_index.go +++ b/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{ diff --git a/pkg/remove_key.go b/pkg/remove_key.go index cba2db083..bc436e6f3 100644 --- a/pkg/remove_key.go +++ b/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{ diff --git a/pkg/unlock.go b/pkg/unlock.go index b6dcb4938..a050f4950 100644 --- a/pkg/unlock.go +++ b/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{ diff --git a/pkg/update_key.go b/pkg/update_key.go index eb93586ea..709da89d3 100644 --- a/pkg/update_key.go +++ b/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{ From 58597e3c57a5f0b3e1b2ff78969445a45509b3df Mon Sep 17 00:00:00 2001 From: Arnab Baishnab Nipun Date: Tue, 30 Dec 2025 18:08:55 +0600 Subject: [PATCH 2/5] Refactor: remove repeated scratch directory cleanup logs Signed-off-by: Arnab Baishnab Nipun --- pkg/add_key.go | 5 +---- pkg/check.go | 5 +---- pkg/delete_snapshot.go | 5 +---- pkg/download.go | 5 +---- pkg/list_keys.go | 5 +---- pkg/migrate.go | 5 +---- pkg/prune.go | 5 +---- pkg/purge_repos.go | 4 +--- pkg/rebuild_index.go | 5 +---- pkg/remove_key.go | 6 ++---- pkg/unlock.go | 5 +---- pkg/update_key.go | 5 +---- pkg/util.go | 6 ++++++ 13 files changed, 19 insertions(+), 47 deletions(-) diff --git a/pkg/add_key.go b/pkg/add_key.go index d257c4d0c..e16659c82 100644 --- a/pkg/add_key.go +++ b/pkg/add_key.go @@ -162,10 +162,7 @@ func (opt *keyOptions) addResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ StorageSecret: secret, diff --git a/pkg/check.go b/pkg/check.go index 7939de45d..e7099f967 100644 --- a/pkg/check.go +++ b/pkg/check.go @@ -132,10 +132,7 @@ func (opt *checkOptions) checkRepository(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go index 2e25fcba1..0e0093090 100644 --- a/pkg/delete_snapshot.go +++ b/pkg/delete_snapshot.go @@ -106,10 +106,7 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/download.go b/pkg/download.go index e79222aec..6951168ef 100644 --- a/pkg/download.go +++ b/pkg/download.go @@ -171,10 +171,7 @@ func (opt *downloadOptions) downloadSnapshots() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/list_keys.go b/pkg/list_keys.go index e758248f1..8216d07e4 100644 --- a/pkg/list_keys.go +++ b/pkg/list_keys.go @@ -97,10 +97,7 @@ func (opt *keyOptions) listResticKeys() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/migrate.go b/pkg/migrate.go index 5c5b2d2d3..04e670114 100644 --- a/pkg/migrate.go +++ b/pkg/migrate.go @@ -130,10 +130,7 @@ func (opt *migrateOptions) migrateRepo() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/prune.go b/pkg/prune.go index 04db4a728..cd820b92c 100644 --- a/pkg/prune.go +++ b/pkg/prune.go @@ -146,10 +146,7 @@ func (opt *pruneOptions) pruneRepo(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/purge_repos.go b/pkg/purge_repos.go index 9908fe033..8ef91705c 100644 --- a/pkg/purge_repos.go +++ b/pkg/purge_repos.go @@ -278,9 +278,7 @@ func (opt *purgeOptions) setupScratchDirectory() error { } func (opt *purgeOptions) cleanupScratchDirectory() { - if err := os.RemoveAll(ScratchDir); err != nil { - klog.Warningf("Failed to cleanup scratch directory: %v", err) - } + RemoveDirWithLogErr(ScratchDir) } func (opt *purgeOptions) getStorageSecret() (*core.Secret, error) { diff --git a/pkg/rebuild_index.go b/pkg/rebuild_index.go index e49f6a004..fbc63214f 100644 --- a/pkg/rebuild_index.go +++ b/pkg/rebuild_index.go @@ -106,10 +106,7 @@ func (opt *rebuildIndexOptions) rebuildIndex(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/remove_key.go b/pkg/remove_key.go index bc436e6f3..0739f852f 100644 --- a/pkg/remove_key.go +++ b/pkg/remove_key.go @@ -93,10 +93,8 @@ func (opt *keyOptions) removeResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/unlock.go b/pkg/unlock.go index a050f4950..c2e6ab6db 100644 --- a/pkg/unlock.go +++ b/pkg/unlock.go @@ -120,10 +120,7 @@ func (opt *unlockOptions) unlockRepository() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/update_key.go b/pkg/update_key.go index 709da89d3..b12420879 100644 --- a/pkg/update_key.go +++ b/pkg/update_key.go @@ -119,10 +119,7 @@ func (opt *keyOptions) updateResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - err = os.RemoveAll(ScratchDir) - if err != nil { - klog.Errorf("Error removing all: %v", err) - } + RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/util.go b/pkg/util.go index 39a42cc55..b41ee5ef7 100644 --- a/pkg/util.go +++ b/pkg/util.go @@ -152,6 +152,12 @@ func getContainerName(pod *core.Pod) string { return apis.StashContainer } +func RemoveDirWithLogErr(dir string) { + if err := os.RemoveAll(dir); err != nil { + klog.Errorf("failed to remove directory %s. Reason: %v", dir, err) + } +} + func runCmdViaDocker(localDirs cliLocalDirectories, command string, extraArgs []string) error { // get current user currentUser, err := user.Current() From 663f9c80fb9f79428ad78f720a262517109b4675 Mon Sep 17 00:00:00 2001 From: Arnab Baishnab Nipun Date: Tue, 30 Dec 2025 18:42:20 +0600 Subject: [PATCH 3/5] add defer prefix before scratch directory cleanup call Signed-off-by: Arnab Baishnab Nipun --- pkg/add_key.go | 2 +- pkg/check.go | 2 +- pkg/delete_snapshot.go | 2 +- pkg/download.go | 2 +- pkg/list_keys.go | 2 +- pkg/migrate.go | 2 +- pkg/prune.go | 2 +- pkg/rebuild_index.go | 2 +- pkg/remove_key.go | 3 +-- pkg/unlock.go | 2 +- pkg/update_key.go | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg/add_key.go b/pkg/add_key.go index e16659c82..95d049772 100644 --- a/pkg/add_key.go +++ b/pkg/add_key.go @@ -162,7 +162,7 @@ func (opt *keyOptions) addResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ StorageSecret: secret, diff --git a/pkg/check.go b/pkg/check.go index e7099f967..6293c674d 100644 --- a/pkg/check.go +++ b/pkg/check.go @@ -132,7 +132,7 @@ func (opt *checkOptions) checkRepository(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go index 0e0093090..fd64326c7 100644 --- a/pkg/delete_snapshot.go +++ b/pkg/delete_snapshot.go @@ -106,7 +106,7 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/download.go b/pkg/download.go index 6951168ef..c6e1ef766 100644 --- a/pkg/download.go +++ b/pkg/download.go @@ -171,7 +171,7 @@ func (opt *downloadOptions) downloadSnapshots() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/list_keys.go b/pkg/list_keys.go index 8216d07e4..ffaf1a887 100644 --- a/pkg/list_keys.go +++ b/pkg/list_keys.go @@ -97,7 +97,7 @@ func (opt *keyOptions) listResticKeys() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/migrate.go b/pkg/migrate.go index 04e670114..a69de10f5 100644 --- a/pkg/migrate.go +++ b/pkg/migrate.go @@ -130,7 +130,7 @@ func (opt *migrateOptions) migrateRepo() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/prune.go b/pkg/prune.go index cd820b92c..0776aabff 100644 --- a/pkg/prune.go +++ b/pkg/prune.go @@ -146,7 +146,7 @@ func (opt *pruneOptions) pruneRepo(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/rebuild_index.go b/pkg/rebuild_index.go index fbc63214f..b9e95d6b2 100644 --- a/pkg/rebuild_index.go +++ b/pkg/rebuild_index.go @@ -106,7 +106,7 @@ func (opt *rebuildIndexOptions) rebuildIndex(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/remove_key.go b/pkg/remove_key.go index 0739f852f..fa30d66e2 100644 --- a/pkg/remove_key.go +++ b/pkg/remove_key.go @@ -93,8 +93,7 @@ func (opt *keyOptions) removeResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/unlock.go b/pkg/unlock.go index c2e6ab6db..fb4f9086c 100644 --- a/pkg/unlock.go +++ b/pkg/unlock.go @@ -120,7 +120,7 @@ func (opt *unlockOptions) unlockRepository() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/update_key.go b/pkg/update_key.go index b12420879..ba8768eb5 100644 --- a/pkg/update_key.go +++ b/pkg/update_key.go @@ -119,7 +119,7 @@ func (opt *keyOptions) updateResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - RemoveDirWithLogErr(ScratchDir) + defer RemoveDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ From da1e4dbb6026098405f33e94784931205d3c3d54 Mon Sep 17 00:00:00 2001 From: Arnab Baishnab Nipun Date: Tue, 30 Dec 2025 18:50:56 +0600 Subject: [PATCH 4/5] change go version to 1.25 Signed-off-by: Arnab Baishnab Nipun --- go.mod | 2 +- pkg/add_key.go | 2 +- pkg/check.go | 2 +- pkg/delete_snapshot.go | 2 +- pkg/download.go | 2 +- pkg/list_keys.go | 2 +- pkg/migrate.go | 2 +- pkg/prune.go | 2 +- pkg/purge_repos.go | 2 +- pkg/rebuild_index.go | 2 +- pkg/remove_key.go | 2 +- pkg/unlock.go | 2 +- pkg/update_key.go | 2 +- pkg/util.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index b222f4046..c07433f3c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module stash.appscode.dev/cli -go 1.25.5 +go 1.25 require ( github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0 diff --git a/pkg/add_key.go b/pkg/add_key.go index 95d049772..1b767159f 100644 --- a/pkg/add_key.go +++ b/pkg/add_key.go @@ -162,7 +162,7 @@ func (opt *keyOptions) addResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ StorageSecret: secret, diff --git a/pkg/check.go b/pkg/check.go index 6293c674d..65c9581f8 100644 --- a/pkg/check.go +++ b/pkg/check.go @@ -132,7 +132,7 @@ func (opt *checkOptions) checkRepository(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go index fd64326c7..30287e60b 100644 --- a/pkg/delete_snapshot.go +++ b/pkg/delete_snapshot.go @@ -106,7 +106,7 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/download.go b/pkg/download.go index c6e1ef766..ce8278ff6 100644 --- a/pkg/download.go +++ b/pkg/download.go @@ -171,7 +171,7 @@ func (opt *downloadOptions) downloadSnapshots() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/list_keys.go b/pkg/list_keys.go index ffaf1a887..21605d4e3 100644 --- a/pkg/list_keys.go +++ b/pkg/list_keys.go @@ -97,7 +97,7 @@ func (opt *keyOptions) listResticKeys() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/migrate.go b/pkg/migrate.go index a69de10f5..6f57cbb98 100644 --- a/pkg/migrate.go +++ b/pkg/migrate.go @@ -130,7 +130,7 @@ func (opt *migrateOptions) migrateRepo() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/prune.go b/pkg/prune.go index 0776aabff..43ffadfd2 100644 --- a/pkg/prune.go +++ b/pkg/prune.go @@ -146,7 +146,7 @@ func (opt *pruneOptions) pruneRepo(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/purge_repos.go b/pkg/purge_repos.go index 8ef91705c..569640f2d 100644 --- a/pkg/purge_repos.go +++ b/pkg/purge_repos.go @@ -278,7 +278,7 @@ func (opt *purgeOptions) setupScratchDirectory() error { } func (opt *purgeOptions) cleanupScratchDirectory() { - RemoveDirWithLogErr(ScratchDir) + removeDirWithLogErr(ScratchDir) } func (opt *purgeOptions) getStorageSecret() (*core.Secret, error) { diff --git a/pkg/rebuild_index.go b/pkg/rebuild_index.go index b9e95d6b2..c92009cab 100644 --- a/pkg/rebuild_index.go +++ b/pkg/rebuild_index.go @@ -106,7 +106,7 @@ func (opt *rebuildIndexOptions) rebuildIndex(extraArgs []string) error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/remove_key.go b/pkg/remove_key.go index fa30d66e2..ab469661b 100644 --- a/pkg/remove_key.go +++ b/pkg/remove_key.go @@ -93,7 +93,7 @@ func (opt *keyOptions) removeResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/unlock.go b/pkg/unlock.go index fb4f9086c..cb121b02d 100644 --- a/pkg/unlock.go +++ b/pkg/unlock.go @@ -120,7 +120,7 @@ func (opt *unlockOptions) unlockRepository() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/update_key.go b/pkg/update_key.go index ba8768eb5..fe962678a 100644 --- a/pkg/update_key.go +++ b/pkg/update_key.go @@ -119,7 +119,7 @@ func (opt *keyOptions) updateResticKey() error { if err = os.MkdirAll(ScratchDir, 0o755); err != nil { return err } - defer RemoveDirWithLogErr(ScratchDir) + defer removeDirWithLogErr(ScratchDir) // configure restic wrapper extraOpt := util.ExtraOptions{ diff --git a/pkg/util.go b/pkg/util.go index b41ee5ef7..e6aeb51af 100644 --- a/pkg/util.go +++ b/pkg/util.go @@ -152,7 +152,7 @@ func getContainerName(pod *core.Pod) string { return apis.StashContainer } -func RemoveDirWithLogErr(dir string) { +func removeDirWithLogErr(dir string) { if err := os.RemoveAll(dir); err != nil { klog.Errorf("failed to remove directory %s. Reason: %v", dir, err) } From 05380db9606c8fa451d3457dd0389bc31078c302 Mon Sep 17 00:00:00 2001 From: Arnab Baishnab Nipun Date: Tue, 30 Dec 2025 19:14:33 +0600 Subject: [PATCH 5/5] ignore lint error as function should have parameter Signed-off-by: Arnab Baishnab Nipun --- pkg/util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/util.go b/pkg/util.go index e6aeb51af..0e3e00f8a 100644 --- a/pkg/util.go +++ b/pkg/util.go @@ -152,6 +152,7 @@ func getContainerName(pod *core.Pod) string { return apis.StashContainer } +// nolint: unparam func removeDirWithLogErr(dir string) { if err := os.RemoveAll(dir); err != nil { klog.Errorf("failed to remove directory %s. Reason: %v", dir, err)