Merge pull request #256 from brevdev/lint

fix(BREV-1761): Lint, Fix Failing Test

Author: drewmalin

pkg/cmd/open/open.go

@@ -151,7 +151,7 @@ func determineEditorType(args []string) (string, error) {
 }
 
 // Fetch workspace info, then open code editor
-func runOpenCommand(t *terminal.Terminal, tstore OpenStore, wsIDOrName string, setupDoneString string, directory string, host bool, editorType string) error { //nolint:funlen // define brev command
+func runOpenCommand(t *terminal.Terminal, tstore OpenStore, wsIDOrName string, setupDoneString string, directory string, host bool, editorType string) error { //nolint:funlen,gocyclo // define brev command
 	// todo check if workspace is stopped and start if it if it is stopped
 	fmt.Println("finding your instance...")
 	res := refresh.RunRefreshAsync(tstore)

pkg/ssh/sshconfigurer.go

@@ -276,7 +276,7 @@ func tmplAndValToString(tmpl *template.Template, val interface{}) (string, error
 	return buf.String(), nil
 }
 
-func makeSSHConfigEntryV2(workspace entity.Workspace, privateKeyPath string, cloudflaredBinaryPath string) (string, error) { //nolint:funlen // ok
+func makeSSHConfigEntryV2(workspace entity.Workspace, privateKeyPath string, cloudflaredBinaryPath string) (string, error) { //nolint:funlen,gocyclo // ok
 	alias := string(workspace.GetLocalIdentifier())
 	privateKeyPath = "\"" + privateKeyPath + "\""
 	if workspace.IsLegacy() {

pkg/ssh/sshconfigurer_test.go

@@ -23,6 +23,7 @@ var somePlainWorkspaces = []entity.Workspace{
 		Status:           entity.Running,
 		Password:         "sdfal",
 		GitRepo:          "gitrepo",
+		SSHUser:          "ubuntu",
 	},
 	{
 		ID:               "test-id-2",
@@ -35,6 +36,7 @@ var somePlainWorkspaces = []entity.Workspace{
 		Status:           entity.Running,
 		Password:         "sdfal",
 		GitRepo:          "gitrepo",
+		SSHUser:          "ubuntu",
 	},
 }
 
@@ -340,6 +342,7 @@ Host testName2-host
 					Status:           entity.Running,
 					Password:         "sdfal",
 					GitRepo:          "gitrepo",
+					SSHUser:          "ubuntu",
 				},
 				privateKeyPath: "/my/priv/key.pem",
 				runRemoteCMD:   true,
@@ -389,6 +392,7 @@ Host testName2-host
 					Password:         "sdfal",
 					GitRepo:          "gitrepo",
 					SSHPort:          2022,
+					SSHUser:          "ubuntu",
 				},
 				privateKeyPath: "/my/priv/key.pem",
 				runRemoteCMD:   true,
@@ -505,6 +509,7 @@ Host testName2-host
 					GitRepo:              "gitrepo",
 					SSHProxyHostname:     "test-verb-proxy.com",
 					HostSSHProxyHostname: "test-host-proxy.com",
+					SSHUser:              "ubuntu",
 				},
 				privateKeyPath:        "/my/priv/key.pem",
 				cloudflaredBinaryPath: "/Users/tmontfort/.brev/cloudflared",
@@ -632,6 +637,7 @@ func TestSSHConfigurerV2_Update(t *testing.T) { //nolint  // this is a test
 						Status:           entity.Running,
 						Password:         "sdfal",
 						GitRepo:          "gitrepo",
+						SSHUser:          "ubuntu",
 					},
 				},
 			},
@@ -691,6 +697,7 @@ Host testName1-host
 						Status:           entity.Running,
 						Password:         "sdfal",
 						GitRepo:          "gitrepo",
+						SSHUser:          "ubuntu",
 					},
 				},
 			},