Skip to content

Commit d9fa277

Browse files
mmetcmmetc
authored
lint: fix nilaway warnings (part 8) (#3866)
1 parent 1533837 commit d9fa277

File tree

5 files changed

+88
-49
lines changed

5 files changed

+88
-49
lines changed

‎pkg/apiserver/alerts_test.go‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ func LoginToTestAPI(t *testing.T, ctx context.Context, router *gin.Engine, confi
8888
ValidateMachine(t, ctx, "test", config.API.Server.DbConfig)
8989

9090
w := httptest.NewRecorder()
91-
req, _ := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
91+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
92+
require.NoError(t, err)
9293
req.Header.Add("User-Agent", UserAgent)
9394
router.ServeHTTP(w, req)
9495

9596
loginResp := models.WatcherAuthResponse{}
96-
err := json.NewDecoder(w.Body).Decode(&loginResp)
97+
err = json.NewDecoder(w.Body).Decode(&loginResp)
9798
require.NoError(t, err)
9899

99100
return loginResp
@@ -432,15 +433,17 @@ func TestCreateAlertErrors(t *testing.T) {
432433

433434
// test invalid bearer
434435
w := httptest.NewRecorder()
435-
req, _ := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/alerts", alertContent)
436+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/alerts", alertContent)
437+
require.NoError(t, err)
436438
req.Header.Add("User-Agent", UserAgent)
437439
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", "ratata"))
438440
lapi.router.ServeHTTP(w, req)
439441
assert.Equal(t, http.StatusUnauthorized, w.Code)
440442

441443
// test invalid bearer
442444
w = httptest.NewRecorder()
443-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/alerts", alertContent)
445+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/alerts", alertContent)
446+
require.NoError(t, err)
444447
req.Header.Add("User-Agent", UserAgent)
445448
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", lapi.loginResp.Token+"s"))
446449
lapi.router.ServeHTTP(w, req)
@@ -454,7 +457,8 @@ func TestDeleteAlert(t *testing.T) {
454457

455458
// Fail Delete Alert
456459
w := httptest.NewRecorder()
457-
req, _ := http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts", strings.NewReader(""))
460+
req, err := http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts", strings.NewReader(""))
461+
require.NoError(t, err)
458462
AddAuthHeaders(req, lapi.loginResp)
459463
req.RemoteAddr = "127.0.0.2:4242"
460464
lapi.router.ServeHTTP(w, req)
@@ -463,7 +467,8 @@ func TestDeleteAlert(t *testing.T) {
463467

464468
// Delete Alert
465469
w = httptest.NewRecorder()
466-
req, _ = http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts", strings.NewReader(""))
470+
req, err = http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts", strings.NewReader(""))
471+
require.NoError(t, err)
467472
AddAuthHeaders(req, lapi.loginResp)
468473
req.RemoteAddr = "127.0.0.1:4242"
469474
lapi.router.ServeHTTP(w, req)
@@ -478,7 +483,8 @@ func TestDeleteAlertByID(t *testing.T) {
478483

479484
// Fail Delete Alert
480485
w := httptest.NewRecorder()
481-
req, _ := http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts/1", strings.NewReader(""))
486+
req, err := http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts/1", strings.NewReader(""))
487+
require.NoError(t, err)
482488
AddAuthHeaders(req, lapi.loginResp)
483489
req.RemoteAddr = "127.0.0.2:4242"
484490
lapi.router.ServeHTTP(w, req)
@@ -487,7 +493,8 @@ func TestDeleteAlertByID(t *testing.T) {
487493

488494
// Delete Alert
489495
w = httptest.NewRecorder()
490-
req, _ = http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts/1", strings.NewReader(""))
496+
req, err = http.NewRequestWithContext(ctx, http.MethodDelete, "/v1/alerts/1", strings.NewReader(""))
497+
require.NoError(t, err)
491498
AddAuthHeaders(req, lapi.loginResp)
492499
req.RemoteAddr = "127.0.0.1:4242"
493500
lapi.router.ServeHTTP(w, req)

‎pkg/apiserver/api_key_test.go‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestAPIKey(t *testing.T) {
1314
ctx := t.Context()
1415
router, config := NewAPITest(t, ctx)
1516

16-
APIKey, _ := CreateTestBouncer(t, ctx, config.API.Server.DbConfig)
17+
apiKey, _ := CreateTestBouncer(t, ctx, config.API.Server.DbConfig)
1718

1819
// Login with empty token
1920
w := httptest.NewRecorder()
20-
req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
21+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
22+
require.NoError(t, err)
2123
req.Header.Add("User-Agent", UserAgent)
2224
req.RemoteAddr = "127.0.0.1:1234"
2325
router.ServeHTTP(w, req)
@@ -27,7 +29,8 @@ func TestAPIKey(t *testing.T) {
2729

2830
// Login with invalid token
2931
w = httptest.NewRecorder()
30-
req, _ = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
32+
req, err = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
33+
require.NoError(t, err)
3134
req.Header.Add("User-Agent", UserAgent)
3235
req.Header.Add("X-Api-Key", "a1b2c3d4e5f6")
3336
req.RemoteAddr = "127.0.0.1:1234"
@@ -38,9 +41,10 @@ func TestAPIKey(t *testing.T) {
3841

3942
// Login with valid token
4043
w = httptest.NewRecorder()
41-
req, _ = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
44+
req, err = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
45+
require.NoError(t, err)
4246
req.Header.Add("User-Agent", UserAgent)
43-
req.Header.Add("X-Api-Key", APIKey)
47+
req.Header.Add("X-Api-Key", apiKey)
4448
req.RemoteAddr = "127.0.0.1:1234"
4549
router.ServeHTTP(w, req)
4650

@@ -49,9 +53,10 @@ func TestAPIKey(t *testing.T) {
4953

5054
// Login with valid token from another IP
5155
w = httptest.NewRecorder()
52-
req, _ = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
56+
req, err = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
57+
require.NoError(t, err)
5358
req.Header.Add("User-Agent", UserAgent)
54-
req.Header.Add("X-Api-Key", APIKey)
59+
req.Header.Add("X-Api-Key", apiKey)
5560
req.RemoteAddr = "4.3.2.1:1234"
5661
router.ServeHTTP(w, req)
5762

@@ -60,9 +65,10 @@ func TestAPIKey(t *testing.T) {
6065

6166
// Make the requests multiple times to make sure we only create one
6267
w = httptest.NewRecorder()
63-
req, _ = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
68+
req, err = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
69+
require.NoError(t, err)
6470
req.Header.Add("User-Agent", UserAgent)
65-
req.Header.Add("X-Api-Key", APIKey)
71+
req.Header.Add("X-Api-Key", apiKey)
6672
req.RemoteAddr = "4.3.2.1:1234"
6773
router.ServeHTTP(w, req)
6874

@@ -71,9 +77,10 @@ func TestAPIKey(t *testing.T) {
7177

7278
// Use the original bouncer again
7379
w = httptest.NewRecorder()
74-
req, _ = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
80+
req, err = http.NewRequestWithContext(ctx, http.MethodGet, "/v1/decisions", strings.NewReader(""))
81+
require.NoError(t, err)
7582
req.Header.Add("User-Agent", UserAgent)
76-
req.Header.Add("X-Api-Key", APIKey)
83+
req.Header.Add("X-Api-Key", apiKey)
7784
req.RemoteAddr = "127.0.0.1:1234"
7885
router.ServeHTTP(w, req)
7986

‎pkg/apiserver/apiserver_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var (
4848

4949
func LoadTestConfig(t *testing.T) csconfig.Config {
5050
config := csconfig.Config{}
51-
maxAge := cstime.DurationWithDays(1*time.Hour)
51+
maxAge := cstime.DurationWithDays(1 * time.Hour)
5252
flushConfig := csconfig.FlushDBCfg{
5353
MaxAge: maxAge,
5454
}
@@ -98,7 +98,7 @@ func LoadTestConfig(t *testing.T) csconfig.Config {
9898

9999
func LoadTestConfigForwardedFor(t *testing.T) csconfig.Config {
100100
config := csconfig.Config{}
101-
maxAge := cstime.DurationWithDays(1*time.Hour)
101+
maxAge := cstime.DurationWithDays(1 * time.Hour)
102102
flushConfig := csconfig.FlushDBCfg{
103103
MaxAge: maxAge,
104104
}
@@ -145,7 +145,7 @@ func NewAPIServer(t *testing.T, ctx context.Context) (*APIServer, csconfig.Confi
145145
apiServer, err := NewServer(ctx, config.API.Server)
146146
require.NoError(t, err)
147147

148-
log.Printf("Creating new API server")
148+
log.Info("Creating new API server")
149149
gin.SetMode(gin.TestMode)
150150

151151
return apiServer, config
@@ -175,7 +175,7 @@ func NewAPITestForwardedFor(t *testing.T) (*gin.Engine, csconfig.Config) {
175175
err = apiServer.InitController()
176176
require.NoError(t, err)
177177

178-
log.Printf("Creating new API server")
178+
log.Info("Creating new API server")
179179
gin.SetMode(gin.TestMode)
180180

181181
router, err := apiServer.Router()
@@ -292,7 +292,8 @@ func CreateTestMachine(t *testing.T, ctx context.Context, router *gin.Engine, to
292292
body := string(b)
293293

294294
w := httptest.NewRecorder()
295-
req, _ := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers", strings.NewReader(body))
295+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers", strings.NewReader(body))
296+
require.NoError(t, err)
296297
req.Header.Set("User-Agent", UserAgent)
297298
router.ServeHTTP(w, req)
298299

@@ -338,7 +339,8 @@ func TestUnknownPath(t *testing.T) {
338339
router, _ := NewAPITest(t, ctx)
339340

340341
w := httptest.NewRecorder()
341-
req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/test", http.NoBody)
342+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/test", http.NoBody)
343+
require.NoError(t, err)
342344
req.Header.Set("User-Agent", UserAgent)
343345
router.ServeHTTP(w, req)
344346

@@ -364,7 +366,7 @@ func TestLoggingDebugToFileConfig(t *testing.T) {
364366
ctx := t.Context()
365367

366368
/*declare settings*/
367-
maxAge := cstime.DurationWithDays(1*time.Hour)
369+
maxAge := cstime.DurationWithDays(1 * time.Hour)
368370
flushConfig := csconfig.FlushDBCfg{
369371
MaxAge: maxAge,
370372
}
@@ -397,7 +399,8 @@ func TestLoggingDebugToFileConfig(t *testing.T) {
397399
require.NotNil(t, api)
398400

399401
w := httptest.NewRecorder()
400-
req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/test42", http.NoBody)
402+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/test42", http.NoBody)
403+
require.NoError(t, err)
401404
req.Header.Set("User-Agent", UserAgent)
402405
api.router.ServeHTTP(w, req)
403406
assert.Equal(t, http.StatusNotFound, w.Code)
@@ -417,7 +420,7 @@ func TestLoggingErrorToFileConfig(t *testing.T) {
417420
ctx := t.Context()
418421

419422
/*declare settings*/
420-
maxAge := cstime.DurationWithDays(1*time.Hour)
423+
maxAge := cstime.DurationWithDays(1 * time.Hour)
421424
flushConfig := csconfig.FlushDBCfg{
422425
MaxAge: maxAge,
423426
}
@@ -449,7 +452,8 @@ func TestLoggingErrorToFileConfig(t *testing.T) {
449452
require.NotNil(t, api)
450453

451454
w := httptest.NewRecorder()
452-
req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/test42", http.NoBody)
455+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/test42", http.NoBody)
456+
require.NoError(t, err)
453457
req.Header.Set("User-Agent", UserAgent)
454458
api.router.ServeHTTP(w, req)
455459
assert.Equal(t, http.StatusNotFound, w.Code)

‎pkg/apiserver/jwt_test.go‎

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

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestLogin(t *testing.T) {
@@ -17,7 +18,8 @@ func TestLogin(t *testing.T) {
1718

1819
// Login with machine not validated yet
1920
w := httptest.NewRecorder()
20-
req, _ := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
21+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
22+
require.NoError(t, err)
2123
req.Header.Add("User-Agent", UserAgent)
2224
router.ServeHTTP(w, req)
2325

@@ -26,7 +28,8 @@ func TestLogin(t *testing.T) {
2628

2729
// Login with machine not exist
2830
w = httptest.NewRecorder()
29-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test1", "password": "test1"}`))
31+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test1", "password": "test1"}`))
32+
require.NoError(t, err)
3033
req.Header.Add("User-Agent", UserAgent)
3134
router.ServeHTTP(w, req)
3235

@@ -35,7 +38,8 @@ func TestLogin(t *testing.T) {
3538

3639
// Login with invalid body
3740
w = httptest.NewRecorder()
38-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader("test"))
41+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader("test"))
42+
require.NoError(t, err)
3943
req.Header.Add("User-Agent", UserAgent)
4044
router.ServeHTTP(w, req)
4145

@@ -44,7 +48,8 @@ func TestLogin(t *testing.T) {
4448

4549
// Login with invalid format
4650
w = httptest.NewRecorder()
47-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test1"}`))
51+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test1"}`))
52+
require.NoError(t, err)
4853
req.Header.Add("User-Agent", UserAgent)
4954
router.ServeHTTP(w, req)
5055

@@ -56,7 +61,8 @@ func TestLogin(t *testing.T) {
5661

5762
// Login with invalid password
5863
w = httptest.NewRecorder()
59-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test", "password": "test1"}`))
64+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test", "password": "test1"}`))
65+
require.NoError(t, err)
6066
req.Header.Add("User-Agent", UserAgent)
6167
router.ServeHTTP(w, req)
6268

@@ -65,7 +71,8 @@ func TestLogin(t *testing.T) {
6571

6672
// Login with valid machine
6773
w = httptest.NewRecorder()
68-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
74+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(body))
75+
require.NoError(t, err)
6976
req.Header.Add("User-Agent", UserAgent)
7077
router.ServeHTTP(w, req)
7178

@@ -75,7 +82,8 @@ func TestLogin(t *testing.T) {
7582

7683
// Login with valid machine + scenarios
7784
w = httptest.NewRecorder()
78-
req, _ = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test", "password": "test", "scenarios": ["crowdsecurity/test", "crowdsecurity/test2"]}`))
85+
req, err = http.NewRequestWithContext(ctx, http.MethodPost, "/v1/watchers/login", strings.NewReader(`{"machine_id": "test", "password": "test", "scenarios": ["crowdsecurity/test", "crowdsecurity/test2"]}`))
86+
require.NoError(t, err)
7987
req.Header.Add("User-Agent", UserAgent)
8088
router.ServeHTTP(w, req)
8189

0 commit comments

Comments
 (0)