Merge pull request #24 from DBCDK/fix-22

Make scp honor SSH_IDENTITY_FILE and SSH_USER
DBCDK · Nov 12, 2018 · 0794c50 · 0794c50
2 parents 9b37448 + 1c5e448
commit 0794c50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/secrets/secrets.go b/secrets/secrets.go
@@ -15,6 +15,7 @@ type SecretError struct {
 func wrap(err error) *SecretError {
 	return &SecretError{
 		Err: err,
+		Fatal: true,
 	}
 }
 

diff --git a/ssh/ssh.go b/ssh/ssh.go
@@ -240,9 +240,18 @@ func (ctx *SSHContext) MakeTempFile(host Host) (path string, err error) {
 
 func (ctx *SSHContext) UploadFile(host Host, source string, destination string) (err error) {
 	destinationAndHost := host.GetTargetHost() + ":" + destination
-	cmd := exec.Command(
-		"scp", source, destinationAndHost,
-	)
+
+	parts := make([]string, 0)
+	if ctx.IdentityFile != "" {
+		parts = append(parts, "-i", ctx.IdentityFile)
+	}
+	if ctx.Username != "" {
+		destinationAndHost = ctx.Username + "@" + destinationAndHost
+	}
+
+	parts = append(parts, source, destinationAndHost)
+
+	cmd := exec.Command("scp", parts...)
 
 	data, err := cmd.CombinedOutput()
 	if err != nil {