small auto feedback

Author: patelspratik

pkg/cmd/copy/copy.go

@@ -85,7 +85,7 @@ func runCopyCommand(t *terminal.Terminal, cstore CopyStore, source, dest string,
 		return copyExternalNode(t, cstore, target.Node, localPath, remotePath, isUpload)
 	}
 
-	workspace, err := prepareWorkspace(t, cstore, workspaceNameOrID)
+	workspace, err := prepareWorkspace(t, cstore, target.Workspace)
 	if err != nil {
 		return breverrors.WrapAndTrace(err)
 	}
@@ -126,26 +126,22 @@ func parseCopyArguments(source, dest string) (workspaceNameOrID, remotePath, loc
 	return destWorkspace, destPath, source, true, nil
 }
 
-func prepareWorkspace(t *terminal.Terminal, cstore CopyStore, workspaceNameOrID string) (*entity.Workspace, error) {
+func prepareWorkspace(t *terminal.Terminal, cstore CopyStore, workspace *entity.Workspace) (*entity.Workspace, error) {
 	s := t.NewSpinner()
-	workspace, err := util.GetUserWorkspaceByNameOrIDErr(cstore, workspaceNameOrID)
-	if err != nil {
-		return nil, breverrors.WrapAndTrace(err)
-	}
 
 	if workspace.Status == "STOPPED" {
-		err = startWorkspaceIfStopped(t, s, cstore, workspaceNameOrID, workspace)
+		err := startWorkspaceIfStopped(t, s, cstore, workspace.Name, workspace)
 		if err != nil {
 			return nil, breverrors.WrapAndTrace(err)
 		}
 	}
 
-	err = pollUntil(s, workspace.ID, "RUNNING", cstore, " waiting for instance to be ready...")
+	err := pollUntil(s, workspace.ID, "RUNNING", cstore, " waiting for instance to be ready...")
 	if err != nil {
 		return nil, breverrors.WrapAndTrace(err)
 	}
 
-	workspace, err = util.GetUserWorkspaceByNameOrIDErr(cstore, workspaceNameOrID)
+	workspace, err = util.GetUserWorkspaceByNameOrIDErr(cstore, workspace.Name)
 	if err != nil {
 		return nil, breverrors.WrapAndTrace(err)
 	}

pkg/cmd/portforward/portforward.go

@@ -151,9 +151,8 @@ func portForwardExternalNode(t *terminal.Terminal, pfStore PortforwardStore, res
 		return breverrors.WrapAndTrace(err)
 	}
 
-	// The SSH tunnel forwards local traffic through the SSH connection to the
-	// actual port on the box. Ctrl+C stops the local forward but not the
-	// remote port binding.
+	// The SSH tunnel forwards local traffic through the SSH connection to the actual port on the box.
+	// TODO there isn't support for killing the port forward in either case, and no ClosePort for external node
 	alias := info.SSHAlias()
 	t.Vprintf("Setting up local forward: localhost:%s -> %s:%s\n", localPort, alias, remotePort)
 	_, err = RunSSHPortForward("-L", localPort, remotePort, alias)

pkg/cmd/util/externalnode.go

@@ -22,6 +22,11 @@ type ExternalNodeStore interface {
 	GetCurrentUser() (*entity.User, error)
 }
 
+type WorkspaceOrNodeResolver interface {
+	GetWorkspaceByNameOrIDErrStore
+	ExternalNodeStore
+}
+
 // WorkspaceOrNode is returned by ResolveWorkspaceOrNode. Exactly one field is non-nil.
 type WorkspaceOrNode struct {
 	Workspace *entity.Workspace
@@ -30,10 +35,7 @@ type WorkspaceOrNode struct {
 
 // ResolveWorkspaceOrNode looks up a workspace first; if not found, falls back to external nodes.
 // The store must satisfy both GetWorkspaceByNameOrIDErrStore and ExternalNodeStore.
-func ResolveWorkspaceOrNode(store interface {
-	GetWorkspaceByNameOrIDErrStore
-	ExternalNodeStore
-}, nameOrID string,
+func ResolveWorkspaceOrNode(store WorkspaceOrNodeResolver, nameOrID string,
 ) (*WorkspaceOrNode, error) {
 	workspace, wsErr := GetUserWorkspaceByNameOrIDErr(store, nameOrID)
 	if wsErr == nil {