|
5 | 5 | "os"
|
6 | 6 | "os/exec"
|
7 | 7 | "os/signal"
|
8 |
| - "strings" |
9 | 8 | "path/filepath"
|
| 9 | + "strings" |
10 | 10 |
|
11 | 11 | "github.com/brevdev/brev-cli/pkg/cmd/cmderrors"
|
12 | 12 | "github.com/brevdev/brev-cli/pkg/cmd/completions"
|
@@ -109,37 +109,37 @@ func ConvertNametoSSHName(store PortforwardStore, workspaceNameOrID string, useH
|
109 | 109 | }
|
110 | 110 |
|
111 | 111 | func RunSSHPortForward(forwardType string, localPort string, remotePort string, sshName string) (*os.Process, error) {
|
112 |
| - signals := make(chan os.Signal, 1) |
113 |
| - signal.Notify(signals, os.Interrupt) |
114 |
| - defer signal.Stop(signals) |
| 112 | + signals := make(chan os.Signal, 1) |
| 113 | + signal.Notify(signals, os.Interrupt) |
| 114 | + defer signal.Stop(signals) |
115 | 115 |
|
116 |
| - portMapping := fmt.Sprintf("%s:127.0.0.1:%s", localPort, remotePort) |
| 116 | + portMapping := fmt.Sprintf("%s:127.0.0.1:%s", localPort, remotePort) |
117 | 117 |
|
118 |
| - homeDir, err := os.UserHomeDir() |
119 |
| - if err != nil { |
120 |
| - return nil, breverrors.Wrap(err, "failed to get user home directory") |
121 |
| - } |
| 118 | + homeDir, err := os.UserHomeDir() |
| 119 | + if err != nil { |
| 120 | + return nil, breverrors.Wrap(err, "failed to get user home directory") |
| 121 | + } |
122 | 122 |
|
123 |
| - keyPath := filepath.Join(homeDir, ".brev", "brev.pem") |
| 123 | + keyPath := filepath.Join(homeDir, ".brev", "brev.pem") |
124 | 124 |
|
125 |
| - if _, err := os.Stat(keyPath); os.IsNotExist(err) { |
126 |
| - return nil, breverrors.Wrap(err, fmt.Sprintf("SSH key not found at %s. Please ensure your Brev SSH key is properly set up.", keyPath)) |
127 |
| - } |
| 125 | + if _, err = os.Stat(keyPath); os.IsNotExist(err) { |
| 126 | + return nil, breverrors.Wrap(err, fmt.Sprintf("SSH key not found at %s. Please ensure your Brev SSH key is properly set up.", keyPath)) |
| 127 | + } |
128 | 128 |
|
129 |
| - cmdSHH := exec.Command("ssh", "-i", keyPath, "-T", forwardType, portMapping, sshName, "-N") |
130 |
| - cmdSHH.Stdin = os.Stdin |
131 |
| - cmdSHH.Stdout = os.Stdout |
132 |
| - cmdSHH.Stderr = os.Stderr |
| 129 | + cmdSHH := exec.Command("ssh", "-i", keyPath, "-T", forwardType, portMapping, sshName, "-N") //nolint:gosec //ok |
| 130 | + cmdSHH.Stdin = os.Stdin |
| 131 | + cmdSHH.Stdout = os.Stdout |
| 132 | + cmdSHH.Stderr = os.Stderr |
133 | 133 |
|
134 |
| - fmt.Println("Port forwarding...") |
135 |
| - fmt.Printf("localhost:%s -> %s:%s\n", localPort, sshName, remotePort) |
| 134 | + fmt.Println("Port forwarding...") |
| 135 | + fmt.Printf("localhost:%s -> %s:%s\n", localPort, sshName, remotePort) |
136 | 136 |
|
137 |
| - err = cmdSHH.Start() |
138 |
| - if err != nil { |
139 |
| - return nil, breverrors.Wrap(err, "Failed to start SSH command") |
140 |
| - } |
| 137 | + err = cmdSHH.Start() |
| 138 | + if err != nil { |
| 139 | + return nil, breverrors.Wrap(err, "Failed to start SSH command") |
| 140 | + } |
141 | 141 |
|
142 |
| - return cmdSHH.Process, nil |
| 142 | + return cmdSHH.Process, nil |
143 | 143 | }
|
144 | 144 |
|
145 | 145 | func startInput(t *terminal.Terminal) string {
|
|
0 commit comments