Use cleanup-cache flag (#717)

stashed · Apr 3, 2019 · bf91db4 · bf91db4
1 parent f2669f1
commit bf91db4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkg/cli/restic.go b/pkg/cli/restic.go
@@ -94,6 +94,7 @@ func (w *ResticWrapper) Backup(resource *api.Restic, fg api.FileGroup) error {
 		args = append(args, tag)
 	}
 	args = w.appendCacheDirFlag(args)
+	args = w.appendCleanupCacheFlag(args)
 	args = w.appendCaCertFlag(args)
 
 	return w.run(Exe, args)
@@ -191,6 +192,13 @@ func (w *ResticWrapper) appendCacheDirFlag(args []interface{}) []interface{} {
 	return append(args, "--no-cache")
 }
 
+func (w *ResticWrapper) appendCleanupCacheFlag(args []interface{}) []interface{} {
+	if w.enableCache {
+		return append(args, "--cleanup-cache")
+	}
+	return args
+}
+
 func (w *ResticWrapper) appendCaCertFlag(args []interface{}) []interface{} {
 	if w.cacertFile != "" {
 		return append(args, "--cacert", w.cacertFile)

diff --git a/pkg/restic/commands.go b/pkg/restic/commands.go
@@ -82,6 +82,7 @@ func (w *ResticWrapper) backup(path, host string, tags []string) ([]byte, error)
 		args = append(args, tag)
 	}
 	args = w.appendCacheDirFlag(args)
+	args = w.appendCleanupCacheFlag(args)
 	args = w.appendCaCertFlag(args)
 
 	return w.run(Command{Name: ResticCMD, Args: args})
@@ -106,6 +107,7 @@ func (w *ResticWrapper) backupFromStdin(options BackupOptions) ([]byte, error) {
 		args = append(args, options.Host)
 	}
 	args = w.appendCacheDirFlag(args)
+	args = w.appendCleanupCacheFlag(args)
 	args = w.appendCaCertFlag(args)
 
 	commands = append(commands, Command{Name: ResticCMD, Args: args})
@@ -247,6 +249,13 @@ func (w *ResticWrapper) appendCacheDirFlag(args []interface{}) []interface{} {
 	return append(args, "--no-cache")
 }
 
+func (w *ResticWrapper) appendCleanupCacheFlag(args []interface{}) []interface{} {
+	if w.config.EnableCache {
+		return append(args, "--cleanup-cache")
+	}
+	return args
+}
+
 func (w *ResticWrapper) appendCaCertFlag(args []interface{}) []interface{} {
 	if w.config.CacertFile != "" {
 		return append(args, "--cacert", w.config.CacertFile)