Skip to content

Commit 5173ce3

Browse files
committed
Name results and rename vars for gocritic
Signed-off-by: Anders F Björklund <[email protected]>
1 parent ba0fa11 commit 5173ce3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/hostagent/sudo.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
// Returns stdout and stderr.
1717
//
1818
// scriptName is used only for readability of error strings.
19-
func sudoExecuteScript(host string, port int, c *ssh.SSHConfig, script, scriptName string) (string, string, error) {
19+
func sudoExecuteScript(host string, port int, c *ssh.SSHConfig, script, scriptName string) (stdout, stderr string, err error) {
2020
if c == nil {
2121
return "", "", errors.New("got nil SSHConfig")
2222
}
@@ -32,12 +32,12 @@ func sudoExecuteScript(host string, port int, c *ssh.SSHConfig, script, scriptNa
3232
sshArgs = append(sshArgs, host, "--", "sudo", interpreter)
3333
sshCmd := exec.Command(sshBinary, sshArgs...)
3434
sshCmd.Stdin = strings.NewReader(script)
35-
var stderr bytes.Buffer
36-
sshCmd.Stderr = &stderr
35+
var buf bytes.Buffer
36+
sshCmd.Stderr = &buf
3737
logrus.Debugf("executing ssh for script %q: %s %v", scriptName, sshCmd.Path, sshCmd.Args)
3838
out, err := sshCmd.Output()
3939
if err != nil {
40-
return string(out), stderr.String(), fmt.Errorf("failed to execute script %q: stdout=%q, stderr=%q: %w", scriptName, string(out), stderr.String(), err)
40+
return string(out), buf.String(), fmt.Errorf("failed to execute script %q: stdout=%q, stderr=%q: %w", scriptName, string(out), buf.String(), err)
4141
}
42-
return string(out), stderr.String(), nil
42+
return string(out), buf.String(), nil
4343
}

0 commit comments

Comments
 (0)