Code cleanup

3scale-ops · Nov 20, 2023 · 10cfe34 · 10cfe34
1 parent aaefb98
commit 10cfe34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/pkg/redis/backup/s3upload.go b/pkg/redis/backup/s3upload.go
@@ -62,35 +62,25 @@ func (br *Runner) UploadBackup(ctx context.Context) error {
 		return err
 	}
 
-	var commands = []ssh.Runnable{
-		// mv /data/dump.rdb /data/redis-backup-<shard>-<server>-<timestamp>.rdb
-		ssh.NewCommand(fmt.Sprintf("mv %s %s/%s",
-			br.RedisDBFile,
-			path.Dir(br.RedisDBFile), br.BackupFile(),
-		)),
-		// gzip /data/redis-backup-<shard>-<server>-<timestamp>.rdb
-		// ssh.NewCommand(fmt.Sprintf("gzip -1 %s/%s", path.Dir(br.RedisDBFile), br.BackupFile())),
-		ssh.NewCommand(fmt.Sprintf("gzip -1 %s/%s", path.Dir(br.RedisDBFile), br.BackupFile())),
-		// AWS_ACCESS_KEY_ID=*** AWS_SECRET_ACCESS_KEY=*** s3cmd put /data/redis-backup-<shard>-<server>-<timestamp>.rdb s3://<bucket>/<path>/redis-backup-<shard>-<server>-<timestamp>.rdb
-		ssh.NewScript(
-			fmt.Sprintf("%s=%s %s=%s %s=%s python -",
-				util.AWSRegionEnvvar, br.AWSRegion,
-				util.AWSAccessKeyEnvvar, br.AWSAccessKeyID,
-				util.AWSSecretKeyEnvvar, br.AWSSecretAccessKey),
-			uploadScript,
-			br.AWSSecretAccessKey,
-		),
-		ssh.NewCommand(fmt.Sprintf("rm -f %s/%s*", path.Dir(br.RedisDBFile), br.BackupFileBaseName())),
-	}
-
 	remoteExec := ssh.RemoteExecutor{
 		Host:       br.Server.GetHost(),
 		User:       br.SSHUser,
 		Port:       br.SSHPort,
 		PrivateKey: br.SSHKey,
 		Logger:     logger,
 		CmdTimeout: 0,
-		Commands:   commands,
+		Commands: []ssh.Runnable{
+			ssh.NewCommand(fmt.Sprintf("mv %s %s/%s", br.RedisDBFile, path.Dir(br.RedisDBFile), br.BackupFile())),
+			ssh.NewCommand(fmt.Sprintf("gzip -1 %s/%s", path.Dir(br.RedisDBFile), br.BackupFile())),
+			ssh.NewScript(fmt.Sprintf("%s=%s %s=%s %s=%s python -",
+				util.AWSRegionEnvvar, br.AWSRegion,
+				util.AWSAccessKeyEnvvar, br.AWSAccessKeyID,
+				util.AWSSecretKeyEnvvar, br.AWSSecretAccessKey),
+				uploadScript,
+				br.AWSSecretAccessKey,
+			),
+			ssh.NewCommand(fmt.Sprintf("rm -f %s/%s*", path.Dir(br.RedisDBFile), br.BackupFileBaseName())),
+		},
 	}
 
 	err = remoteExec.Run()

diff --git a/pkg/ssh/remote_exec.go b/pkg/ssh/remote_exec.go
@@ -71,8 +71,8 @@ type Command struct {
 
 var _ Runnable = &Command{}
 
-func NewCommand(value string) *Command {
-	return &Command{value: value}
+func NewCommand(value string, sensitive ...string) *Command {
+	return &Command{value: value, sensitive: sensitive}
 }
 
 func (c *Command) Info() string {