Skip to content

Commit c245b1e

Browse files
mmetcmmetc
authored
CI: enable linter "noctx" (#3528)
* CI: enable linter "noctx" * rename NewRequestWithContext() -> PrepareRequest()
1 parent a718475 commit c245b1e

File tree

14 files changed

+77
-45
lines changed

14 files changed

+77
-45
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ linters:
284284
- ireturn # Accept Interfaces, Return Concrete Types
285285
- mnd # An analyzer to detect magic numbers.
286286
- nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value.
287-
- noctx # Finds sending http request without context.Context
288287
- unparam # Reports unused function parameters
289288

290289
#

‎pkg/acquisition/modules/http/http_test.go‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,12 @@ basic_auth:
254254

255255
time.Sleep(1 * time.Second)
256256

257-
res, err := http.Get(fmt.Sprintf("%s/test", testHTTPServerAddr))
257+
ctx := t.Context()
258+
259+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, testHTTPServerAddr + "/test", http.NoBody)
260+
require.NoError(t, err)
261+
262+
res, err := http.DefaultClient.Do(req)
258263
require.NoError(t, err)
259264
assert.Equal(t, http.StatusMethodNotAllowed, res.StatusCode)
260265

@@ -265,6 +270,8 @@ basic_auth:
265270
}
266271

267272
func TestStreamingAcquisitionUnknownPath(t *testing.T) {
273+
ctx := t.Context()
274+
268275
h := &HTTPSource{}
269276
_, _, tomb := SetupAndRunHTTPSource(t, h, []byte(`
270277
source: http
@@ -277,7 +284,10 @@ basic_auth:
277284

278285
time.Sleep(1 * time.Second)
279286

280-
res, err := http.Get(fmt.Sprintf("%s/unknown", testHTTPServerAddr))
287+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, testHTTPServerAddr + "/unknown", http.NoBody)
288+
require.NoError(t, err)
289+
290+
res, err := http.DefaultClient.Do(req)
281291
require.NoError(t, err)
282292
assert.Equal(t, http.StatusNotFound, res.StatusCode)
283293

@@ -303,11 +313,15 @@ basic_auth:
303313

304314
client := &http.Client{}
305315

306-
resp, err := http.Post(fmt.Sprintf("%s/test", testHTTPServerAddr), "application/json", strings.NewReader("test"))
316+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, testHTTPServerAddr + "/test", strings.NewReader("test"))
317+
require.NoError(t, err)
318+
req.Header.Set("Content-Type", "application/json")
319+
320+
resp, err := http.DefaultClient.Do(req)
307321
require.NoError(t, err)
308322
assert.Equal(t, http.StatusUnauthorized, resp.StatusCode)
309323

310-
req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("%s/test", testHTTPServerAddr), strings.NewReader("test"))
324+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, testHTTPServerAddr + "/test", strings.NewReader("test"))
311325
require.NoError(t, err)
312326
req.SetBasicAuth("test", "WrongPassword")
313327

@@ -553,6 +567,8 @@ timeout: 1s`), 0)
553567
}
554568

