Refactor: remove repeated scratch directory cleanup logs

arnab-baishnab · arnab-baishnab · commit 58597e3c57a5 · 2025-12-30T18:08:55.000+06:00
Signed-off-by: Arnab Baishnab Nipun &lt;nipun@appscode.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,7 @@ func (opt *purgeOptions) setupScratchDirectory() error {`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`func (opt *purgeOptions) cleanupScratchDirectory() {`
`281`		`- if err := os.RemoveAll(ScratchDir); err != nil {`
`282`		`- klog.Warningf("Failed to cleanup scratch directory: %v", err)`
`283`		`- }`
	`281`	`+ RemoveDirWithLogErr(ScratchDir)`
`284`	`282`	`}`
`285`	`283`
`286`	`284`	`func (opt purgeOptions) getStorageSecret() (core.Secret, error) {`