Skip to content

Commit 2c7815b

Browse files
nakatanakatananakatanakatana
authored
Merge pull request #54 from nakatanakatana/renovate/github.com-golangci-golangci-lint-v2-2.x
chore(deps): update module github.com/golangci/golangci-lint/v2 to v2.11.1
2 parents 2742ed2 + 9ae15e8 commit 2c7815b

10 files changed

Lines changed: 69 additions & 66 deletions

File tree

‎cache.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ type ResponseRecorder struct {
138138
func (c *CacheMiddleware) IsCacheFresh(
139139
ctx context.Context, upstreamURL string, cacheKey string, cacheTime time.Time,
140140
) bool {
141-
req, err := http.NewRequestWithContext(ctx, httpMethodHead, upstreamURL, nil)
141+
req, err := http.NewRequestWithContext(ctx, httpMethodHead, upstreamURL, nil) // #nosec G704
142142
if err != nil {
143143
return true
144144
}
@@ -152,7 +152,7 @@ func (c *CacheMiddleware) IsCacheFresh(
152152
Timeout: requestTimeout,
153153
}
154154

155-
resp, err := client.Do(req)
155+
resp, err := client.Do(req) // #nosec G704
156156
if err != nil {
157157
return true
158158
}
@@ -224,7 +224,7 @@ func (r *ResponseRecorder) writeToCache() error {
224224
}
225225

226226
func (r *ResponseRecorder) captureAndStoreETag(ctx context.Context, upstreamURL string) {
227-
req, err := http.NewRequestWithContext(ctx, httpMethodHead, upstreamURL, nil)
227+
req, err := http.NewRequestWithContext(ctx, httpMethodHead, upstreamURL, nil) // #nosec G704
228228
if err != nil {
229229
return
230230
}
@@ -233,7 +233,7 @@ func (r *ResponseRecorder) captureAndStoreETag(ctx context.Context, upstreamURL
233233
Timeout: requestTimeout,
234234
}
235235

236-
resp, err := client.Do(req)
236+
resp, err := client.Do(req) // #nosec G704
237237
if err != nil {
238238
return
239239
}

‎cache_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestCacheMiddleware(t *testing.T) {
3535
params.Set("url", "https://example.com/feed")
3636
params.Set("title.contains", "test")
3737

38-
req := httptest.NewRequest(http.MethodGet, "/?"+params.Encode(), nil)
38+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/?"+params.Encode(), nil)
3939
w := httptest.NewRecorder()
4040

4141
middleware.ServeHTTP(w, req)
@@ -268,7 +268,7 @@ func TestCacheMiddlewareWithTempDir(t *testing.T) {
268268
params := url.Values{}
269269
params.Set("url", "https://example.com/test")
270270

271-
req := httptest.NewRequest(http.MethodGet, "/?"+params.Encode(), nil)
271+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/?"+params.Encode(), nil)
272272
w := httptest.NewRecorder()
273273

274274
middleware.ServeHTTP(w, req)
@@ -303,7 +303,7 @@ func TestCacheMiddlewareErrorHandling(t *testing.T) {
303303
params := url.Values{}
304304
params.Set("url", "https://example.com/empty")
305305

306-
req := httptest.NewRequest(http.MethodGet, "/?"+params.Encode(), nil)
306+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/?"+params.Encode(), nil)
307307
w := httptest.NewRecorder()
308308

309309
middleware.ServeHTTP(w, req)

‎cmd/ff/handler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func createHandler(filtersMap ff.FilterFuncMap, modifiersMap ff.ModifierFuncMap)
5757

5858
filters, modifiers := parseQueries(r.URL.Query(), filtersMap, modifiersMap)
5959

60-
filteredFeed, err := ff.Apply(originFeed, filters, modifiers)
60+
filteredFeed, err := ff.Apply(r.Context(), originFeed, filters, modifiers)
6161
if err != nil {
6262
w.WriteHeader(http.StatusInternalServerError)
6363
fmt.Fprintln(w, err)
@@ -81,6 +81,6 @@ func createHandler(filtersMap ff.FilterFuncMap, modifiersMap ff.ModifierFuncMap)
8181
return
8282
}
8383

84-
fmt.Fprintln(w, rss)
84+
fmt.Fprintln(w, rss) // #nosec G705
8585
}
8686
}

‎cmd/ff/handler_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"net/http"
56
"net/http/httptest"
67
"strings"
@@ -88,7 +89,7 @@ func TestHandlerInvalidRequest(t *testing.T) {
8889
requestURL = strings.ReplaceAll(requestURL, "%s", mockServer.URL)
8990
}
9091

91-
req := httptest.NewRequest(http.MethodGet, requestURL, nil)
92+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet, requestURL, nil)
9293
rec := httptest.NewRecorder()
9394

9495
handler(rec, req)
@@ -157,7 +158,7 @@ func TestHandlerSuccess(t *testing.T) {
157158

158159
requestURL := strings.ReplaceAll(tc.requestURL, "%s", mockServer.URL)
159160

160-
req := httptest.NewRequest(http.MethodGet, requestURL, nil)
161+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet, requestURL, nil)
161162
rec := httptest.NewRecorder()
162163

163164
handler(rec, req)
@@ -173,7 +174,7 @@ func TestHandlerMethodNotAllowed(t *testing.T) {
173174

174175
handler := createHandler(ff.CreateFiltersMap(nil, nil), ff.CreateModifierMap())
175176

176-
req := httptest.NewRequest(http.MethodPost, "/?url=http://example.com", nil)
177+
req := httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/?url=http://example.com", nil)
177178
rec := httptest.NewRecorder()
178179

179180
handler(rec, req)
@@ -198,7 +199,7 @@ func TestHandlerHeadRequest(t *testing.T) {
198199
defer mockServer.Close()
199200

200201
requestURL := "/?url=" + mockServer.URL
201-
req := httptest.NewRequest(http.MethodHead, requestURL, nil)
202+
req := httptest.NewRequestWithContext(context.Background(), http.MethodHead, requestURL, nil)
202203
rec := httptest.NewRecorder()
203204

204205
handler(rec, req)
@@ -226,7 +227,8 @@ func TestHandlerWithMultipleQueries(t *testing.T) {
226227
defer mockServer.Close()
227228

228229
requestURL := "/?url=%s&title.contains=First&description.not_contains=Remove"
229-
req := httptest.NewRequest(http.MethodGet, strings.ReplaceAll(requestURL, "%s", mockServer.URL), nil)
230+
req := httptest.NewRequestWithContext(context.Background(), http.MethodGet,
231+
strings.ReplaceAll(requestURL, "%s", mockServer.URL), nil)
230232
rec := httptest.NewRecorder()
231233

232234
handler(rec, req)

‎filter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func TestFilterDoAllFilterFuncAndCondition(t *testing.T) {
262262
Items: []*gofeed.Item{testItem},
263263
}
264264

265-
result, err := ff.Apply(testFeed, tt.filters, []ff.ModifierFunc{})
265+
result, err := ff.Apply(context.Background(), testFeed, tt.filters, []ff.ModifierFunc{})
266266
if err != nil {
267267
t.Fail()
268268
}

‎func.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func ParseQueries(queries url.Values,
3737
return filters, modifiers
3838
}
3939

40-
func Apply(f *gofeed.Feed, ff []FilterFunc, mf []ModifierFunc) (*gofeed.Feed, error) {
41-
ctx := context.Background()
40+
func Apply(ctx context.Context, f *gofeed.Feed, ff []FilterFunc, mf []ModifierFunc) (*gofeed.Feed, error) {
4241
items := make([]*gofeed.Item, len(f.Items))
4342
count := 0
4443

‎func_test.go‎

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

33
import (
4+
"context"
45
"net/url"
56
"testing"
67
"time"
@@ -125,7 +126,7 @@ func TestFilterAndModifier(t *testing.T) {
125126
testFeed := &gofeed.Feed{
126127
Items: []*gofeed.Item{testItem},
127128
}
128-
result, err := ff.Apply(testFeed, tt.filters, tt.modifiers)
129+
result, err := ff.Apply(context.Background(), testFeed, tt.filters, tt.modifiers)
129130
assert.NilError(t, err)
130131
assert.Check(t, is.Len(result.Items, tt.expectItemLen))
131132

‎modifier_test.go‎

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

33
import (
4+
"context"
45
"testing"
56

67
"github.com/mmcdole/gofeed"
@@ -69,7 +70,7 @@ func TestCreateModifierWithNonExistentField(t *testing.T) {
6970
modifiers = append(modifiers, f)
7071
}
7172

72-
result, err := ff.Apply(&gofeed.Feed{Items: []*gofeed.Item{testItem}}, nil, modifiers)
73+
result, err := ff.Apply(context.Background(), &gofeed.Feed{Items: []*gofeed.Item{testItem}}, nil, modifiers)
7374
assert.NilError(t, err)
7475
assert.Check(t, is.DeepEqual(testItem, result.Items[0]))
7576
}

‎tools/go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ require (
2121
github.com/BurntSushi/toml v1.6.0 // indirect
2222
github.com/Djarvur/go-err113 v0.1.1 // indirect
2323
github.com/Masterminds/semver/v3 v3.4.0 // indirect
24-
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
24+
github.com/MirrexOne/unqueryvet v1.5.4 // indirect
2525
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
2626
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
2727
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
2828
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
29-
github.com/alexkohler/prealloc v1.0.2 // indirect
29+
github.com/alexkohler/prealloc v1.1.0 // indirect
3030
github.com/alfatraining/structtag v1.0.0 // indirect
3131
github.com/alingse/asasalint v0.0.11 // indirect
3232
github.com/alingse/nilnesserr v0.2.0 // indirect
@@ -76,14 +76,14 @@ require (
7676
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
7777
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
7878
github.com/gobwas/glob v0.2.3 // indirect
79-
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
79+
github.com/godoc-lint/godoc-lint v0.11.2 // indirect
8080
github.com/gofrs/flock v0.13.0 // indirect
8181
github.com/golang/protobuf v1.5.3 // indirect
8282
github.com/golangci/asciicheck v0.5.0 // indirect
8383
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
8484
github.com/golangci/go-printf-func-name v0.1.1 // indirect
8585
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
86-
github.com/golangci/golangci-lint/v2 v2.9.0 // indirect
86+
github.com/golangci/golangci-lint/v2 v2.11.1 // indirect
8787
github.com/golangci/golines v0.15.0 // indirect
8888
github.com/golangci/misspell v0.8.0 // indirect
8989
github.com/golangci/plugin-module-register v0.1.2 // indirect
@@ -107,7 +107,7 @@ require (
107107
github.com/jjti/go-spancheck v0.6.5 // indirect
108108
github.com/julz/importas v0.2.0 // indirect
109109
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
110-
github.com/kisielk/errcheck v1.9.0 // indirect
110+
github.com/kisielk/errcheck v1.10.0 // indirect
111111
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
112112
github.com/kulti/thelper v0.7.1 // indirect
113113
github.com/kunwardeep/paralleltest v1.0.15 // indirect
@@ -131,15 +131,15 @@ require (
131131
github.com/mattn/go-isatty v0.0.20 // indirect
132132
github.com/mattn/go-runewidth v0.0.16 // indirect
133133
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
134-
github.com/mgechev/revive v1.14.0 // indirect
134+
github.com/mgechev/revive v1.15.0 // indirect
135135
github.com/mitchellh/go-homedir v1.1.0 // indirect
136136
github.com/mitchellh/mapstructure v1.5.0 // indirect
137137
github.com/moricho/tparallel v0.3.2 // indirect
138138
github.com/muesli/termenv v0.16.0 // indirect
139139
github.com/nakabonne/nestif v0.3.1 // indirect
140140
github.com/nishanths/exhaustive v0.12.0 // indirect
141141
github.com/nishanths/predeclared v0.2.2 // indirect
142-
github.com/nunnatsa/ginkgolinter v0.22.0 // indirect
142+
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
143143
github.com/pelletier/go-toml v1.9.5 // indirect
144144
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
145145
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -161,10 +161,10 @@ require (
161161
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
162162
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
163163
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
164-
github.com/securego/gosec/v2 v2.22.11 // indirect
164+
github.com/securego/gosec/v2 v2.24.7 // indirect
165165
github.com/sirupsen/logrus v1.9.4 // indirect
166166
github.com/sivchari/containedctx v1.0.3 // indirect
167-
github.com/sonatard/noctx v0.4.0 // indirect
167+
github.com/sonatard/noctx v0.5.0 // indirect
168168
github.com/sourcegraph/go-diff v0.7.0 // indirect
169169
github.com/spf13/afero v1.15.0 // indirect
170170
github.com/spf13/cast v1.5.0 // indirect
@@ -184,7 +184,7 @@ require (
184184
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
185185
github.com/ultraware/funlen v0.2.0 // indirect
186186
github.com/ultraware/whitespace v0.2.0 // indirect
187-
github.com/uudashr/gocognit v1.2.0 // indirect
187+
github.com/uudashr/gocognit v1.2.1 // indirect
188188
github.com/uudashr/iface v1.4.1 // indirect
189189
github.com/xen0n/gosmopolitan v1.3.0 // indirect
190190
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
@@ -199,17 +199,17 @@ require (
199199
go.uber.org/multierr v1.10.0 // indirect
200200
go.uber.org/zap v1.27.0 // indirect
201201
go.yaml.in/yaml/v3 v3.0.4 // indirect
202-
golang.org/x/exp/typeparams v0.0.0-20251125195548-87e1e737ad39 // indirect
202+
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
203203
golang.org/x/mod v0.33.0 // indirect
204204
golang.org/x/sync v0.19.0 // indirect
205205
golang.org/x/sys v0.41.0 // indirect
206-
golang.org/x/text v0.33.0 // indirect
206+
golang.org/x/text v0.34.0 // indirect
207207
golang.org/x/tools v0.42.0 // indirect
208208
google.golang.org/protobuf v1.36.8 // indirect
209209
gopkg.in/ini.v1 v1.67.0 // indirect
210210
gopkg.in/yaml.v2 v2.4.0 // indirect
211211
gopkg.in/yaml.v3 v3.0.1 // indirect
212-
honnef.co/go/tools v0.6.1 // indirect
212+
honnef.co/go/tools v0.7.0 // indirect
213213
mvdan.cc/gofumpt v0.9.2 // indirect
214214
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
215215
)

0 commit comments

Comments
 (0)