From 4022020d5fe06609e61f417894a36efdaa07e7a9 Mon Sep 17 00:00:00 2001
From: Ming <mqiu@vmware.com>
Date: Thu, 15 Sep 2022 04:02:53 +0000
Subject: [PATCH] Fix restore cmd extraflag overwrite bug

Signed-off-by: Ming <mqiu@vmware.com>
---
 changelogs/unreleased/5347-qiuming-best |  1 +
 pkg/uploader/provider/restic.go         | 26 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/unreleased/5347-qiuming-best

diff --git a/changelogs/unreleased/5347-qiuming-best b/changelogs/unreleased/5347-qiuming-best
new file mode 100644
index 000000000..c9f946e22
--- /dev/null
+++ b/changelogs/unreleased/5347-qiuming-best
@@ -0,0 +1 @@
+Fix restore cmd extraflag overwrite bug
diff --git a/pkg/uploader/provider/restic.go b/pkg/uploader/provider/restic.go
index be438d0c8..2715b9e9d 100644
--- a/pkg/uploader/provider/restic.go
+++ b/pkg/uploader/provider/restic.go
@@ -91,11 +91,18 @@ func NewResticUploaderProvider(
 }
 
 func (rp *resticProvider) Close(ctx context.Context) error {
-	if err := os.Remove(rp.credentialsFile); err != nil {
-		rp.log.Warnf("Failed to remove file %s with err %v", rp.credentialsFile, err)
+	_, err := os.Stat(rp.credentialsFile)
+	if err == nil {
+		return os.Remove(rp.credentialsFile)
+	} else if !os.IsNotExist(err) {
+		return errors.Errorf("failed to get file %s info with error %v", rp.credentialsFile, err)
 	}
-	if err := os.Remove(rp.caCertFile); err != nil {
-		rp.log.Warnf("Failed to remove file %s with err %v", rp.caCertFile, err)
+
+	_, err = os.Stat(rp.caCertFile)
+	if err == nil {
+		return os.Remove(rp.caCertFile)
+	} else if !os.IsNotExist(err) {
+		return errors.Errorf("failed to get file %s info with error %v", rp.caCertFile, err)
 	}
 	return nil
 }
@@ -134,7 +141,7 @@ func (rp *resticProvider) RunBackup(
 			log.Debugf("Restic backup got empty dir with %s path", path)
 			return "", true, nil
 		}
-		return "", false, errors.WithStack(fmt.Errorf("error running restic backup with error: %v", err))
+		return "", false, errors.WithStack(fmt.Errorf("error running restic backup command %s with error: %v stderr: %v", backupCmd.String(), err, stderrBuf))
 	}
 	// GetSnapshotID
 	snapshotIdCmd := restic.GetSnapshotCommand(rp.repoIdentifier, rp.credentialsFile, tags)
@@ -145,7 +152,7 @@ func (rp *resticProvider) RunBackup(
 	if err != nil {
 		return "", false, errors.WithStack(fmt.Errorf("error getting snapshot id with error: %v", err))
 	}
-	log.Debugf("Run command=%s, stdout=%s, stderr=%s", backupCmd.String(), summary, stderrBuf)
+	log.Infof("Run command=%s, stdout=%s, stderr=%s", backupCmd.String(), summary, stderrBuf)
 	return snapshotID, false, nil
 }
 
@@ -167,10 +174,11 @@ func (rp *resticProvider) RunRestore(
 	restoreCmd := ResticRestoreCMDFunc(rp.repoIdentifier, rp.credentialsFile, snapshotID, volumePath)
 	restoreCmd.Env = rp.cmdEnv
 	restoreCmd.CACertFile = rp.caCertFile
-	restoreCmd.ExtraFlags = rp.extraFlags
-
+	if len(rp.extraFlags) != 0 {
+		restoreCmd.ExtraFlags = append(restoreCmd.ExtraFlags, rp.extraFlags...)
+	}
 	stdout, stderr, err := restic.RunRestore(restoreCmd, log, updater)
 
-	log.Debugf("Run command=%s, stdout=%s, stderr=%s", restoreCmd.Command, stdout, stderr)
+	log.Infof("Run command=%s, stdout=%s, stderr=%s", restoreCmd.Command, stdout, stderr)
 	return err
 }