Skip to content

Commit ceafdb9

Browse files
authored
Fix revive lint issues (#2730)
1 parent a6d8f6b commit ceafdb9

21 files changed

+126
-134
lines changed

cmd/console/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var updateCmd = cli.Command{
9696
Action: updateInplace,
9797
}
9898

99-
func updateInplace(ctx *cli.Context) error {
99+
func updateInplace(_ *cli.Context) error {
100100
transport := getUpdateTransport(30 * time.Second)
101101
rel, err := getLatestRelease(transport)
102102
if err != nil {

integration/user_api_bucket_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,9 +2317,9 @@ func TestBucketVersioning(t *testing.T) {
23172317
assert.NotEqual(200, response.StatusCode, "Versioning test Status Code is incorrect - versioned bucket created on non-distributed system")
23182318
}
23192319

2320-
request, error := http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test2", requestDataBody)
2321-
if error != nil {
2322-
log.Println(error)
2320+
request, err = http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test2", requestDataBody)
2321+
if err != nil {
2322+
log.Println(err)
23232323
return
23242324
}
23252325

pkg/logger/console.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (i infoMsg) json(msg string, args ...interface{}) {
164164
fmt.Println(string(logJSON))
165165
}
166166

167-
func (i infoMsg) quiet(msg string, args ...interface{}) {
167+
func (i infoMsg) quiet(_ string, _ ...interface{}) {
168168
}
169169

170170
func (i infoMsg) pretty(msg string, args ...interface{}) {

pkg/logger/logger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525
)
2626

27-
func testServer(w http.ResponseWriter, r *http.Request) {
27+
func testServer(_ http.ResponseWriter, _ *http.Request) {
2828
}
2929

3030
func TestInitializeLogger(t *testing.T) {

pkg/logger/target/http/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func New(config Config) *Target {
194194
}
195195

196196
// Send log message 'e' to http target.
197-
func (h *Target) Send(entry interface{}, errKind string) error {
197+
func (h *Target) Send(entry interface{}, _ string) error {
198198
if atomic.LoadInt32(&h.status) == 0 {
199199
// Channel was closed or used before init.
200200
return nil

portal-ui/tests/scripts/common.sh

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,31 @@ add_alias() {
2323
}
2424

2525
create_policies() {
26-
mc admin policy add minio bucketassignpolicy-$TIMESTAMP portal-ui/tests/policies/bucketAssignPolicy.json
27-
mc admin policy add minio bucketread-$TIMESTAMP portal-ui/tests/policies/bucketRead.json
28-
mc admin policy add minio bucketwrite-$TIMESTAMP portal-ui/tests/policies/bucketWrite.json
29-
mc admin policy add minio bucketreadwrite-$TIMESTAMP portal-ui/tests/policies/bucketReadWrite.json
30-
mc admin policy add minio bucketcannottag-$TIMESTAMP portal-ui/tests/policies/bucketCannotTag.json
31-
mc admin policy add minio bucketspecific-$TIMESTAMP portal-ui/tests/policies/bucketSpecific.json
32-
mc admin policy add minio dashboard-$TIMESTAMP portal-ui/tests/policies/dashboard.json
33-
mc admin policy add minio diagnostics-$TIMESTAMP portal-ui/tests/policies/diagnostics.json
34-
mc admin policy add minio groups-$TIMESTAMP portal-ui/tests/policies/groups.json
35-
mc admin policy add minio heal-$TIMESTAMP portal-ui/tests/policies/heal.json
36-
mc admin policy add minio iampolicies-$TIMESTAMP portal-ui/tests/policies/iamPolicies.json
37-
mc admin policy add minio logs-$TIMESTAMP portal-ui/tests/policies/logs.json
38-
mc admin policy add minio notificationendpoints-$TIMESTAMP portal-ui/tests/policies/notificationEndpoints.json
39-
mc admin policy add minio settings-$TIMESTAMP portal-ui/tests/policies/settings.json
40-
mc admin policy add minio tiers-$TIMESTAMP portal-ui/tests/policies/tiers.json
41-
mc admin policy add minio trace-$TIMESTAMP portal-ui/tests/policies/trace.json
42-
mc admin policy add minio users-$TIMESTAMP portal-ui/tests/policies/users.json
43-
mc admin policy add minio watch-$TIMESTAMP portal-ui/tests/policies/watch.json
44-
mc admin policy add minio bucketwriteprefixonlypolicy-$TIMESTAMP portal-ui/tests/policies/bucketWritePrefixOnlyPolicy.json
45-
mc admin policy add minio inspect-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-allowed.json
46-
mc admin policy add minio inspect-not-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-not-allowed.json
47-
mc admin policy add minio fix-prefix-policy-ui-crash-$TIMESTAMP portal-ui/tests/policies/fix-prefix-policy-ui-crash.json
48-
mc admin policy add minio delete-object-with-prefix-$TIMESTAMP portal-ui/tests/policies/deleteObjectWithPrefix.json
49-
mc admin policy add minio conditions-policy-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy.json
50-
mc admin policy add minio conditions-policy-2-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy2.json
26+
mc admin policy create minio bucketassignpolicy-$TIMESTAMP portal-ui/tests/policies/bucketAssignPolicy.json
27+
mc admin policy create minio bucketread-$TIMESTAMP portal-ui/tests/policies/bucketRead.json
28+
mc admin policy create minio bucketwrite-$TIMESTAMP portal-ui/tests/policies/bucketWrite.json
29+
mc admin policy create minio bucketreadwrite-$TIMESTAMP portal-ui/tests/policies/bucketReadWrite.json
30+
mc admin policy create minio bucketcannottag-$TIMESTAMP portal-ui/tests/policies/bucketCannotTag.json
31+
mc admin policy create minio bucketspecific-$TIMESTAMP portal-ui/tests/policies/bucketSpecific.json
32+
mc admin policy create minio dashboard-$TIMESTAMP portal-ui/tests/policies/dashboard.json
33+
mc admin policy create minio diagnostics-$TIMESTAMP portal-ui/tests/policies/diagnostics.json
34+
mc admin policy create minio groups-$TIMESTAMP portal-ui/tests/policies/groups.json
35+
mc admin policy create minio heal-$TIMESTAMP portal-ui/tests/policies/heal.json
36+
mc admin policy create minio iampolicies-$TIMESTAMP portal-ui/tests/policies/iamPolicies.json
37+
mc admin policy create minio logs-$TIMESTAMP portal-ui/tests/policies/logs.json
38+
mc admin policy create minio notificationendpoints-$TIMESTAMP portal-ui/tests/policies/notificationEndpoints.json
39+
mc admin policy create minio settings-$TIMESTAMP portal-ui/tests/policies/settings.json
40+
mc admin policy create minio tiers-$TIMESTAMP portal-ui/tests/policies/tiers.json
41+
mc admin policy create minio trace-$TIMESTAMP portal-ui/tests/policies/trace.json
42+
mc admin policy create minio users-$TIMESTAMP portal-ui/tests/policies/users.json
43+
mc admin policy create minio watch-$TIMESTAMP portal-ui/tests/policies/watch.json
44+
mc admin policy create minio bucketwriteprefixonlypolicy-$TIMESTAMP portal-ui/tests/policies/bucketWritePrefixOnlyPolicy.json
45+
mc admin policy create minio inspect-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-allowed.json
46+
mc admin policy create minio inspect-not-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-not-allowed.json
47+
mc admin policy create minio fix-prefix-policy-ui-crash-$TIMESTAMP portal-ui/tests/policies/fix-prefix-policy-ui-crash.json
48+
mc admin policy create minio delete-object-with-prefix-$TIMESTAMP portal-ui/tests/policies/deleteObjectWithPrefix.json
49+
mc admin policy create minio conditions-policy-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy.json
50+
mc admin policy create minio conditions-policy-2-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy2.json
5151
}
5252

5353
create_users() {
@@ -86,29 +86,29 @@ create_buckets() {
8686
}
8787

8888
assign_policies() {
89-
mc admin policy set minio bucketassignpolicy-$TIMESTAMP user=bucketassignpolicy-$TIMESTAMP
90-
mc admin policy set minio bucketread-$TIMESTAMP user=bucketread-$TIMESTAMP
91-
mc admin policy set minio bucketwrite-$TIMESTAMP user=bucketwrite-$TIMESTAMP
92-
mc admin policy set minio bucketreadwrite-$TIMESTAMP user=bucketreadwrite-$TIMESTAMP
93-
mc admin policy set minio bucketreadwrite-$TIMESTAMP user=bucketobjecttags-$TIMESTAMP
94-
mc admin policy set minio bucketcannottag-$TIMESTAMP user=bucketcannottag-$TIMESTAMP
95-
mc admin policy set minio bucketspecific-$TIMESTAMP user=bucketspecific-$TIMESTAMP
96-
mc admin policy set minio dashboard-$TIMESTAMP user=dashboard-$TIMESTAMP
97-
mc admin policy set minio diagnostics-$TIMESTAMP user=diagnostics-$TIMESTAMP
98-
mc admin policy set minio groups-$TIMESTAMP user=groups-$TIMESTAMP
99-
mc admin policy set minio heal-$TIMESTAMP user=heal-$TIMESTAMP
100-
mc admin policy set minio iampolicies-$TIMESTAMP user=iampolicies-$TIMESTAMP
101-
mc admin policy set minio logs-$TIMESTAMP user=logs-$TIMESTAMP
102-
mc admin policy set minio notificationendpoints-$TIMESTAMP user=notificationendpoints-$TIMESTAMP
103-
mc admin policy set minio settings-$TIMESTAMP user=settings-$TIMESTAMP
104-
mc admin policy set minio tiers-$TIMESTAMP user=tiers-$TIMESTAMP
105-
mc admin policy set minio trace-$TIMESTAMP user=trace-$TIMESTAMP
106-
mc admin policy set minio users-$TIMESTAMP user=users-$TIMESTAMP
107-
mc admin policy set minio watch-$TIMESTAMP user=watch-$TIMESTAMP
108-
mc admin policy set minio bucketwriteprefixonlypolicy-$TIMESTAMP user=bucketwriteprefixonlypolicy-$TIMESTAMP
109-
mc admin policy set minio inspect-allowed-$TIMESTAMP user=inspect-allowed-$TIMESTAMP
110-
mc admin policy set minio inspect-not-allowed-$TIMESTAMP user=inspect-not-allowed-$TIMESTAMP
111-
mc admin policy set minio delete-object-with-prefix-$TIMESTAMP user=delete-object-with-prefix-$TIMESTAMP
112-
mc admin policy set minio conditions-policy-$TIMESTAMP user=conditions-$TIMESTAMP
113-
mc admin policy set minio conditions-policy-2-$TIMESTAMP user=conditions-2-$TIMESTAMP
89+
mc admin policy attach minio bucketassignpolicy-$TIMESTAMP --user bucketassignpolicy-$TIMESTAMP
90+
mc admin policy attach minio bucketread-$TIMESTAMP --user bucketread-$TIMESTAMP
91+
mc admin policy attach minio bucketwrite-$TIMESTAMP --user bucketwrite-$TIMESTAMP
92+
mc admin policy attach minio bucketreadwrite-$TIMESTAMP --user bucketreadwrite-$TIMESTAMP
93+
mc admin policy attach minio bucketreadwrite-$TIMESTAMP --user bucketobjecttags-$TIMESTAMP
94+
mc admin policy attach minio bucketcannottag-$TIMESTAMP --user bucketcannottag-$TIMESTAMP
95+
mc admin policy attach minio bucketspecific-$TIMESTAMP --user bucketspecific-$TIMESTAMP
96+
mc admin policy attach minio dashboard-$TIMESTAMP --user dashboard-$TIMESTAMP
97+
mc admin policy attach minio diagnostics-$TIMESTAMP --user diagnostics-$TIMESTAMP
98+
mc admin policy attach minio groups-$TIMESTAMP --user groups-$TIMESTAMP
99+
mc admin policy attach minio heal-$TIMESTAMP --user heal-$TIMESTAMP
100+
mc admin policy attach minio iampolicies-$TIMESTAMP --user iampolicies-$TIMESTAMP
101+
mc admin policy attach minio logs-$TIMESTAMP --user logs-$TIMESTAMP
102+
mc admin policy attach minio notificationendpoints-$TIMESTAMP --user notificationendpoints-$TIMESTAMP
103+
mc admin policy attach minio settings-$TIMESTAMP --user settings-$TIMESTAMP
104+
mc admin policy attach minio tiers-$TIMESTAMP --user tiers-$TIMESTAMP
105+
mc admin policy attach minio trace-$TIMESTAMP --user trace-$TIMESTAMP
106+
mc admin policy attach minio users-$TIMESTAMP --user users-$TIMESTAMP
107+
mc admin policy attach minio watch-$TIMESTAMP --user watch-$TIMESTAMP
108+
mc admin policy attach minio bucketwriteprefixonlypolicy-$TIMESTAMP --user bucketwriteprefixonlypolicy-$TIMESTAMP
109+
mc admin policy attach minio inspect-allowed-$TIMESTAMP --user inspect-allowed-$TIMESTAMP
110+
mc admin policy attach minio inspect-not-allowed-$TIMESTAMP --user inspect-not-allowed-$TIMESTAMP
111+
mc admin policy attach minio delete-object-with-prefix-$TIMESTAMP --user delete-object-with-prefix-$TIMESTAMP
112+
mc admin policy attach minio conditions-policy-$TIMESTAMP --user conditions-$TIMESTAMP
113+
mc admin policy attach minio conditions-policy-2-$TIMESTAMP --user conditions-2-$TIMESTAMP
114114
}

0 commit comments

Comments
 (0)