Skip to content

Commit e37d691

Browse files
plutovplutov
committed
#285 golangci lint
Signed-off-by: plutov <[email protected]>
1 parent ec91d8f commit e37d691

File tree

5 files changed

+1174
-34
lines changed

5 files changed

+1174
-34
lines changed

‎.github/workflows/lint-test.yaml

+13-23
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,30 @@
11
name: Lint and Test
22

3-
on: push
3+
on:
4+
push:
5+
pull_request:
46

57
jobs:
6-
lint:
8+
golangci:
9+
name: lint
710
runs-on: ubuntu-latest
8-
911
steps:
1012
- uses: actions/checkout@v4
11-
- name: Setup Go
12-
uses: actions/setup-go@v5
13+
- uses: actions/setup-go@v5
14+
with:
15+
go-version: stable
16+
- name: golangci-lint
17+
uses: golangci/golangci-lint-action@v7
1318
with:
14-
go-version: "1.23"
15-
- name: Install dependencies
16-
run: go get .
17-
- name: Install linters
18-
run: |
19-
go install honnef.co/go/tools/cmd/staticcheck@latest
20-
go install mvdan.cc/unparam@latest
21-
- name: go vet
22-
run: go vet ${{ inputs.path }}
23-
- name: staticcheck
24-
run: staticcheck ${{ inputs.path }}
25-
- name: unparam
26-
run: unparam ${{ inputs.path }}
19+
version: v2.0
2720

2821
test:
2922
runs-on: ubuntu-latest
3023

3124
steps:
3225
- uses: actions/checkout@v4
33-
- name: Setup Go
34-
uses: actions/setup-go@v5
26+
- uses: actions/setup-go@v5
3527
with:
36-
go-version: "1.23"
37-
- name: Install dependencies
38-
run: go get .
28+
go-version: stable
3929
- name: Run Tests
4030
run: go test -v -race ./...

‎client.go

