Skip to content

Commit 80c0383

Browse files
bexsoftbexsoft
authored
Fixed lint issues with files (#3234)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent f394cb6 commit 80c0383

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+438
-449
lines changed

‎api/admin_arns_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestArnsList(t *testing.T) {
3939
assert := asrt.New(t)
4040
adminClient := AdminClientMock{}
4141
// Test-1 : getArns() returns proper arn list
42-
MinioServerInfoMock = func(ctx context.Context) (madmin.InfoMessage, error) {
42+
MinioServerInfoMock = func(_ context.Context) (madmin.InfoMessage, error) {
4343
return madmin.InfoMessage{
4444
SQSARN: []string{"uno"},
4545
}, nil
@@ -54,7 +54,7 @@ func TestArnsList(t *testing.T) {
5454
assert.Nil(err, "Error should have been nil")
5555

5656
// Test-2 : getArns(ctx) fails for whatever reason
57-
MinioServerInfoMock = func(ctx context.Context) (madmin.InfoMessage, error) {
57+
MinioServerInfoMock = func(_ context.Context) (madmin.InfoMessage, error) {
5858
return madmin.InfoMessage{}, errors.New("some reason")
5959
}
6060

‎api/admin_config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ func resetConfigResponse(session *models.Principal, params cfgApi.ResetConfigPar
269269
adminClient := AdminClient{Client: mAdmin}
270270

271271
err = resetConfig(ctx, adminClient, &params.Name)
272-
273272
if err != nil {
274273
return nil, ErrorWithContext(ctx, err)
275274
}

‎api/admin_config_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestListConfig(t *testing.T) {
6363
}
6464
expectedKeysDesc := mockConfigList.KeysHelp
6565
// mock function response from listConfig()
66-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
66+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
6767
return mockConfigList, nil
6868
}
6969
configList, err := listConfig(adminClient)
@@ -80,7 +80,7 @@ func TestListConfig(t *testing.T) {
8080

8181
// Test-2 : listConfig() Return error and see that the error is handled correctly and returned
8282
// mock function response from listConfig()
83-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
83+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
8484
return madmin.Help{}, errors.New("error")
8585
}
8686
_, err = listConfig(adminClient)
@@ -94,7 +94,7 @@ func TestSetConfig(t *testing.T) {
9494
adminClient := AdminClientMock{}
9595
function := "setConfig()"
9696
// mock function response from setConfig()
97-
minioSetConfigKVMock = func(kv string) (restart bool, err error) {
97+
minioSetConfigKVMock = func(_ string) (restart bool, err error) {
9898
return false, nil
9999
}
100100
configName := "notify_postgres"
@@ -119,7 +119,7 @@ func TestSetConfig(t *testing.T) {
119119
assert.Equal(restart, false)
120120

121121
// Test-2 : setConfig() returns error, handle properly
122-
minioSetConfigKVMock = func(kv string) (restart bool, err error) {
122+
minioSetConfigKVMock = func(_ string) (restart bool, err error) {
123123
return false, errors.New("error")
124124
}
125125
restart, err = setConfig(ctx, adminClient, &configName, kvs)
@@ -129,7 +129,7 @@ func TestSetConfig(t *testing.T) {
129129
assert.Equal(restart, false)
130130

131131
// Test-4 : setConfig() set config, need restart
132-
minioSetConfigKVMock = func(kv string) (restart bool, err error) {
132+
minioSetConfigKVMock = func(_ string) (restart bool, err error) {
133133
return true, nil
134134
}
135135
restart, err = setConfig(ctx, adminClient, &configName, kvs)
@@ -144,7 +144,7 @@ func TestDelConfig(t *testing.T) {
144144
adminClient := AdminClientMock{}
145145
function := "resetConfig()"
146146
// mock function response from setConfig()
147-
minioDelConfigKVMock = func(name string) (err error) {
147+
minioDelConfigKVMock = func(_ string) (err error) {
148148
return nil
149149
}
150150
configName := "region"
@@ -158,7 +158,7 @@ func TestDelConfig(t *testing.T) {
158158
}
159159

160160
// Test-2 : resetConfig() returns error, handle properly
161-
minioDelConfigKVMock = func(name string) (err error) {
161+
minioDelConfigKVMock = func(_ string) (err error) {
162162
return errors.New("error")
163163
}
164164

@@ -220,7 +220,7 @@ func Test_buildConfig(t *testing.T) {
220220
},
221221
}
222222
for _, tt := range tests {
223-
t.Run(tt.name, func(t *testing.T) {
223+
t.Run(tt.name, func(_ *testing.T) {
224224
if got := buildConfig(tt.args.configName, tt.args.kvs); !reflect.DeepEqual(got, tt.want) {
225225
t.Errorf("buildConfig() = %s, want %s", *got, *tt.want)
226226
}
@@ -260,7 +260,7 @@ func Test_setConfigWithARN(t *testing.T) {
260260
},
261261
arn: "1",
262262
},
263-
mockSetConfig: func(kv string) (restart bool, err error) {
263+
mockSetConfig: func(_ string) (restart bool, err error) {
264264
return false, nil
265265
},
266266
wantErr: false,
@@ -280,7 +280,7 @@ func Test_setConfigWithARN(t *testing.T) {
280280
},
281281
arn: "1",
282282
},
283-
mockSetConfig: func(kv string) (restart bool, err error) {
283+
mockSetConfig: func(_ string) (restart bool, err error) {
284284
return true, nil
285285
},
286286
wantErr: false,
@@ -300,7 +300,7 @@ func Test_setConfigWithARN(t *testing.T) {
300300
},
301301
arn: "",
302302
},
303-
mockSetConfig: func(kv string) (restart bool, err error) {
303+
mockSetConfig: func(_ string) (restart bool, err error) {
304304
return false, nil
305305
},
306306
wantErr: false,
@@ -320,15 +320,15 @@ func Test_setConfigWithARN(t *testing.T) {
320320
},
321321
arn: "",
322322
},
323-
mockSetConfig: func(kv string) (restart bool, err error) {
323+
mockSetConfig: func(_ string) (restart bool, err error) {
324324
return false, errors.New("error")
325325
},
326326
wantErr: true,
327327
expected: false,
328328
},
329329
}
330330
for _, tt := range tests {
331-
t.Run(tt.name, func(t *testing.T) {
331+
t.Run(tt.name, func(_ *testing.T) {
332332
// mock function response from setConfig()
333333
minioSetConfigKVMock = tt.mockSetConfig
334334
restart, err := setConfigWithARNAccountID(tt.args.ctx, tt.args.client, tt.args.configName, tt.args.kvs, tt.args.arn)
@@ -361,7 +361,7 @@ func Test_getConfig(t *testing.T) {
361361
},
362362
mock: func() {
363363
// mock function response from getConfig()
364-
minioGetConfigKVMock = func(key string) ([]byte, error) {
364+
minioGetConfigKVMock = func(_ string) ([]byte, error) {
365365
return []byte(`notify_postgres:_ connection_string="host=localhost dbname=minio_events user=postgres password=password port=5432 sslmode=disable" table=bucketevents`), nil
366366
}
367367

@@ -407,7 +407,7 @@ func Test_getConfig(t *testing.T) {
407407
KeysHelp: configListMock,
408408
}
409409
// mock function response from listConfig()
410-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
410+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
411411
return mockConfigList, nil
412412
}
413413
},
@@ -435,7 +435,7 @@ func Test_getConfig(t *testing.T) {
435435
},
436436
mock: func() {
437437
// mock function response from getConfig()
438-
minioGetConfigKVMock = func(key string) ([]byte, error) {
438+
minioGetConfigKVMock = func(_ string) ([]byte, error) {
439439
return []byte(`notify_postgres:_`), nil
440440
}
441441

@@ -481,7 +481,7 @@ func Test_getConfig(t *testing.T) {
481481
KeysHelp: configListMock,
482482
}
483483
// mock function response from listConfig()
484-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
484+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
485485
return mockConfigList, nil
486486
}
487487
},
@@ -496,7 +496,7 @@ func Test_getConfig(t *testing.T) {
496496
},
497497
mock: func() {
498498
// mock function response from getConfig()
499-
minioGetConfigKVMock = func(key string) ([]byte, error) {
499+
minioGetConfigKVMock = func(_ string) ([]byte, error) {
500500
x := make(map[string]string)
501501
x["x"] = "x"
502502
j, _ := json.Marshal(x)
@@ -545,7 +545,7 @@ func Test_getConfig(t *testing.T) {
545545
KeysHelp: configListMock,
546546
}
547547
// mock function response from listConfig()
548-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
548+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
549549
return mockConfigList, nil
550550
}
551551
},
@@ -560,13 +560,13 @@ func Test_getConfig(t *testing.T) {
560560
},
561561
mock: func() {
562562
// mock function response from getConfig()
563-
minioGetConfigKVMock = func(key string) ([]byte, error) {
563+
minioGetConfigKVMock = func(_ string) ([]byte, error) {
564564
return nil, errors.New("invalid config")
565565
}
566566

567567
mockConfigList := madmin.Help{}
568568
// mock function response from listConfig()
569-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
569+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
570570
return mockConfigList, nil
571571
}
572572
},
@@ -581,11 +581,11 @@ func Test_getConfig(t *testing.T) {
581581
},
582582
mock: func() {
583583
// mock function response from getConfig()
584-
minioGetConfigKVMock = func(key string) ([]byte, error) {
584+
minioGetConfigKVMock = func(_ string) ([]byte, error) {
585585
return nil, errors.New("invalid config")
586586
}
587587
// mock function response from listConfig()
588-
minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {
588+
minioHelpConfigKVMock = func(_, _ string, _ bool) (madmin.Help, error) {
589589
return madmin.Help{}, errors.New("no help")
590590
}
591591
},
@@ -595,7 +595,7 @@ func Test_getConfig(t *testing.T) {
595595
}
596596
for _, tt := range tests {
597597
tt.mock()
598-
t.Run(tt.name, func(t *testing.T) {
598+
t.Run(tt.name, func(_ *testing.T) {
599599
got, err := getConfig(context.Background(), tt.args.client, tt.args.name)
600600
if (err != nil) != tt.wantErr {
601601
t.Errorf("getConfig() error = %v, wantErr %v", err, tt.wantErr)

‎api/admin_console_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestAdminConsoleLog(t *testing.T) {
4040

4141
// Test-1: Serve Console with no errors until Console finishes sending
4242
// define mock function behavior for minio server Console
43-
minioGetLogsMock = func(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo {
43+
minioGetLogsMock = func(_ context.Context, _ string, _ int, _ string) <-chan madmin.LogInfo {
4444
ch := make(chan madmin.LogInfo)
4545
// Only success, start a routine to start reading line by line.
4646
go func(ch chan<- madmin.LogInfo) {
@@ -58,7 +58,7 @@ func TestAdminConsoleLog(t *testing.T) {
5858
}
5959
writesCount := 1
6060
// mock connection WriteMessage() no error
61-
connWriteMessageMock = func(messageType int, data []byte) error {
61+
connWriteMessageMock = func(_ int, data []byte) error {
6262
// emulate that receiver gets the message written
6363
var t madmin.LogInfo
6464
_ = json.Unmarshal(data, &t)
@@ -82,7 +82,7 @@ func TestAdminConsoleLog(t *testing.T) {
8282
}
8383

8484
// Test-2: if error happens while writing, return error
85-
connWriteMessageMock = func(messageType int, data []byte) error {
85+
connWriteMessageMock = func(_ int, _ []byte) error {
8686
return fmt.Errorf("error on write")
8787
}
8888
if err := startConsoleLog(ctx, mockWSConn, adminClient, LogRequest{node: "", logType: "all"}); assert.Error(err) {
@@ -91,7 +91,7 @@ func TestAdminConsoleLog(t *testing.T) {
9191

9292
// Test-3: error happens on GetLogs Minio, Console should stop
9393
// and error shall be returned.
94-
minioGetLogsMock = func(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo {
94+
minioGetLogsMock = func(_ context.Context, _ string, _ int, _ string) <-chan madmin.LogInfo {
9595
ch := make(chan madmin.LogInfo)
9696
// Only success, start a routine to start reading line by line.
9797
go func(ch chan<- madmin.LogInfo) {
@@ -108,7 +108,7 @@ func TestAdminConsoleLog(t *testing.T) {
108108
}(ch)
109109
return ch
110110
}
111-
connWriteMessageMock = func(messageType int, data []byte) error {
111+
connWriteMessageMock = func(_ int, _ []byte) error {
112112
return nil
113113
}
114114
if err := startConsoleLog(ctx, mockWSConn, adminClient, LogRequest{node: "", logType: "all"}); assert.Error(err) {

‎api/admin_groups_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestGroupInfo(t *testing.T) {
130130
Status: "enabled",
131131
}
132132
// mock function response from updateGroupMembers()
133-
minioGetGroupDescriptionMock = func(group string) (*madmin.GroupDesc, error) {
133+
minioGetGroupDescriptionMock = func(_ string) (*madmin.GroupDesc, error) {
134134
return mockResponse, nil
135135
}
136136
function := "groupInfo()"
@@ -144,7 +144,7 @@ func TestGroupInfo(t *testing.T) {
144144
assert.Equal("enabled", info.Status)
145145

146146
// Test-2 : groupInfo() Return error and see that the error is handled correctly and returned
147-
minioGetGroupDescriptionMock = func(group string) (*madmin.GroupDesc, error) {
147+
minioGetGroupDescriptionMock = func(_ string) (*madmin.GroupDesc, error) {
148148
return nil, errors.New("error")
149149
}
150150
_, err = groupInfo(ctx, adminClient, groupName)
@@ -226,7 +226,7 @@ func TestUpdateGroup(t *testing.T) {
226226
// the function twice but the second time returned an error
227227
is2ndRunGroupInfo := false
228228
// mock function response from updateGroupMembers()
229-
minioGetGroupDescriptionMock = func(group string) (*madmin.GroupDesc, error) {
229+
minioGetGroupDescriptionMock = func(_ string) (*madmin.GroupDesc, error) {
230230
if is2ndRunGroupInfo {
231231
return mockResponseAfterUpdate, nil
232232
}
@@ -236,7 +236,7 @@ func TestUpdateGroup(t *testing.T) {
236236
minioUpdateGroupMembersMock = func(madmin.GroupAddRemove) error {
237237
return nil
238238
}
239-
minioSetGroupStatusMock = func(group string, status madmin.GroupStatus) error {
239+
minioSetGroupStatusMock = func(_ string, _ madmin.GroupStatus) error {
240240
return nil
241241
}
242242
groupUpdated, err := groupUpdate(ctx, adminClient, groupName, expectedGroupUpdate)
@@ -258,31 +258,31 @@ func TestSetGroupStatus(t *testing.T) {
258258
defer cancel()
259259
// Test-1: setGroupStatus() update valid disabled status
260260
expectedStatus := "disabled"
261-
minioSetGroupStatusMock = func(group string, status madmin.GroupStatus) error {
261+
minioSetGroupStatusMock = func(_ string, _ madmin.GroupStatus) error {
262262
return nil
263263
}
264264
if err := setGroupStatus(ctx, adminClient, groupName, expectedStatus); err != nil {
265265
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
266266
}
267267
// Test-2: setGroupStatus() update valid enabled status
268268
expectedStatus = "enabled"
269-
minioSetGroupStatusMock = func(group string, status madmin.GroupStatus) error {
269+
minioSetGroupStatusMock = func(_ string, _ madmin.GroupStatus) error {
270270
return nil
271271
}
272272
if err := setGroupStatus(ctx, adminClient, groupName, expectedStatus); err != nil {
273273
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
274274
}
275275
// Test-3: setGroupStatus() update invalid status, should send error
276276
expectedStatus = "invalid"
277-
minioSetGroupStatusMock = func(group string, status madmin.GroupStatus) error {
277+
minioSetGroupStatusMock = func(_ string, _ madmin.GroupStatus) error {
278278
return nil
279279
}
280280
if err := setGroupStatus(ctx, adminClient, groupName, expectedStatus); assert.Error(err) {
281281
assert.Equal("status not valid", err.Error())
282282
}
283283
// Test-4: setGroupStatus() handler error correctly
284284
expectedStatus = "enabled"
285-
minioSetGroupStatusMock = func(group string, status madmin.GroupStatus) error {
285+
minioSetGroupStatusMock = func(_ string, _ madmin.GroupStatus) error {
286286
return errors.New("error")
287287
}
288288
if err := setGroupStatus(ctx, adminClient, groupName, expectedStatus); assert.Error(err) {

0 commit comments

Comments
 (0)