Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 306686c

Browse files
johnstcnjohnstcn
committed
lint
1 parent bdb998e commit 306686c

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎internal/cmd/update.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func defaultConfirm(label string) (string, error) {
226226
return p.Run()
227227
}
228228

229-
func makeDownloadURL(version *semver.Version, ostype, archtype string) string {
229+
func makeDownloadURL(version *semver.Version, ostype, arch string) string {
230230
const template = "https://github.com/cdr/coder-cli/releases/download/v%s/coder-cli-%s-%s.%s"
231231
var ext string
232232
switch ostype {
@@ -246,7 +246,7 @@ func makeDownloadURL(version *semver.Version, ostype, archtype string) string {
246246
fmt.Fprint(&b, version.Prerelease())
247247
}
248248

249-
return fmt.Sprintf(template, b.String(), ostype, archtype, ext)
249+
return fmt.Sprintf(template, b.String(), ostype, arch, ext)
250250
}
251251

252252
func extractFromArchive(path string, archive []byte) ([]byte, error) {
@@ -366,7 +366,7 @@ func getAPIVersionUnauthed(client getter, baseURL url.URL) (*semver.Version, err
366366

367367
// HasFilePathPrefix reports whether the filesystem path s
368368
// begins with the elements in prefix.
369-
// Lifted from github.com/golang/go/blob/master/src/cmd/internal/str/path.go
369+
// Lifted from github.com/golang/go/blob/master/src/cmd/internal/str/path.go.
370370
func HasFilePathPrefix(s, prefix string) bool {
371371
sv := strings.ToUpper(filepath.VolumeName(s))
372372
pv := strings.ToUpper(filepath.VolumeName(prefix))
@@ -389,7 +389,7 @@ func HasFilePathPrefix(s, prefix string) bool {
389389
}
390390
}
391391

392-
// defaultExec wraps exec.CommandContext
392+
// defaultExec wraps exec.CommandContext.
393393
func defaultExec(ctx context.Context, cmd string, args ...string) ([]byte, error) {
394394
return exec.CommandContext(ctx, cmd, args...).CombinedOutput()
395395
}

‎internal/cmd/update_test.go

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ const (
2828
fakeOldVersion = "1.22.4-rc.5+678-gabcdef-12345678"
2929
fakeReleaseURLLinux = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-linux-amd64.tar.gz"
3030
fakeReleaseURLWindows = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-windows-amd64.zip"
31+
goosWindows = "windows"
32+
goosLinux = "linux"
3133
)
3234

3335
var (
3436
apiPrivateVersionURL = fakeCoderURL + "/api/private/version"
35-
fakeNewVersionJson = fmt.Sprintf(`{"version":%q}`, fakeNewVersion)
37+
fakeNewVersionJSON = fmt.Sprintf(`{"version":%q}`, fakeNewVersion)
3638
)
3739

3840
func Test_updater_run(t *testing.T) {
@@ -45,7 +47,7 @@ func Test_updater_run(t *testing.T) {
4547
Execer *fakeExecer
4648
ExecutablePath string
4749
Fakefs afero.Fs
48-
HttpClient *fakeGetter
50+
HTTPClient *fakeGetter
4951
OsF func() string
5052
VersionF func() string
5153
}
@@ -57,7 +59,7 @@ func Test_updater_run(t *testing.T) {
5759
execF: p.Execer.ExecF,
5860
executablePath: p.ExecutablePath,
5961
fs: p.Fakefs,
60-
httpClient: p.HttpClient,
62+
httpClient: p.HTTPClient,
6163
osF: p.OsF,
6264
versionF: p.VersionF,
6365
}
@@ -80,9 +82,9 @@ func Test_updater_run(t *testing.T) {
8082
Ctx: ctx,
8183
ExecutablePath: fakeExePathLinux,
8284
Fakefs: fakefs,
83-
HttpClient: newFakeGetter(t),
85+
HTTPClient: newFakeGetter(t),
8486
// Default to GOOS=linux
85-
OsF: func() string { return "linux" },
87+
OsF: func() string { return goosLinux },
8688
// This must be overridden inside run()
8789
VersionF: func() string {
8890
t.Errorf("unhandled VersionF")
@@ -96,7 +98,7 @@ func Test_updater_run(t *testing.T) {
9698

9799
run(t, "update coder - noop", func(t *testing.T, p *params) {
98100
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeNewVersion)
99-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
101+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
100102
p.VersionF = func() string { return fakeNewVersion }
101103
u := fromParams(p)
102104
assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeNewVersion)
@@ -107,8 +109,8 @@ func Test_updater_run(t *testing.T) {
107109

108110
run(t, "update coder - old to new", func(t *testing.T, p *params) {
109111
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
110-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
111-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
112+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
113+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
112114
p.VersionF = func() string { return fakeOldVersion }
113115
p.ConfirmF = fakeConfirmYes
114116
u := fromParams(p)
@@ -121,8 +123,8 @@ func Test_updater_run(t *testing.T) {
121123
run(t, "update coder - old to new - binary renamed", func(t *testing.T, p *params) {
122124
p.ExecutablePath = "/home/user/bin/coder-cli"
123125
fakeFile(t, p.Fakefs, p.ExecutablePath, 0755, fakeOldVersion)
124-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
125-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
126+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
127+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
126128
p.VersionF = func() string { return fakeOldVersion }
127129
p.ConfirmF = fakeConfirmYes
128130
u := fromParams(p)
@@ -133,11 +135,11 @@ func Test_updater_run(t *testing.T) {
133135
})
134136

135137
run(t, "update coder - old to new - windows", func(t *testing.T, p *params) {
136-
p.OsF = func() string { return "windows" }
138+
p.OsF = func() string { return goosWindows }
137139
p.ExecutablePath = fakeExePathWindows
138140
fakeFile(t, p.Fakefs, fakeExePathWindows, 0755, fakeOldVersion)
139-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
140-
p.HttpClient.M[fakeReleaseURLWindows] = newFakeGetterResponse(fakeValidZipBytes, 200, variadicS(), nil)
141+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
142+
p.HTTPClient.M[fakeReleaseURLWindows] = newFakeGetterResponse(fakeValidZipBytes, 200, variadicS(), nil)
141143
p.VersionF = func() string { return fakeOldVersion }
142144
p.ConfirmF = fakeConfirmYes
143145
u := fromParams(p)
@@ -149,8 +151,8 @@ func Test_updater_run(t *testing.T) {
149151

150152
run(t, "update coder - old to new forced", func(t *testing.T, p *params) {
151153
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
152-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
153-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
154+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
155+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
154156
p.VersionF = func() string { return fakeOldVersion }
155157
u := fromParams(p)
156158
assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
@@ -161,7 +163,7 @@ func Test_updater_run(t *testing.T) {
161163

162164
run(t, "update coder - user cancelled", func(t *testing.T, p *params) {
163165
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
164-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
166+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
165167
p.VersionF = func() string { return fakeOldVersion }
166168
p.ConfirmF = fakeConfirmNo
167169
u := fromParams(p)
@@ -198,7 +200,7 @@ func Test_updater_run(t *testing.T) {
198200

199201
run(t, "update coder - fetch api version failure", func(t *testing.T, p *params) {
200202
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
201-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte{}, 401, variadicS(), net.ErrClosed)
203+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte{}, 401, variadicS(), net.ErrClosed)
202204
p.VersionF = func() string { return fakeOldVersion }
203205
u := fromParams(p)
204206
assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
@@ -209,8 +211,8 @@ func Test_updater_run(t *testing.T) {
209211

210212
run(t, "update coder - failed to fetch URL", func(t *testing.T, p *params) {
211213
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
212-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
213-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 0, variadicS(), net.ErrClosed)
214+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
215+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 0, variadicS(), net.ErrClosed)
214216
p.VersionF = func() string { return fakeOldVersion }
215217
p.ConfirmF = fakeConfirmYes
216218
u := fromParams(p)
@@ -222,8 +224,8 @@ func Test_updater_run(t *testing.T) {
222224

223225
run(t, "update coder - release URL 404", func(t *testing.T, p *params) {
224226
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
225-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
226-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 404, variadicS(), nil)
227+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
228+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 404, variadicS(), nil)
227229
p.VersionF = func() string { return fakeOldVersion }
228230
p.ConfirmF = fakeConfirmYes
229231
u := fromParams(p)
@@ -235,8 +237,8 @@ func Test_updater_run(t *testing.T) {
235237

236238
run(t, "update coder - invalid tgz archive", func(t *testing.T, p *params) {
237239
fakeFile(t, p.Fakefs, fakeExePathLinux, 0755, fakeOldVersion)
238-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
239-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 200, variadicS(), nil)
240+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
241+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse([]byte{}, 200, variadicS(), nil)
240242
p.VersionF = func() string { return fakeOldVersion }
241243
p.ConfirmF = fakeConfirmYes
242244
u := fromParams(p)
@@ -247,11 +249,11 @@ func Test_updater_run(t *testing.T) {
247249
})
248250

249251
run(t, "update coder - invalid zip archive", func(t *testing.T, p *params) {
250-
p.OsF = func() string { return "windows" }
252+
p.OsF = func() string { return goosWindows }
251253
p.ExecutablePath = fakeExePathWindows
252254
fakeFile(t, p.Fakefs, fakeExePathWindows, 0755, fakeOldVersion)
253-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
254-
p.HttpClient.M[fakeReleaseURLWindows] = newFakeGetterResponse([]byte{}, 200, variadicS(), nil)
255+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
256+
p.HTTPClient.M[fakeReleaseURLWindows] = newFakeGetterResponse([]byte{}, 200, variadicS(), nil)
255257
p.VersionF = func() string { return fakeOldVersion }
256258
p.ConfirmF = fakeConfirmYes
257259
u := fromParams(p)
@@ -265,8 +267,8 @@ func Test_updater_run(t *testing.T) {
265267
rwfs := p.Fakefs
266268
p.Fakefs = afero.NewReadOnlyFs(rwfs)
267269
fakeFile(t, rwfs, fakeExePathLinux, 0755, fakeOldVersion)
268-
p.HttpClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJson), 200, variadicS(), nil)
269-
p.HttpClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
270+
p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
271+
p.HTTPClient.M[fakeReleaseURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
270272
p.VersionF = func() string { return fakeOldVersion }
271273
p.ConfirmF = fakeConfirmYes
272274
u := fromParams(p)
@@ -276,7 +278,7 @@ func Test_updater_run(t *testing.T) {
276278
assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
277279
})
278280

279-
if runtime.GOOS == "windows" {
281+
if runtime.GOOS == goosWindows {
280282
run(t, "update coder - path blocklist - windows", func(t *testing.T, p *params) {
281283
p.ExecutablePath = `C:\Windows\system32\coder.exe`
282284
u := fromParams(p)
@@ -314,7 +316,7 @@ func Test_updater_run(t *testing.T) {
314316
}
315317
}
316318

317-
// fakeGetter mocks HTTP requests
319+
// fakeGetter mocks HTTP requests.
318320
type fakeGetter struct {
319321
M map[string]*fakeGetterResponse
320322
T *testing.T
@@ -344,7 +346,7 @@ type fakeGetterResponse struct {
344346
Err error
345347
}
346348

347-
// newFakeGetterResponse is a convenience function for mocking HTTP requests
349+
// newFakeGetterResponse is a convenience function for mocking HTTP requests.
348350
func newFakeGetterResponse(body []byte, code int, headers []string, err error) *fakeGetterResponse {
349351
resp := &http.Response{}
350352
resp.Body = ioutil.NopCloser(bytes.NewReader(body))
@@ -376,7 +378,6 @@ func fakeConfirmNo(_ string) (string, error) {
376378
return "", promptui.ErrAbort
377379
}
378380

379-
//nolint:unparam
380381
func fakeFile(t *testing.T, fs afero.Fs, name string, perm fs.FileMode, content string) {
381382
t.Helper()
382383
err := fs.MkdirAll(filepath.Dir(name), 0750)
@@ -395,7 +396,6 @@ func fakeFile(t *testing.T, fs afero.Fs, name string, perm fs.FileMode, content
395396
}
396397
}
397398

398-
//nolint:unparam
399399
func assertFileContent(t *testing.T, fs afero.Fs, name string, content string) {
400400
t.Helper()
401401
f, err := fs.OpenFile(name, os.O_RDONLY, 0)

0 commit comments

Comments
 (0)