Skip to content

Commit 201b9f0

Browse files
theFongtheFong
committed
fix linting
1 parent e4e1f9a commit 201b9f0

File tree

33 files changed

+189
-159
lines changed

33 files changed

+189
-159
lines changed

‎.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ linters:
6969
- unused
7070
- varcheck
7171
- bodyclose
72-
- depguard
72+
# - depguard
7373
- dupl
7474
- exportloopref
7575
- forcetypeassert
7676
- funlen
7777
# - gci
7878
- gocognit
79-
- goconst
79+
# - goconst
8080
- gocritic
8181
- gocyclo
8282
# - godot
8383
- gofumpt
84-
- revive
84+
# - revive
8585
# - gomnd
8686
- goprintffuncname
8787
- gosec

‎.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,10 @@
2121
],
2222
"go.lintOnSave": "workspace",
2323
"go.testTimeout": "240s",
24-
"go.goroot": "/home/ubuntu/.asdf/installs/golang//go"
24+
"go.goroot": "/home/ubuntu/.asdf/installs/golang//go",
25+
"[go][go.mod]": {
26+
"editor.codeActionsOnSave": {
27+
"source.organizeImports": "explicit"
28+
}
29+
}
2530
}

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ func main() {
1616
if err := command.Execute(); err != nil {
1717
cmderrors.DisplayAndHandleError(err)
1818
done()
19-
os.Exit(1)
19+
os.Exit(1) //nolint:gocritic // manually call done
2020
}
2121
}

‎pkg/analytics/analytics.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package analytics
22

