nit: cleanup naming; add constant

aramprice · aramprice · commit 10f1b6fc3f73 · 2025-07-09T17:29:56.000-07:00
diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -14,6 +14,8 @@ import (
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
 )
 
+const logTag = "ssh"
+
 type SSHCmd struct {
 	deployment       boshdir.Deployment
 	intSSHRunner     boshssh.Runner
@@ -172,9 +174,9 @@ func (c EnvSSHCmd) Run(opts SSHOpts) error {
 	}
 
 	defer func() {
-		_, err1 := agentClient.CleanUpSSH(sshOpts.Username)
-		if err1 != nil {
-			c.logger.Warn("SSH", fmt.Sprintf("SSH cleanup failed for user %s. Artifacts may be left over on the VM: %v", sshOpts.Username, err1))
+		_, cleanupErr := agentClient.CleanUpSSH(sshOpts.Username)
+		if cleanupErr != nil {
+			c.logger.Warn(logTag, fmt.Sprintf("SSH cleanup failed for user %s. Artifacts may be left over on the VM: %v", sshOpts.Username, cleanupErr))
 		}
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ import (`
`14`	`14`	`boshui "github.com/cloudfoundry/bosh-cli/v7/ui"`
`15`	`15`	`)`
`16`	`16`
	`17`	`+const logTag = "ssh"`
	`18`	`+`
`17`	`19`	`type SSHCmd struct {`
`18`	`20`	`deployment boshdir.Deployment`
`19`	`21`	`intSSHRunner boshssh.Runner`
`@@ -172,9 +174,9 @@ func (c EnvSSHCmd) Run(opts SSHOpts) error {`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`defer func() {`
`175`		`- _, err1 := agentClient.CleanUpSSH(sshOpts.Username)`
`176`		`- if err1 != nil {`
`177`		`- c.logger.Warn("SSH", fmt.Sprintf("SSH cleanup failed for user %s. Artifacts may be left over on the VM: %v", sshOpts.Username, err1))`
	`177`	`+ _, cleanupErr := agentClient.CleanUpSSH(sshOpts.Username)`
	`178`	`+ if cleanupErr != nil {`
	`179`	`+ c.logger.Warn(logTag, fmt.Sprintf("SSH cleanup failed for user %s. Artifacts may be left over on the VM: %v", sshOpts.Username, cleanupErr))`
`178`	`180`	`}`
`179`	`181`	`}()`
`180`	`182`