Skip to content

Commit 3e0e6bb

Browse files
committed
lint: fix
1 parent 53e1dc1 commit 3e0e6bb

File tree

6 files changed

+30
-323
lines changed

6 files changed

+30
-323
lines changed

pkg/cmd/portforward/portforward.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"os/exec"
77
"os/signal"
8-
"strings"
98
"path/filepath"
9+
"strings"
1010

1111
"github.com/brevdev/brev-cli/pkg/cmd/cmderrors"
1212
"github.com/brevdev/brev-cli/pkg/cmd/completions"
@@ -109,37 +109,37 @@ func ConvertNametoSSHName(store PortforwardStore, workspaceNameOrID string, useH
109109
}
110110

111111
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)
115115

116-
portMapping := fmt.Sprintf("%s:127.0.0.1:%s", localPort, remotePort)
116+
portMapping := fmt.Sprintf("%s:127.0.0.1:%s", localPort, remotePort)
117117

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+
}
122122

123-
keyPath := filepath.Join(homeDir, ".brev", "brev.pem")
123+
keyPath := filepath.Join(homeDir, ".brev", "brev.pem")
124124

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+
}
128128

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
133133

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)
136136

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+
}
141141

142-
return cmdSHH.Process, nil
142+
return cmdSHH.Process, nil
143143
}
144144

145145
func startInput(t *terminal.Terminal) string {

pkg/cmd/sshall/sshall.go

Lines changed: 0 additions & 269 deletions
This file was deleted.

pkg/cmd/sshall/sshall_test.go

Lines changed: 0 additions & 25 deletions
This file was deleted.

pkg/collections/collections.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func Except[T comparable](items []T, except []T) []T {
254254
// loops over list and returns when has returns true
255255
func ListHas[K any](list []K, has func(l K) bool) bool {
256256
k := Find(list, has)
257-
if k != nil {
257+
if k != nil { //nolint:gosimple //ok
258258
return true
259259
}
260260
return false
@@ -1094,7 +1094,7 @@ func CloneMap[T any, K comparable](m map[K]T) map[K]T {
10941094

10951095
func CloneList[T any](l []T) []T {
10961096
result := []T{}
1097-
for _, v := range l {
1097+
for _, v := range l { //nolint:gosimple //ok
10981098
result = append(result, v)
10991099
}
11001100
return result
@@ -1454,7 +1454,7 @@ func (s *SafeSlice[T]) Slice() []T {
14541454
s.mu.RLock()
14551455
defer s.mu.RUnlock()
14561456
newSlice := make([]T, len(s.slice))
1457-
for i, v := range s.slice {
1457+
for i, v := range s.slice { //nolint:gosimple //ok
14581458
newSlice[i] = v
14591459
}
14601460
return newSlice

0 commit comments

Comments
 (0)