+15-6
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (c *Client) SetReturnRepresentation() {
7979
// Send makes a request to the API, the response body will be
8080
// unmarshalled into v, or if v is an io.Writer, the response will
8181
// be written to it without decoding
82-
func (c *Client) Send(req *http.Request, v interface{}) error {
82+
func (c *Client) Send(req *http.Request, v interface{}) (retErr error) {
8383
var (
8484
err error
8585
resp *http.Response
@@ -99,7 +99,10 @@ func (c *Client) Send(req *http.Request, v interface{}) error {
9999
}
100100
if c.Log != nil {
101101
if reqDump, err := httputil.DumpRequestOut(req, true); err == nil {
102-
c.Log.Write([]byte(fmt.Sprintf("Request: %s\n", reqDump)))
102+
logMsg := fmt.Sprintf("Request: %s\n", string(reqDump))
103+
if _, logErr := c.Log.Write([]byte(logMsg)); logErr != nil {
104+
return logErr
105+
}
103106
}
104107
}
105108

@@ -110,13 +113,19 @@ func (c *Client) Send(req *http.Request, v interface{}) error {
110113

111114
if c.Log != nil {
112115
if respDump, err := httputil.DumpResponse(resp, true); err == nil {
113-
c.Log.Write([]byte(fmt.Sprintf("Response from %s: %s\n", req.URL, respDump)))
116+
logMsg := fmt.Sprintf("Response from %s: %s\n", req.URL.RequestURI(), string(respDump))
117+
if _, logErr := c.Log.Write([]byte(logMsg)); logErr != nil {
118+
return logErr
119+
}
114120
}
115121
}
116122

117-
defer func(Body io.ReadCloser) error {
118-
return Body.Close()
119-
}(resp.Body)
123+
defer func() {
124+
err := resp.Body.Close()
125+
if err != nil && retErr == nil {
126+
retErr = err
127+
}
128+
}()
120129

121130
if resp.StatusCode < 200 || resp.StatusCode > 299 {
122131
errResp := &ErrorResponse{Response: resp}

‎client_test.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ import (
1414

1515
const alphabet = "abcedfghijklmnopqrstuvwxyz"
1616

17-
var testClientID = "AXy9orp-CDaHhBZ9C78QHW2BKZpACgroqo85_NIOa9mIfJ9QnSVKzY-X_rivR_fTUUr6aLjcJsj6sDur"
18-
var testSecret = "EBoIiUSkCKeSk49hHSgTem1qnjzzJgRQHDEHvGpzlLEf_nIoJd91xu8rPOBDCdR_UYNKVxJE-UgS2iCw"
17+
var (
18+
testClientID = "AXy9orp-CDaHhBZ9C78QHW2BKZpACgroqo85_NIOa9mIfJ9QnSVKzY-X_rivR_fTUUr6aLjcJsj6sDur"
19+
testSecret = "EBoIiUSkCKeSk49hHSgTem1qnjzzJgRQHDEHvGpzlLEf_nIoJd91xu8rPOBDCdR_UYNKVxJE-UgS2iCw"
20+
)
1921

2022
func RandomString(n int) string {
2123
var sb strings.Builder
@@ -29,7 +31,7 @@ func RandomString(n int) string {
2931
}
3032

3133
func createRandomProduct(t *testing.T) Product {
32-
//create a product
34+
// create a product
3335
productData := Product{
3436
Name: RandomString(10),
3537
Description: RandomString(100),
@@ -72,7 +74,8 @@ func (c *Client) createProduct(ctx context.Context, product Product) (*CreatePro
7274

7375
func TestClientMutex(t *testing.T) {
7476
c, _ := NewClient(testClientID, testSecret, APIBaseSandBox)
75-
c.GetAccessToken(context.Background())
77+
_, err := c.GetAccessToken(context.Background())
78+
assert.NoError(t, err)
7679

7780
// Operational testing of the private mutex field
7881
n_iter := 2
@@ -90,5 +93,4 @@ func TestClientMutex(t *testing.T) {
9093
err := <-errs
9194
assert.Equal(t, nil, err)
9295
}
93-
9496
}

‎go.mod

+196
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,203 @@ go 1.24
55
require github.com/stretchr/testify v1.10.0
66

77
require (
8+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
9+
4d63.com/gochecknoglobals v0.2.2 // indirect
10+
github.com/4meepo/tagalign v1.4.2 // indirect
11+
github.com/Abirdcfly/dupword v0.1.3 // indirect
12+
github.com/Antonboom/errname v1.1.0 // indirect
13+
github.com/Antonboom/nilnil v1.1.0 // indirect
14+
github.com/Antonboom/testifylint v1.6.1 // indirect
15+
github.com/BurntSushi/toml v1.5.0 // indirect
16+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
17+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
18+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
19+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
20+
github.com/alecthomas/chroma/v2 v2.16.0 // indirect
21+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
22+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
23+
github.com/alexkohler/prealloc v1.0.0 // indirect
24+
github.com/alingse/asasalint v0.0.11 // indirect
25+
github.com/alingse/nilnesserr v0.2.0 // indirect
26+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
27+
github.com/ashanbrown/makezero v1.2.0 // indirect
28+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
29+
github.com/beorn7/perks v1.0.1 // indirect
30+
github.com/bkielbasa/cyclop v1.2.3 // indirect
31+
github.com/blizzy78/varnamelen v0.8.0 // indirect
32+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
33+
github.com/breml/bidichk v0.3.3 // indirect
34+
github.com/breml/errchkjson v0.4.1 // indirect
35+
github.com/butuzov/ireturn v0.4.0 // indirect
36+
github.com/butuzov/mirror v1.3.0 // indirect
37+
github.com/catenacyber/perfsprint v0.9.1 // indirect
38+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
39+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
40+
github.com/charithe/durationcheck v0.0.10 // indirect
41+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
42+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
43+
github.com/charmbracelet/x/ansi v0.8.0 // indirect
44+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
45+
github.com/charmbracelet/x/term v0.2.1 // indirect
46+
github.com/chavacava/garif v0.1.0 // indirect
47+
github.com/ckaznocha/intrange v0.3.1 // indirect
48+
github.com/curioswitch/go-reassign v0.3.0 // indirect
49+
github.com/daixiang0/gci v0.13.6 // indirect
50+
github.com/dave/dst v0.27.3 // indirect
851
github.com/davecgh/go-spew v1.1.1 // indirect
52+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
53+
github.com/dlclark/regexp2 v1.11.5 // indirect
54+
github.com/ettle/strcase v0.2.0 // indirect
55+
github.com/fatih/color v1.18.0 // indirect
56+
github.com/fatih/structtag v1.2.0 // indirect
57+
github.com/firefart/nonamedreturns v1.0.6 // indirect
58+
github.com/fsnotify/fsnotify v1.5.4 // indirect
59+
github.com/fzipp/gocyclo v0.6.0 // indirect
60+
github.com/ghostiam/protogetter v0.3.15 // indirect
61+
github.com/go-critic/go-critic v0.13.0 // indirect
62+
github.com/go-toolsmith/astcast v1.1.0 // indirect
63+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
64+
github.com/go-toolsmith/astequal v1.2.0 // indirect
65+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
66+
github.com/go-toolsmith/astp v1.1.0 // indirect
67+
github.com/go-toolsmith/strparse v1.1.0 // indirect
68+
github.com/go-toolsmith/typep v1.1.0 // indirect
69+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
70+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
71+
github.com/gobwas/glob v0.2.3 // indirect
72+
github.com/gofrs/flock v0.12.1 // indirect
73+
github.com/golang/protobuf v1.5.3 // indirect
74+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
75+
github.com/golangci/go-printf-func-name v0.1.0 // indirect
76+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
77+
github.com/golangci/golangci-lint/v2 v2.1.5 // indirect
78+
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
79+
github.com/golangci/misspell v0.6.0 // indirect
80+
github.com/golangci/plugin-module-register v0.1.1 // indirect
81+
github.com/golangci/revgrep v0.8.0 // indirect
82+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
83+
github.com/google/go-cmp v0.7.0 // indirect
84+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
85+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
86+
github.com/gostaticanalysis/comment v1.5.0 // indirect
87+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
88+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
89+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
90+
github.com/hashicorp/go-version v1.7.0 // indirect
91+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
92+
github.com/hashicorp/hcl v1.0.0 // indirect
93+
github.com/hexops/gotextdiff v1.0.3 // indirect
94+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
95+
github.com/jgautheron/goconst v1.8.1 // indirect
96+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
97+
github.com/jjti/go-spancheck v0.6.4 // indirect
98+
github.com/julz/importas v0.2.0 // indirect
99+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
100+
github.com/kisielk/errcheck v1.9.0 // indirect
101+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
102+
github.com/kulti/thelper v0.6.3 // indirect
103+
github.com/kunwardeep/paralleltest v1.0.14 // indirect
104+
github.com/lasiar/canonicalheader v1.1.2 // indirect
105+
github.com/ldez/exptostd v0.4.3 // indirect
106+
github.com/ldez/gomoddirectives v0.6.1 // indirect
107+
github.com/ldez/grignotin v0.9.0 // indirect
108+
github.com/ldez/tagliatelle v0.7.1 // indirect
109+
github.com/ldez/usetesting v0.4.3 // indirect
110+
github.com/leonklingele/grouper v1.1.2 // indirect
111+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
112+
github.com/macabu/inamedparam v0.2.0 // indirect
113+
github.com/magiconair/properties v1.8.6 // indirect
114+
github.com/manuelarte/funcorder v0.2.1 // indirect
115+
github.com/maratori/testableexamples v1.0.0 // indirect
116+
github.com/maratori/testpackage v1.1.1 // indirect
117+
github.com/matoous/godox v1.1.0 // indirect
118+
github.com/mattn/go-colorable v0.1.14 // indirect
119+
github.com/mattn/go-isatty v0.0.20 // indirect
120+
github.com/mattn/go-runewidth v0.0.16 // indirect
121+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
122+
github.com/mgechev/revive v1.9.0 // indirect
123+
github.com/mitchellh/go-homedir v1.1.0 // indirect
124+
github.com/mitchellh/mapstructure v1.5.0 // indirect
125+
github.com/moricho/tparallel v0.3.2 // indirect
126+
github.com/muesli/termenv v0.16.0 // indirect
127+
github.com/nakabonne/nestif v0.3.1 // indirect
128+
github.com/nishanths/exhaustive v0.12.0 // indirect
129+
github.com/nishanths/predeclared v0.2.2 // indirect
130+
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
131+
github.com/olekukonko/tablewriter v0.0.5 // indirect
132+
github.com/pelletier/go-toml v1.9.5 // indirect
133+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
9134
github.com/pmezard/go-difflib v1.0.0 // indirect
135+
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
136+
github.com/prometheus/client_golang v1.12.1 // indirect
137+
github.com/prometheus/client_model v0.2.0 // indirect
138+
github.com/prometheus/common v0.32.1 // indirect
139+
github.com/prometheus/procfs v0.7.3 // indirect
140+
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
141+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
142+
github.com/quasilyte/gogrep v0.5.0 // indirect
143+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
144+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
145+
github.com/raeperd/recvcheck v0.2.0 // indirect
146+
github.com/rivo/uniseg v0.4.7 // indirect
147+
github.com/rogpeppe/go-internal v1.14.1 // indirect
148+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
149+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
150+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
151+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
152+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
153+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
154+
github.com/securego/gosec/v2 v2.22.3 // indirect
155+
github.com/sirupsen/logrus v1.9.3 // indirect
156+
github.com/sivchari/containedctx v1.0.3 // indirect
157+
github.com/sonatard/noctx v0.1.0 // indirect
158+
github.com/sourcegraph/go-diff v0.7.0 // indirect
159+
github.com/spf13/afero v1.14.0 // indirect
160+
github.com/spf13/cast v1.5.0 // indirect
161+
github.com/spf13/cobra v1.9.1 // indirect
162+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
163+
github.com/spf13/pflag v1.0.6 // indirect
164+
github.com/spf13/viper v1.12.0 // indirect
165+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
166+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
167+
github.com/stretchr/objx v0.5.2 // indirect
168+
github.com/subosito/gotenv v1.4.1 // indirect
169+
github.com/tdakkota/asciicheck v0.4.1 // indirect
170+
github.com/tetafro/godot v1.5.0 // indirect
171+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
172+
github.com/timonwong/loggercheck v0.11.0 // indirect
173+
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
174+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
175+
github.com/ultraware/funlen v0.2.0 // indirect
176+
github.com/ultraware/whitespace v0.2.0 // indirect
177+
github.com/uudashr/gocognit v1.2.0 // indirect
178+
github.com/uudashr/iface v1.3.1 // indirect
179+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
180+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
181+
github.com/yagipy/maintidx v1.0.0 // indirect
182+
github.com/yeya24/promlinter v0.3.0 // indirect
183+
github.com/ykadowak/zerologlint v0.1.5 // indirect
184+
gitlab.com/bosi/decorder v0.4.2 // indirect
185+
go-simpler.org/musttag v0.13.0 // indirect
186+
go-simpler.org/sloglint v0.11.0 // indirect
187+
go.augendre.info/fatcontext v0.8.0 // indirect
188+
go.uber.org/atomic v1.7.0 // indirect
189+
go.uber.org/automaxprocs v1.6.0 // indirect
190+
go.uber.org/multierr v1.6.0 // indirect
191+
go.uber.org/zap v1.24.0 // indirect
192+
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
193+
golang.org/x/mod v0.24.0 // indirect
194+
golang.org/x/sync v0.13.0 // indirect
195+
golang.org/x/sys v0.32.0 // indirect
196+
golang.org/x/text v0.24.0 // indirect
197+
golang.org/x/tools v0.32.0 // indirect
198+
google.golang.org/protobuf v1.36.6 // indirect
199+
gopkg.in/ini.v1 v1.67.0 // indirect
200+
gopkg.in/yaml.v2 v2.4.0 // indirect
10201
gopkg.in/yaml.v3 v3.0.1 // indirect
202+
honnef.co/go/tools v0.6.1 // indirect
203+
mvdan.cc/gofumpt v0.8.0 // indirect
204+
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
11205
)
206+
207+
tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint

0 commit comments

Comments
 (0)