555569
func TestStreamingAcquisitionTLSHTTPRequest(t *testing.T) {
570+
ctx := t.Context()
571+
556572
h := &HTTPSource{}
557573
_, _, tomb := SetupAndRunHTTPSource(t, h, []byte(`
558574
source: http
@@ -566,7 +582,11 @@ tls:
566582

567583
time.Sleep(1 * time.Second)
568584

569-
resp, err := http.Post(fmt.Sprintf("%s/test", testHTTPServerAddr), "application/json", strings.NewReader("test"))
585+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, testHTTPServerAddr + "/test", strings.NewReader("test"))
586+
require.NoError(t, err)
587+
req.Header.Set("Content-Type", "application/json")
588+
589+
resp, err := http.DefaultClient.Do(req)
570590
require.NoError(t, err)
571591

572592
assert.Equal(t, http.StatusBadRequest, resp.StatusCode)

‎pkg/apiclient/alerts_service.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type AlertsDeleteOpts struct {
4949
func (s *AlertsService) Add(ctx context.Context, alerts models.AddAlertsRequest) (*models.AddAlertsResponse, *Response, error) {
5050
u := fmt.Sprintf("%s/alerts", s.client.URLPrefix)
5151

52-
req, err := s.client.NewRequestWithContext(ctx, http.MethodPost, u, &alerts)
52+
req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &alerts)
5353
if err != nil {
5454
return nil, nil, err
5555
}
@@ -78,7 +78,7 @@ func (s *AlertsService) List(ctx context.Context, opts AlertsListOpts) (*models.
7878
URI = fmt.Sprintf("%s?%s", URI, params.Encode())
7979
}
8080

81-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, URI, nil)
81+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, URI, nil)
8282
if err != nil {
8383
return nil, nil, fmt.Errorf("building request: %w", err)
8484
}
@@ -102,7 +102,7 @@ func (s *AlertsService) Delete(ctx context.Context, opts AlertsDeleteOpts) (*mod
102102

103103
u := fmt.Sprintf("%s/alerts?%s", s.client.URLPrefix, params.Encode())
104104

105-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
105+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
106106
if err != nil {
107107
return nil, nil, err
108108
}
@@ -120,7 +120,7 @@ func (s *AlertsService) Delete(ctx context.Context, opts AlertsDeleteOpts) (*mod
120120
func (s *AlertsService) DeleteOne(ctx context.Context, alertID string) (*models.DeleteAlertsResponse, *Response, error) {
121121
u := fmt.Sprintf("%s/alerts/%s", s.client.URLPrefix, alertID)
122122

123-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
123+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
124124
if err != nil {
125125
return nil, nil, err
126126
}
@@ -138,7 +138,7 @@ func (s *AlertsService) DeleteOne(ctx context.Context, alertID string) (*models.
138138
func (s *AlertsService) GetByID(ctx context.Context, alertID int) (*models.Alert, *Response, error) {
139139
u := fmt.Sprintf("%s/alerts/%d", s.client.URLPrefix, alertID)
140140

141-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
141+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
142142
if err != nil {
143143
return nil, nil, err
144144
}

‎pkg/apiclient/allowlists_service.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (s *AllowlistsService) List(ctx context.Context, opts AllowlistListOpts) (*
2727

2828
u += "?" + params.Encode()
2929

30-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
30+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
3131
if err != nil {
3232
return nil, nil, err
3333
}
@@ -58,7 +58,7 @@ func (s *AllowlistsService) Get(ctx context.Context, name string, opts Allowlist
5858

5959
log.Debugf("GET %s", u)
6060

61-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
61+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
6262
if err != nil {
6363
return nil, nil, err
6464
}
@@ -76,7 +76,7 @@ func (s *AllowlistsService) Get(ctx context.Context, name string, opts Allowlist
7676
func (s *AllowlistsService) CheckIfAllowlisted(ctx context.Context, value string) (bool, *Response, error) {
7777
u := s.client.URLPrefix + "/allowlists/check/" + value
7878

79-
req, err := s.client.NewRequestWithContext(ctx, http.MethodHead, u, nil)
79+
req, err := s.client.PrepareRequest(ctx, http.MethodHead, u, nil)
8080
if err != nil {
8181
return false, nil, err
8282
}
@@ -94,7 +94,7 @@ func (s *AllowlistsService) CheckIfAllowlisted(ctx context.Context, value string
9494
func (s *AllowlistsService) CheckIfAllowlistedWithReason(ctx context.Context, value string) (*models.CheckAllowlistResponse, *Response, error) {
9595
u := s.client.URLPrefix + "/allowlists/check/" + value
9696

97-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
97+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
9898
if err != nil {
9999
return nil, nil, err
100100
}

‎pkg/apiclient/auth_service.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type enrollRequest struct {
2121
func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error) {
2222
u := fmt.Sprintf("%s/watchers", s.client.URLPrefix)
2323

24-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
24+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
2525
if err != nil {
2626
return nil, err
2727
}
@@ -37,7 +37,7 @@ func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error)
3737
func (s *AuthService) RegisterWatcher(ctx context.Context, registration models.WatcherRegistrationRequest) (*Response, error) {
3838
u := fmt.Sprintf("%s/watchers", s.client.URLPrefix)
3939

40-
req, err := s.client.NewRequestWithContext(ctx, http.MethodPost, u, &registration)
40+
req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &registration)
4141
if err != nil {
4242
return nil, err
4343
}
@@ -55,7 +55,7 @@ func (s *AuthService) AuthenticateWatcher(ctx context.Context, auth models.Watch
5555

5656
u := fmt.Sprintf("%s/watchers/login", s.client.URLPrefix)
5757

58-
req, err := s.client.NewRequestWithContext(ctx, http.MethodPost, u, &auth)
58+
req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &auth)
5959
if err != nil {
6060
return authResp, nil, err
6161
}
@@ -71,7 +71,7 @@ func (s *AuthService) AuthenticateWatcher(ctx context.Context, auth models.Watch
7171
func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string, name string, tags []string, overwrite bool) (*Response, error) {
7272
u := fmt.Sprintf("%s/watchers/enroll", s.client.URLPrefix)
7373

74-
req, err := s.client.NewRequestWithContext(ctx, http.MethodPost, u, &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags, Overwrite: overwrite})
74+
req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags, Overwrite: overwrite})
7575
if err != nil {
7676
return nil, err
7777
}

‎pkg/apiclient/client_http.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
log "github.com/sirupsen/logrus"
1616
)
1717

18-
func (c *ApiClient) NewRequestWithContext(ctx context.Context, method, url string, body interface{}) (*http.Request, error) {
18+
func (c *ApiClient) PrepareRequest(ctx context.Context, method, url string, body interface{}) (*http.Request, error) {
1919
if !strings.HasSuffix(c.BaseURL.Path, "/") {
2020
return nil, fmt.Errorf("BaseURL must have a trailing slash, but %q does not", c.BaseURL)
2121
}

‎pkg/apiclient/decisions_service.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (s *DecisionsService) List(ctx context.Context, opts DecisionsListOpts) (*m
8181

8282
u := fmt.Sprintf("%s/decisions?%s", s.client.URLPrefix, params.Encode())
8383

84-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
84+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
8585
if err != nil {
8686
return nil, nil, err
8787
}
@@ -97,7 +97,7 @@ func (s *DecisionsService) List(ctx context.Context, opts DecisionsListOpts) (*m
9797
}
9898

9999
func (s *DecisionsService) FetchV2Decisions(ctx context.Context, url string) (*models.DecisionsStreamResponse, *Response, error) {
100-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, url, nil)
100+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, url, nil)
101101
if err != nil {
102102
return nil, nil, err
103103
}
@@ -138,7 +138,7 @@ func (s *DecisionsService) FetchV3Decisions(ctx context.Context, url string) (*m
138138
scenarioDeleted := "deleted"
139139
durationDeleted := "1h"
140140

141-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, url, nil)
141+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, url, nil)
142142
if err != nil {
143143
return nil, nil, err
144144
}
@@ -271,7 +271,7 @@ func (s *DecisionsService) GetStreamV3(ctx context.Context, opts DecisionsStream
271271
return nil, nil, err
272272
}
273273

274-
req, err := s.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
274+
req, err := s.client.PrepareRequest(ctx, http.MethodGet, u, nil)
275275
if err != nil {
276276
return nil, nil, err
277277
}
@@ -289,7 +289,7 @@ func (s *DecisionsService) GetStreamV3(ctx context.Context, opts DecisionsStream
289289
func (s *DecisionsService) StopStream(ctx context.Context) (*Response, error) {
290290
u := fmt.Sprintf("%s/decisions", s.client.URLPrefix)
291291

292-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
292+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
293293
if err != nil {
294294
return nil, err
295295
}
@@ -310,7 +310,7 @@ func (s *DecisionsService) Delete(ctx context.Context, opts DecisionsDeleteOpts)
310310

311311
u := fmt.Sprintf("%s/decisions?%s", s.client.URLPrefix, params.Encode())
312312

313-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
313+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
314314
if err != nil {
315315
return nil, nil, err
316316
}
@@ -328,7 +328,7 @@ func (s *DecisionsService) Delete(ctx context.Context, opts DecisionsDeleteOpts)
328328
func (s *DecisionsService) DeleteOne(ctx context.Context, decisionID string) (*models.DeleteDecisionResponse, *Response, error) {
329329
u := fmt.Sprintf("%s/decisions/%s", s.client.URLPrefix, decisionID)
330330

331-
req, err := s.client.NewRequestWithContext(ctx, http.MethodDelete, u, nil)
331+
req, err := s.client.PrepareRequest(ctx, http.MethodDelete, u, nil)
332332
if err != nil {
333333
return nil, nil, err
334334
}

‎pkg/apiclient/decisions_sync_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type DecisionDeleteService service
1616
func (d *DecisionDeleteService) Add(ctx context.Context, deletedDecisions *models.DecisionsDeleteRequest) (interface{}, *Response, error) {
1717
u := fmt.Sprintf("%s/decisions/delete", d.client.URLPrefix)
1818

19-
req, err := d.client.NewRequestWithContext(ctx, http.MethodPost, u, &deletedDecisions)
19+
req, err := d.client.PrepareRequest(ctx, http.MethodPost, u, &deletedDecisions)
2020
if err != nil {
2121
return nil, nil, fmt.Errorf("while building request: %w", err)
2222
}

‎pkg/apiclient/heartbeat.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type HeartBeatService service
1717
func (h *HeartBeatService) Ping(ctx context.Context) (bool, *Response, error) {
1818
u := fmt.Sprintf("%s/heartbeat", h.client.URLPrefix)
1919

20-
req, err := h.client.NewRequestWithContext(ctx, http.MethodGet, u, nil)
20+
req, err := h.client.PrepareRequest(ctx, http.MethodGet, u, nil)
2121
if err != nil {
2222
return false, nil, err
2323
}

‎pkg/apiclient/metrics.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type MetricsService service
1313
func (s *MetricsService) Add(ctx context.Context, metrics *models.Metrics) (interface{}, *Response, error) {
1414
u := fmt.Sprintf("%s/metrics/", s.client.URLPrefix)
1515

16-
req, err := s.client.NewRequestWithContext(ctx, http.MethodPost, u, &metrics)
16+
req, err := s.client.PrepareRequest(ctx, http.MethodPost, u, &metrics)
1717
if err != nil {
1818
return nil, nil, err
1919
}

0 commit comments

Comments
 (0)