33
import (
44
"bytes"
5+
"context"
56
"encoding/json"
67
"net/http"
78

@@ -25,7 +26,7 @@ func TrackEvent(data EventData) error {
2526
return breverrors.WrapAndTrace(err)
2627
}
2728

28-
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
29+
req, err := http.NewRequestWithContext(context.TODO(), "POST", url, bytes.NewBuffer(jsonData))
2930
if err != nil {
3031
return breverrors.WrapAndTrace(err)
3132
}

‎pkg/auth/auth0.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,22 @@ func (a *Authenticator) Start(ctx context.Context) (State, error) {
122122
return s, nil
123123
}
124124

125+
// postFormWithContext wraps the process of creating a POST request with form data and a context
126+
func postFormWithContext(ctx context.Context, url string, data url.Values) (*http.Response, error) {
127+
req, err := http.NewRequestWithContext(ctx, "POST", url, strings.NewReader(data.Encode()))
128+
if err != nil {
129+
return nil, err
130+
}
131+
132+
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
133+
134+
resp, err := http.DefaultClient.Do(req)
135+
if err != nil {
136+
return nil, breverrors.WrapAndTrace(err)
137+
}
138+
return resp, nil
139+
}
140+
125141
// Wait waits until the user is logged in on the browser.
126142
func (a *Authenticator) Wait(ctx context.Context, state State) (Result, error) {
127143
t := time.NewTicker(state.IntervalDuration())
@@ -135,7 +151,7 @@ func (a *Authenticator) Wait(ctx context.Context, state State) (Result, error) {
135151
"grant_type": {"urn:ietf:params:oauth:grant-type:device_code"},
136152
"device_code": {state.DeviceCode},
137153
}
138-
r, err := http.PostForm(a.OauthTokenEndpoint, data)
154+
r, err := postFormWithContext(ctx, a.OauthTokenEndpoint, data)
139155
if err != nil {
140156
return Result{}, breverrors.WrapAndTrace(err, breverrors.NetworkErrorMessage)
141157
}
@@ -187,13 +203,13 @@ func (a *Authenticator) Wait(ctx context.Context, state State) (Result, error) {
187203
}
188204
}
189205

190-
func (a *Authenticator) getDeviceCode(_ context.Context) (State, error) {
206+
func (a *Authenticator) getDeviceCode(ctx context.Context) (State, error) {
191207
data := url.Values{
192208
"client_id": {a.ClientID},
193209
"scope": {strings.Join(requiredScopes, " ")},
194210
"audience": {a.Audience},
195211
}
196-
r, err := http.PostForm(a.DeviceCodeEndpoint, data)
212+
r, err := postFormWithContext(ctx, a.DeviceCodeEndpoint, data)
197213
if err != nil {
198214
return State{}, breverrors.WrapAndTrace(err, breverrors.NetworkErrorMessage)
199215
}
@@ -256,7 +272,7 @@ func (a Authenticator) GetNewAuthTokensWithRefresh(refreshToken string) (*entity
256272
"refresh_token": {refreshToken},
257273
}
258274

259-
r, err := http.PostForm(a.OauthTokenEndpoint, payload)
275+
r, err := postFormWithContext(context.TODO(), a.OauthTokenEndpoint, payload)
260276
if err != nil {
261277
return nil, breverrors.WrapAndTrace(err, breverrors.NetworkErrorMessage)
262278
}

‎pkg/cmd/background/background.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ func NewCmdBackground(t *terminal.Terminal, s BackgroundStore) *cobra.Command {
100100
if err != nil {
101101
log.Fatal(err)
102102
}
103-
defer logFile.Close() //nolint: gosec,errcheck // TODO
103+
defer logFile.Close() //nolint: errcheck // TODO
104104
logFile.WriteString(time.Now().Format("2006-01-02 15:04:05") + ": Command \"" + command + "\" was run in the background.\n") //nolint: errcheck,gosec // TODO
105105

106106
// Write process details to data file
107107
processesFile, err := os.OpenFile(logsDir+"/processes.txt", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o666) //nolint: gosec // TODO
108108
if err != nil {
109109
log.Fatal(err)
110110
}
111-
defer processesFile.Close() //nolint: errcheck,gosec // TODO
111+
defer processesFile.Close() //nolint: errcheck // TODO
112112
_, _ = processesFile.WriteString(fmt.Sprintf("%d,%s,%s\n", c.Process.Pid, time.Now().Format("2006-01-02 15:04:05"), command))
113113

114114
if stopFlag {
@@ -178,7 +178,7 @@ func checkProgress() {
178178
if err != nil {
179179
panic(err)
180180
}
181-
defer file.Close() //nolint: errcheck,gosec // TODO
181+
defer file.Close() //nolint: errcheck // TODO
182182

183183
scanner := bufio.NewScanner(file)
184184

‎pkg/cmd/clipboard/clipboard_listener.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package clipboard
22

33
import (
4+
"context"
45
"fmt"
56
"io/ioutil"
67
"net/http"
@@ -33,7 +34,7 @@ func CreateListener(config *Config) *Server {
3334
// tcp req
3435
func SendRequest(address string, message string) error {
3536
reader := strings.NewReader(message)
36-
request, err := http.NewRequest("GET", "http://"+address+"/", reader)
37+
request, err := http.NewRequestWithContext(context.TODO(), "GET", "http://"+address+"/", reader)
3738
if err != nil {
3839
fmt.Println(err)
3940
return breverrors.WrapAndTrace(err)

‎pkg/cmd/cmd.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func NewDefaultBrevCommand() *cobra.Command {
7272
return cmd
7373
}
7474

75-
func NewBrevCommand() *cobra.Command { //nolint:funlen // define brev command
75+
func NewBrevCommand() *cobra.Command { //nolint:funlen,gocognit,gocyclo // define brev command
7676
// in io.Reader, out io.Writer, err io.Writer
7777
t := terminal.New()
7878
var printVersion bool
@@ -140,7 +140,10 @@ func NewBrevCommand() *cobra.Command { //nolint:funlen // define brev command
140140
if err != nil {
141141
return
142142
}
143-
hello.CanWeOnboard(t, user, loginCmdStore)
143+
err = hello.CanWeOnboard(t, user, loginCmdStore)
144+
if err != nil {
145+
return
146+
}
144147
}
145148
},
146149
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
@@ -227,7 +230,7 @@ func NewBrevCommand() *cobra.Command { //nolint:funlen // define brev command
227230
return cmds
228231
}
229232

230-
func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *store.AuthHTTPStore, noLoginCmdStore *store.AuthHTTPStore, loginAuth *auth.LoginAuth) {
233+
func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *store.AuthHTTPStore, noLoginCmdStore *store.AuthHTTPStore, loginAuth *auth.LoginAuth) { //nolint:funlen // define brev command
231234
cmd.AddCommand(set.NewCmdSet(t, loginCmdStore, noLoginCmdStore))
232235
cmd.AddCommand(ls.NewCmdLs(t, loginCmdStore, noLoginCmdStore))
233236
cmd.AddCommand(org.NewCmdOrg(t, loginCmdStore, noLoginCmdStore))

‎pkg/cmd/configureenvvars/configureenvvars.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
"strings"
88

99
"github.com/alessio/shellescape"
10-
"github.com/brevdev/brev-cli/pkg/collections" //nolint:typecheck
10+
"github.com/brevdev/brev-cli/pkg/collections"
1111
"github.com/brevdev/brev-cli/pkg/terminal"
1212
"github.com/spf13/cobra"
1313
)
1414

1515
const (
16-
BREV_WORKSPACE_ENV_PATH = "/home/brev/workspace/.env"
17-
BREV_DEV_PLANE_ENV_PATH = "/home/ubuntu/.brev/.env"
18-
BREV_MANGED_ENV_VARS_KEY = "BREV_MANAGED_ENV_VARS"
16+
BrevWorkspaceEnvPath = "/home/brev/workspace/.env"
17+
BrevDevPlaneEnvPath = "/home/ubuntu/.brev/.env"
18+
BrevManagedEnvVarsKey = "BREV_MANAGED_ENV_VARS"
1919
)
2020

2121
type envVars map[string]string
@@ -48,10 +48,10 @@ func NewCmdConfigureEnvVars(_ *terminal.Terminal, cevStore ConfigureEnvVarsStore
4848
}
4949

5050
func RunConfigureEnvVars(cevStore ConfigureEnvVarsStore) (string, error) {
51-
brevEnvsString := os.Getenv(BREV_MANGED_ENV_VARS_KEY)
51+
brevEnvsString := os.Getenv(BrevManagedEnvVarsKey)
5252
// intentionally ignoring err
53-
envFileContents, _ := cevStore.GetFileAsString(BREV_WORKSPACE_ENV_PATH)
54-
devplaneContents, _ := cevStore.GetFileAsString(BREV_DEV_PLANE_ENV_PATH)
53+
envFileContents, _ := cevStore.GetFileAsString(BrevWorkspaceEnvPath)
54+
devplaneContents, _ := cevStore.GetFileAsString(BrevDevPlaneEnvPath)
5555
envFileContents = envFileContents + "\n" + devplaneContents
5656
return generateExportString(brevEnvsString, envFileContents), nil
5757
}
@@ -87,7 +87,7 @@ func makeEnvCmdOutputLines(brevEnvKeys, envFileKeys []string, envfileEntries env
8787
newBrevEnvKeys := strings.Join(envFileKeys, ",")
8888
newBrevEnvKeysEntry := ""
8989
if newBrevEnvKeys != "" {
90-
newBrevEnvKeysEntry = BREV_MANGED_ENV_VARS_KEY + "=" + newBrevEnvKeys
90+
newBrevEnvKeysEntry = BrevManagedEnvVarsKey + "=" + newBrevEnvKeys
9191
}
9292
if newBrevEnvKeysEntry != "" {
9393
envCmdOutput = append(envCmdOutput, "export "+newBrevEnvKeysEntry)

‎pkg/cmd/configureenvvars/configureenvvars_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
)
99

10-
func Test_generateExportString(t *testing.T) {
10+
func Test_generateExportString(t *testing.T) { //nolint:funlen // this is a test
1111
type args struct {
1212
brevEnvsString string
1313
envFileContents string
@@ -44,7 +44,7 @@ unset baz`,
4444
envFileContents: "foo=bar",
4545
},
4646
want: `export foo=bar
47-
export ` + BREV_MANGED_ENV_VARS_KEY + `=foo`,
47+
export ` + BrevManagedEnvVarsKey + `=foo`,
4848
},
4949
{
5050
name: "sets env var with export prefix",
@@ -53,7 +53,7 @@ export ` + BREV_MANGED_ENV_VARS_KEY + `=foo`,
5353
envFileContents: "export foo=bar",
5454
},
5555
want: `export foo=bar
56-
export ` + BREV_MANGED_ENV_VARS_KEY + `=foo`,
56+
export ` + BrevManagedEnvVarsKey + `=foo`,
5757
},
5858
{
5959
name: "is idempotent",
@@ -62,7 +62,7 @@ export ` + BREV_MANGED_ENV_VARS_KEY + `=foo`,
6262
envFileContents: "foo=bar",
6363
},
6464
want: `export foo=bar
65-
export ` + BREV_MANGED_ENV_VARS_KEY + "=foo",
65+
export ` + BrevManagedEnvVarsKey + "=foo",
6666
},
6767
{
6868
name: "multiple operations(journal) case",
@@ -74,7 +74,7 @@ export ` + BREV_MANGED_ENV_VARS_KEY + "=foo",
7474
unset key2
7575
unset key3
7676
export key4=val
77-
export ` + BREV_MANGED_ENV_VARS_KEY + "=key4",
77+
export ` + BrevManagedEnvVarsKey + "=key4",
7878
},
7979
{
8080
name: "using env format found on workspace",
@@ -84,7 +84,7 @@ export ` + BREV_MANGED_ENV_VARS_KEY + "=key4",
8484
},
8585
want: `export alice='bob'
8686
export foo='bar'
87-
export ` + BREV_MANGED_ENV_VARS_KEY + "=alice,foo",
87+
export ` + BrevManagedEnvVarsKey + "=alice,foo",
8888
},
8989
{
9090
name: "multi line file",
@@ -95,7 +95,7 @@ export alice='bob'`,
9595
},
9696
want: `export alice='bob'
9797
export foo='bar'
98-
export ` + BREV_MANGED_ENV_VARS_KEY + "=alice,foo",
98+
export ` + BrevManagedEnvVarsKey + "=alice,foo",
9999
},
100100
{
101101
name: "semicolon -> newline file ",
@@ -107,7 +107,7 @@ export alice='bob'`,
107107
},
108108
want: `export alice='bob'
109109
export foo='bar'
110-
export ` + BREV_MANGED_ENV_VARS_KEY + "=alice,foo",
110+
export ` + BrevManagedEnvVarsKey + "=alice,foo",
111111
},
112112
{
113113
name: "hyphen in env var shouldn't be included since that's not allowed in most shells",
@@ -140,7 +140,7 @@ export ` + BREV_MANGED_ENV_VARS_KEY + "=alice,foo",
140140
envFileContents: `export foo='90ie&$>'`,
141141
},
142142
want: `export foo='90ie&$>'
143-
export ` + BREV_MANGED_ENV_VARS_KEY + "=foo",
143+
export ` + BrevManagedEnvVarsKey + "=foo",
144144
},
145145
}
146146
for _, tt := range tests {
@@ -240,7 +240,7 @@ func Test_addUnsetEntriesToOutput(t *testing.T) {
240240
}
241241
}
242242

243-
func Test_parse(t *testing.T) {
243+
func Test_parse(t *testing.T) { //nolint:funlen // this is a test
244244
type args struct {
245245
content string
246246
}

‎pkg/cmd/configureenvvars/lex.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const eof = -1
8181

8282
// next returns the next rune in the input.
8383
func (l *lexer) next() rune {
84-
if int(l.pos) >= len(l.input) {
84+
if l.pos >= len(l.input) {
8585
l.width = 0
8686
return eof
8787
}
@@ -145,8 +145,6 @@ func lexText(l *lexer) stateFn {
145145
return nil
146146
}
147147

148-
const hyphen = "-"
149-
150148
func lexKey(l *lexer) stateFn {
151149
s := l.input[l.start:l.pos]
152150
// determine if s alphanumeric or an underscore
@@ -193,7 +191,7 @@ func lexNewline(l *lexer) stateFn {
193191

194192
func lexSpace(l *lexer) stateFn {
195193
if strings.HasPrefix(l.input[l.start:l.pos], "export") {
196-
l.start = l.start + len("export")
194+
l.start += len("export")
197195
}
198196
l.next()
199197
if l.input[l.start:l.pos] != space {

‎pkg/cmd/configureenvvars/lex_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/google/go-cmp/cmp"
77
)
88

9-
func Test_lex(t *testing.T) {
9+
func Test_lex(t *testing.T) { //nolint:funlen // this is a test
1010
type args struct {
1111
input string
1212
}

‎pkg/cmd/envsetup/envsetup.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package envsetup
22

33
import (
4+
"context"
45
"encoding/json"
56
"fmt"
67
"io"
78
"io/ioutil"
89
"log"
9-
"net/http"
1010
"os"
1111
"os/user"
1212
"path/filepath"
@@ -22,6 +22,7 @@ import (
2222
"github.com/brevdev/brev-cli/pkg/autostartconf"
2323
"github.com/brevdev/brev-cli/pkg/cmd/updatemodel"
2424
"github.com/brevdev/brev-cli/pkg/cmd/version"
25+
"github.com/brevdev/brev-cli/pkg/collections"
2526
"github.com/brevdev/brev-cli/pkg/entity"
2627
breverrors "github.com/brevdev/brev-cli/pkg/errors"
2728
"github.com/brevdev/brev-cli/pkg/featureflag"
@@ -370,7 +371,7 @@ func (e envInitier) SetupDatadog() error {
370371
installScriptURL := "https://s3.amazonaws.com/dd-agent/scripts/install_script.sh"
371372
var installScript string
372373

373-
resp, err := http.Get(installScriptURL)
374+
resp, err := collections.GetRequestWithContext(context.TODO(), installScriptURL)
374375
if err != nil {
375376
return breverrors.WrapAndTrace(err)
376377
}

0 commit comments

Comments
 (0)