From ceafdb9cb44d20c5cef8caecb8a4d70618f61182 Mon Sep 17 00:00:00 2001 From: Javier Adriel Date: Wed, 22 Mar 2023 15:06:04 -0600 Subject: [PATCH] Fix revive lint issues (#2730) --- cmd/console/update.go | 2 +- integration/user_api_bucket_test.go | 6 +- pkg/logger/console.go | 2 +- pkg/logger/logger_test.go | 2 +- pkg/logger/target/http/http.go | 2 +- portal-ui/tests/scripts/common.sh | 100 ++++++++++++------------- restapi/admin_client_mock.go | 100 ++++++++++++------------- restapi/admin_idp_test.go | 2 +- restapi/admin_info_test.go | 2 +- restapi/admin_kms_test.go | 2 +- restapi/admin_releases.go | 2 +- restapi/admin_releases_test.go | 2 +- restapi/admin_site_replication_test.go | 16 +--- restapi/admin_subnet_test.go | 2 +- restapi/client-admin.go | 2 +- restapi/logs.go | 2 +- restapi/logs_test.go | 2 +- restapi/user_buckets_test.go | 4 +- restapi/user_logout_test.go | 2 +- restapi/user_objects.go | 4 +- restapi/ws_handle_test.go | 2 +- 21 files changed, 126 insertions(+), 134 deletions(-) diff --git a/cmd/console/update.go b/cmd/console/update.go index 2b65ee412..a7855c44e 100644 --- a/cmd/console/update.go +++ b/cmd/console/update.go @@ -96,7 +96,7 @@ var updateCmd = cli.Command{ Action: updateInplace, } -func updateInplace(ctx *cli.Context) error { +func updateInplace(_ *cli.Context) error { transport := getUpdateTransport(30 * time.Second) rel, err := getLatestRelease(transport) if err != nil { diff --git a/integration/user_api_bucket_test.go b/integration/user_api_bucket_test.go index 0082b6511..37976eab4 100644 --- a/integration/user_api_bucket_test.go +++ b/integration/user_api_bucket_test.go @@ -2317,9 +2317,9 @@ func TestBucketVersioning(t *testing.T) { assert.NotEqual(200, response.StatusCode, "Versioning test Status Code is incorrect - versioned bucket created on non-distributed system") } - request, error := http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test2", requestDataBody) - if error != nil { - log.Println(error) + request, err = http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test2", requestDataBody) + if err != nil { + log.Println(err) return } diff --git a/pkg/logger/console.go b/pkg/logger/console.go index 7b522f514..0270c2086 100644 --- a/pkg/logger/console.go +++ b/pkg/logger/console.go @@ -164,7 +164,7 @@ func (i infoMsg) json(msg string, args ...interface{}) { fmt.Println(string(logJSON)) } -func (i infoMsg) quiet(msg string, args ...interface{}) { +func (i infoMsg) quiet(_ string, _ ...interface{}) { } func (i infoMsg) pretty(msg string, args ...interface{}) { diff --git a/pkg/logger/logger_test.go b/pkg/logger/logger_test.go index 624adc137..e7be5066d 100644 --- a/pkg/logger/logger_test.go +++ b/pkg/logger/logger_test.go @@ -24,7 +24,7 @@ import ( "testing" ) -func testServer(w http.ResponseWriter, r *http.Request) { +func testServer(_ http.ResponseWriter, _ *http.Request) { } func TestInitializeLogger(t *testing.T) { diff --git a/pkg/logger/target/http/http.go b/pkg/logger/target/http/http.go index 864e3e5a1..c39161938 100644 --- a/pkg/logger/target/http/http.go +++ b/pkg/logger/target/http/http.go @@ -194,7 +194,7 @@ func New(config Config) *Target { } // Send log message 'e' to http target. -func (h *Target) Send(entry interface{}, errKind string) error { +func (h *Target) Send(entry interface{}, _ string) error { if atomic.LoadInt32(&h.status) == 0 { // Channel was closed or used before init. return nil diff --git a/portal-ui/tests/scripts/common.sh b/portal-ui/tests/scripts/common.sh index 0827315d7..936342c40 100755 --- a/portal-ui/tests/scripts/common.sh +++ b/portal-ui/tests/scripts/common.sh @@ -23,31 +23,31 @@ add_alias() { } create_policies() { - mc admin policy add minio bucketassignpolicy-$TIMESTAMP portal-ui/tests/policies/bucketAssignPolicy.json - mc admin policy add minio bucketread-$TIMESTAMP portal-ui/tests/policies/bucketRead.json - mc admin policy add minio bucketwrite-$TIMESTAMP portal-ui/tests/policies/bucketWrite.json - mc admin policy add minio bucketreadwrite-$TIMESTAMP portal-ui/tests/policies/bucketReadWrite.json - mc admin policy add minio bucketcannottag-$TIMESTAMP portal-ui/tests/policies/bucketCannotTag.json - mc admin policy add minio bucketspecific-$TIMESTAMP portal-ui/tests/policies/bucketSpecific.json - mc admin policy add minio dashboard-$TIMESTAMP portal-ui/tests/policies/dashboard.json - mc admin policy add minio diagnostics-$TIMESTAMP portal-ui/tests/policies/diagnostics.json - mc admin policy add minio groups-$TIMESTAMP portal-ui/tests/policies/groups.json - mc admin policy add minio heal-$TIMESTAMP portal-ui/tests/policies/heal.json - mc admin policy add minio iampolicies-$TIMESTAMP portal-ui/tests/policies/iamPolicies.json - mc admin policy add minio logs-$TIMESTAMP portal-ui/tests/policies/logs.json - mc admin policy add minio notificationendpoints-$TIMESTAMP portal-ui/tests/policies/notificationEndpoints.json - mc admin policy add minio settings-$TIMESTAMP portal-ui/tests/policies/settings.json - mc admin policy add minio tiers-$TIMESTAMP portal-ui/tests/policies/tiers.json - mc admin policy add minio trace-$TIMESTAMP portal-ui/tests/policies/trace.json - mc admin policy add minio users-$TIMESTAMP portal-ui/tests/policies/users.json - mc admin policy add minio watch-$TIMESTAMP portal-ui/tests/policies/watch.json - mc admin policy add minio bucketwriteprefixonlypolicy-$TIMESTAMP portal-ui/tests/policies/bucketWritePrefixOnlyPolicy.json - mc admin policy add minio inspect-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-allowed.json - mc admin policy add minio inspect-not-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-not-allowed.json - mc admin policy add minio fix-prefix-policy-ui-crash-$TIMESTAMP portal-ui/tests/policies/fix-prefix-policy-ui-crash.json - mc admin policy add minio delete-object-with-prefix-$TIMESTAMP portal-ui/tests/policies/deleteObjectWithPrefix.json - mc admin policy add minio conditions-policy-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy.json - mc admin policy add minio conditions-policy-2-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy2.json + mc admin policy create minio bucketassignpolicy-$TIMESTAMP portal-ui/tests/policies/bucketAssignPolicy.json + mc admin policy create minio bucketread-$TIMESTAMP portal-ui/tests/policies/bucketRead.json + mc admin policy create minio bucketwrite-$TIMESTAMP portal-ui/tests/policies/bucketWrite.json + mc admin policy create minio bucketreadwrite-$TIMESTAMP portal-ui/tests/policies/bucketReadWrite.json + mc admin policy create minio bucketcannottag-$TIMESTAMP portal-ui/tests/policies/bucketCannotTag.json + mc admin policy create minio bucketspecific-$TIMESTAMP portal-ui/tests/policies/bucketSpecific.json + mc admin policy create minio dashboard-$TIMESTAMP portal-ui/tests/policies/dashboard.json + mc admin policy create minio diagnostics-$TIMESTAMP portal-ui/tests/policies/diagnostics.json + mc admin policy create minio groups-$TIMESTAMP portal-ui/tests/policies/groups.json + mc admin policy create minio heal-$TIMESTAMP portal-ui/tests/policies/heal.json + mc admin policy create minio iampolicies-$TIMESTAMP portal-ui/tests/policies/iamPolicies.json + mc admin policy create minio logs-$TIMESTAMP portal-ui/tests/policies/logs.json + mc admin policy create minio notificationendpoints-$TIMESTAMP portal-ui/tests/policies/notificationEndpoints.json + mc admin policy create minio settings-$TIMESTAMP portal-ui/tests/policies/settings.json + mc admin policy create minio tiers-$TIMESTAMP portal-ui/tests/policies/tiers.json + mc admin policy create minio trace-$TIMESTAMP portal-ui/tests/policies/trace.json + mc admin policy create minio users-$TIMESTAMP portal-ui/tests/policies/users.json + mc admin policy create minio watch-$TIMESTAMP portal-ui/tests/policies/watch.json + mc admin policy create minio bucketwriteprefixonlypolicy-$TIMESTAMP portal-ui/tests/policies/bucketWritePrefixOnlyPolicy.json + mc admin policy create minio inspect-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-allowed.json + mc admin policy create minio inspect-not-allowed-$TIMESTAMP portal-ui/tests/policies/inspect-not-allowed.json + mc admin policy create minio fix-prefix-policy-ui-crash-$TIMESTAMP portal-ui/tests/policies/fix-prefix-policy-ui-crash.json + mc admin policy create minio delete-object-with-prefix-$TIMESTAMP portal-ui/tests/policies/deleteObjectWithPrefix.json + mc admin policy create minio conditions-policy-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy.json + mc admin policy create minio conditions-policy-2-$TIMESTAMP portal-ui/tests/policies/conditionsPolicy2.json } create_users() { @@ -86,29 +86,29 @@ create_buckets() { } assign_policies() { - mc admin policy set minio bucketassignpolicy-$TIMESTAMP user=bucketassignpolicy-$TIMESTAMP - mc admin policy set minio bucketread-$TIMESTAMP user=bucketread-$TIMESTAMP - mc admin policy set minio bucketwrite-$TIMESTAMP user=bucketwrite-$TIMESTAMP - mc admin policy set minio bucketreadwrite-$TIMESTAMP user=bucketreadwrite-$TIMESTAMP - mc admin policy set minio bucketreadwrite-$TIMESTAMP user=bucketobjecttags-$TIMESTAMP - mc admin policy set minio bucketcannottag-$TIMESTAMP user=bucketcannottag-$TIMESTAMP - mc admin policy set minio bucketspecific-$TIMESTAMP user=bucketspecific-$TIMESTAMP - mc admin policy set minio dashboard-$TIMESTAMP user=dashboard-$TIMESTAMP - mc admin policy set minio diagnostics-$TIMESTAMP user=diagnostics-$TIMESTAMP - mc admin policy set minio groups-$TIMESTAMP user=groups-$TIMESTAMP - mc admin policy set minio heal-$TIMESTAMP user=heal-$TIMESTAMP - mc admin policy set minio iampolicies-$TIMESTAMP user=iampolicies-$TIMESTAMP - mc admin policy set minio logs-$TIMESTAMP user=logs-$TIMESTAMP - mc admin policy set minio notificationendpoints-$TIMESTAMP user=notificationendpoints-$TIMESTAMP - mc admin policy set minio settings-$TIMESTAMP user=settings-$TIMESTAMP - mc admin policy set minio tiers-$TIMESTAMP user=tiers-$TIMESTAMP - mc admin policy set minio trace-$TIMESTAMP user=trace-$TIMESTAMP - mc admin policy set minio users-$TIMESTAMP user=users-$TIMESTAMP - mc admin policy set minio watch-$TIMESTAMP user=watch-$TIMESTAMP - mc admin policy set minio bucketwriteprefixonlypolicy-$TIMESTAMP user=bucketwriteprefixonlypolicy-$TIMESTAMP - mc admin policy set minio inspect-allowed-$TIMESTAMP user=inspect-allowed-$TIMESTAMP - mc admin policy set minio inspect-not-allowed-$TIMESTAMP user=inspect-not-allowed-$TIMESTAMP - mc admin policy set minio delete-object-with-prefix-$TIMESTAMP user=delete-object-with-prefix-$TIMESTAMP - mc admin policy set minio conditions-policy-$TIMESTAMP user=conditions-$TIMESTAMP - mc admin policy set minio conditions-policy-2-$TIMESTAMP user=conditions-2-$TIMESTAMP + mc admin policy attach minio bucketassignpolicy-$TIMESTAMP --user bucketassignpolicy-$TIMESTAMP + mc admin policy attach minio bucketread-$TIMESTAMP --user bucketread-$TIMESTAMP + mc admin policy attach minio bucketwrite-$TIMESTAMP --user bucketwrite-$TIMESTAMP + mc admin policy attach minio bucketreadwrite-$TIMESTAMP --user bucketreadwrite-$TIMESTAMP + mc admin policy attach minio bucketreadwrite-$TIMESTAMP --user bucketobjecttags-$TIMESTAMP + mc admin policy attach minio bucketcannottag-$TIMESTAMP --user bucketcannottag-$TIMESTAMP + mc admin policy attach minio bucketspecific-$TIMESTAMP --user bucketspecific-$TIMESTAMP + mc admin policy attach minio dashboard-$TIMESTAMP --user dashboard-$TIMESTAMP + mc admin policy attach minio diagnostics-$TIMESTAMP --user diagnostics-$TIMESTAMP + mc admin policy attach minio groups-$TIMESTAMP --user groups-$TIMESTAMP + mc admin policy attach minio heal-$TIMESTAMP --user heal-$TIMESTAMP + mc admin policy attach minio iampolicies-$TIMESTAMP --user iampolicies-$TIMESTAMP + mc admin policy attach minio logs-$TIMESTAMP --user logs-$TIMESTAMP + mc admin policy attach minio notificationendpoints-$TIMESTAMP --user notificationendpoints-$TIMESTAMP + mc admin policy attach minio settings-$TIMESTAMP --user settings-$TIMESTAMP + mc admin policy attach minio tiers-$TIMESTAMP --user tiers-$TIMESTAMP + mc admin policy attach minio trace-$TIMESTAMP --user trace-$TIMESTAMP + mc admin policy attach minio users-$TIMESTAMP --user users-$TIMESTAMP + mc admin policy attach minio watch-$TIMESTAMP --user watch-$TIMESTAMP + mc admin policy attach minio bucketwriteprefixonlypolicy-$TIMESTAMP --user bucketwriteprefixonlypolicy-$TIMESTAMP + mc admin policy attach minio inspect-allowed-$TIMESTAMP --user inspect-allowed-$TIMESTAMP + mc admin policy attach minio inspect-not-allowed-$TIMESTAMP --user inspect-not-allowed-$TIMESTAMP + mc admin policy attach minio delete-object-with-prefix-$TIMESTAMP --user delete-object-with-prefix-$TIMESTAMP + mc admin policy attach minio conditions-policy-$TIMESTAMP --user conditions-$TIMESTAMP + mc admin policy attach minio conditions-policy-2-$TIMESTAMP --user conditions-2-$TIMESTAMP } \ No newline at end of file diff --git a/restapi/admin_client_mock.go b/restapi/admin_client_mock.go index bc5f2dbe2..435feb25a 100644 --- a/restapi/admin_client_mock.go +++ b/restapi/admin_client_mock.go @@ -92,19 +92,19 @@ func (ac AdminClientMock) serverInfo(ctx context.Context) (madmin.InfoMessage, e return MinioServerInfoMock(ctx) } -func (ac AdminClientMock) listRemoteBuckets(ctx context.Context, bucket, arnType string) (targets []madmin.BucketTarget, err error) { +func (ac AdminClientMock) listRemoteBuckets(_ context.Context, _, _ string) (targets []madmin.BucketTarget, err error) { return nil, nil } -func (ac AdminClientMock) getRemoteBucket(ctx context.Context, bucket, arnType string) (targets *madmin.BucketTarget, err error) { +func (ac AdminClientMock) getRemoteBucket(_ context.Context, _, _ string) (targets *madmin.BucketTarget, err error) { return nil, nil } -func (ac AdminClientMock) removeRemoteBucket(ctx context.Context, bucket, arn string) error { +func (ac AdminClientMock) removeRemoteBucket(_ context.Context, _, _ string) error { return nil } -func (ac AdminClientMock) addRemoteBucket(ctx context.Context, bucket string, target *madmin.BucketTarget) (string, error) { +func (ac AdminClientMock) addRemoteBucket(_ context.Context, _ string, _ *madmin.BucketTarget) (string, error) { return "", nil } @@ -112,35 +112,35 @@ func (ac AdminClientMock) changePassword(ctx context.Context, accessKey, secretK return minioChangePasswordMock(ctx, accessKey, secretKey) } -func (ac AdminClientMock) speedtest(ctx context.Context, opts madmin.SpeedtestOpts) (chan madmin.SpeedTestResult, error) { +func (ac AdminClientMock) speedtest(_ context.Context, _ madmin.SpeedtestOpts) (chan madmin.SpeedTestResult, error) { return nil, nil } -func (ac AdminClientMock) verifyTierStatus(ctx context.Context, tierName string) error { +func (ac AdminClientMock) verifyTierStatus(_ context.Context, _ string) error { return nil } // mock function helpConfigKV() -func (ac AdminClientMock) helpConfigKV(ctx context.Context, subSys, key string, envOnly bool) (madmin.Help, error) { +func (ac AdminClientMock) helpConfigKV(_ context.Context, subSys, key string, envOnly bool) (madmin.Help, error) { return minioHelpConfigKVMock(subSys, key, envOnly) } // mock function getConfigKV() -func (ac AdminClientMock) getConfigKV(ctx context.Context, name string) ([]byte, error) { +func (ac AdminClientMock) getConfigKV(_ context.Context, name string) ([]byte, error) { return minioGetConfigKVMock(name) } // mock function setConfigKV() -func (ac AdminClientMock) setConfigKV(ctx context.Context, kv string) (restart bool, err error) { +func (ac AdminClientMock) setConfigKV(_ context.Context, kv string) (restart bool, err error) { return minioSetConfigKVMock(kv) } // mock function helpConfigKV() -func (ac AdminClientMock) helpConfigKVGlobal(ctx context.Context, envOnly bool) (madmin.Help, error) { +func (ac AdminClientMock) helpConfigKVGlobal(_ context.Context, envOnly bool) (madmin.Help, error) { return minioHelpConfigKVGlobalMock(envOnly) } -func (ac AdminClientMock) delConfigKV(ctx context.Context, name string) (err error) { +func (ac AdminClientMock) delConfigKV(_ context.Context, name string) (err error) { return minioDelConfigKVMock(name) } @@ -148,19 +148,19 @@ func (ac AdminClientMock) getLogs(ctx context.Context, node string, lineCnt int, return minioGetLogsMock(ctx, node, lineCnt, logKind) } -func (ac AdminClientMock) listGroups(ctx context.Context) ([]string, error) { +func (ac AdminClientMock) listGroups(_ context.Context) ([]string, error) { return minioListGroupsMock() } -func (ac AdminClientMock) updateGroupMembers(ctx context.Context, req madmin.GroupAddRemove) error { +func (ac AdminClientMock) updateGroupMembers(_ context.Context, req madmin.GroupAddRemove) error { return minioUpdateGroupMembersMock(req) } -func (ac AdminClientMock) getGroupDescription(ctx context.Context, group string) (*madmin.GroupDesc, error) { +func (ac AdminClientMock) getGroupDescription(_ context.Context, group string) (*madmin.GroupDesc, error) { return minioGetGroupDescriptionMock(group) } -func (ac AdminClientMock) setGroupStatus(ctx context.Context, group string, status madmin.GroupStatus) error { +func (ac AdminClientMock) setGroupStatus(_ context.Context, group string, status madmin.GroupStatus) error { return minioSetGroupStatusMock(group, status) } @@ -174,133 +174,133 @@ func (ac AdminClientMock) serverHealthInfo(ctx context.Context, healthDataTypes return minioServerHealthInfoMock(ctx, healthDataTypes, deadline) } -func (ac AdminClientMock) addOrUpdateIDPConfig(ctx context.Context, idpType, cfgName, cfgData string, update bool) (restart bool, err error) { +func (ac AdminClientMock) addOrUpdateIDPConfig(_ context.Context, _, _, _ string, _ bool) (restart bool, err error) { return true, nil } -func (ac AdminClientMock) listIDPConfig(ctx context.Context, idpType string) ([]madmin.IDPListItem, error) { +func (ac AdminClientMock) listIDPConfig(_ context.Context, _ string) ([]madmin.IDPListItem, error) { return []madmin.IDPListItem{{Name: "mock"}}, nil } -func (ac AdminClientMock) deleteIDPConfig(ctx context.Context, idpType, cfgName string) (restart bool, err error) { +func (ac AdminClientMock) deleteIDPConfig(_ context.Context, _, _ string) (restart bool, err error) { return true, nil } -func (ac AdminClientMock) getIDPConfig(ctx context.Context, cfgType, cfgName string) (c madmin.IDPConfig, err error) { +func (ac AdminClientMock) getIDPConfig(_ context.Context, _, _ string) (c madmin.IDPConfig, err error) { return madmin.IDPConfig{Info: []madmin.IDPCfgInfo{{Key: "mock", Value: "mock"}}}, nil } -func (ac AdminClientMock) kmsStatus(ctx context.Context) (madmin.KMSStatus, error) { +func (ac AdminClientMock) kmsStatus(_ context.Context) (madmin.KMSStatus, error) { return madmin.KMSStatus{Name: "name", DefaultKeyID: "key", Endpoints: map[string]madmin.ItemState{"localhost": madmin.ItemState("online")}}, nil } -func (ac AdminClientMock) kmsAPIs(ctx context.Context) ([]madmin.KMSAPI, error) { +func (ac AdminClientMock) kmsAPIs(_ context.Context) ([]madmin.KMSAPI, error) { return []madmin.KMSAPI{{Method: "GET", Path: "/mock"}}, nil } -func (ac AdminClientMock) kmsMetrics(ctx context.Context) (*madmin.KMSMetrics, error) { +func (ac AdminClientMock) kmsMetrics(_ context.Context) (*madmin.KMSMetrics, error) { return &madmin.KMSMetrics{}, nil } -func (ac AdminClientMock) kmsVersion(ctx context.Context) (*madmin.KMSVersion, error) { +func (ac AdminClientMock) kmsVersion(_ context.Context) (*madmin.KMSVersion, error) { return &madmin.KMSVersion{Version: "test-version"}, nil } -func (ac AdminClientMock) createKey(ctx context.Context, key string) error { +func (ac AdminClientMock) createKey(_ context.Context, _ string) error { return nil } -func (ac AdminClientMock) importKey(ctx context.Context, key string, content []byte) error { +func (ac AdminClientMock) importKey(_ context.Context, _ string, _ []byte) error { return nil } -func (ac AdminClientMock) listKeys(ctx context.Context, pattern string) ([]madmin.KMSKeyInfo, error) { +func (ac AdminClientMock) listKeys(_ context.Context, _ string) ([]madmin.KMSKeyInfo, error) { return []madmin.KMSKeyInfo{{ Name: "name", CreatedBy: "by", }}, nil } -func (ac AdminClientMock) keyStatus(ctx context.Context, key string) (*madmin.KMSKeyStatus, error) { +func (ac AdminClientMock) keyStatus(_ context.Context, _ string) (*madmin.KMSKeyStatus, error) { return &madmin.KMSKeyStatus{KeyID: "key"}, nil } -func (ac AdminClientMock) deleteKey(ctx context.Context, key string) error { +func (ac AdminClientMock) deleteKey(_ context.Context, _ string) error { return nil } -func (ac AdminClientMock) setKMSPolicy(ctx context.Context, policy string, content []byte) error { +func (ac AdminClientMock) setKMSPolicy(_ context.Context, _ string, _ []byte) error { return nil } -func (ac AdminClientMock) assignPolicy(ctx context.Context, policy string, content []byte) error { +func (ac AdminClientMock) assignPolicy(_ context.Context, _ string, _ []byte) error { return nil } -func (ac AdminClientMock) describePolicy(ctx context.Context, policy string) (*madmin.KMSDescribePolicy, error) { +func (ac AdminClientMock) describePolicy(_ context.Context, _ string) (*madmin.KMSDescribePolicy, error) { return &madmin.KMSDescribePolicy{Name: "name"}, nil } -func (ac AdminClientMock) getKMSPolicy(ctx context.Context, policy string) (*madmin.KMSPolicy, error) { +func (ac AdminClientMock) getKMSPolicy(_ context.Context, _ string) (*madmin.KMSPolicy, error) { return &madmin.KMSPolicy{Allow: []string{""}, Deny: []string{""}}, nil } -func (ac AdminClientMock) listKMSPolicies(ctx context.Context, pattern string) ([]madmin.KMSPolicyInfo, error) { +func (ac AdminClientMock) listKMSPolicies(_ context.Context, _ string) ([]madmin.KMSPolicyInfo, error) { return []madmin.KMSPolicyInfo{{ Name: "name", CreatedBy: "by", }}, nil } -func (ac AdminClientMock) deletePolicy(ctx context.Context, policy string) error { +func (ac AdminClientMock) deletePolicy(_ context.Context, _ string) error { return nil } -func (ac AdminClientMock) describeIdentity(ctx context.Context, identity string) (*madmin.KMSDescribeIdentity, error) { +func (ac AdminClientMock) describeIdentity(_ context.Context, _ string) (*madmin.KMSDescribeIdentity, error) { return &madmin.KMSDescribeIdentity{}, nil } -func (ac AdminClientMock) describeSelfIdentity(ctx context.Context) (*madmin.KMSDescribeSelfIdentity, error) { +func (ac AdminClientMock) describeSelfIdentity(_ context.Context) (*madmin.KMSDescribeSelfIdentity, error) { return &madmin.KMSDescribeSelfIdentity{ Policy: &madmin.KMSPolicy{Allow: []string{}, Deny: []string{}}, }, nil } -func (ac AdminClientMock) deleteIdentity(ctx context.Context, identity string) error { +func (ac AdminClientMock) deleteIdentity(_ context.Context, _ string) error { return nil } -func (ac AdminClientMock) listIdentities(ctx context.Context, pattern string) ([]madmin.KMSIdentityInfo, error) { +func (ac AdminClientMock) listIdentities(_ context.Context, _ string) ([]madmin.KMSIdentityInfo, error) { return []madmin.KMSIdentityInfo{{Identity: "identity"}}, nil } -func (ac AdminClientMock) listPolicies(ctx context.Context) (map[string]*iampolicy.Policy, error) { +func (ac AdminClientMock) listPolicies(_ context.Context) (map[string]*iampolicy.Policy, error) { return minioListPoliciesMock() } -func (ac AdminClientMock) getPolicy(ctx context.Context, name string) (*iampolicy.Policy, error) { +func (ac AdminClientMock) getPolicy(_ context.Context, name string) (*iampolicy.Policy, error) { return minioGetPolicyMock(name) } -func (ac AdminClientMock) removePolicy(ctx context.Context, name string) error { +func (ac AdminClientMock) removePolicy(_ context.Context, name string) error { return minioRemovePolicyMock(name) } -func (ac AdminClientMock) addPolicy(ctx context.Context, name string, policy *iampolicy.Policy) error { +func (ac AdminClientMock) addPolicy(_ context.Context, name string, policy *iampolicy.Policy) error { return minioAddPolicyMock(name, policy) } -func (ac AdminClientMock) setPolicy(ctx context.Context, policyName, entityName string, isGroup bool) error { +func (ac AdminClientMock) setPolicy(_ context.Context, policyName, entityName string, isGroup bool) error { return minioSetPolicyMock(policyName, entityName, isGroup) } // mock function for startProfiling() -func (ac AdminClientMock) startProfiling(ctx context.Context, profiler madmin.ProfilerType) ([]madmin.StartProfilingResult, error) { +func (ac AdminClientMock) startProfiling(_ context.Context, profiler madmin.ProfilerType) ([]madmin.StartProfilingResult, error) { return minioStartProfiling(profiler) } // mock function for stopProfiling() -func (ac AdminClientMock) stopProfiling(ctx context.Context) (io.ReadCloser, error) { +func (ac AdminClientMock) stopProfiling(_ context.Context) (io.ReadCloser, error) { return minioStopProfiling() } @@ -349,23 +349,23 @@ func (ac AdminClientMock) serviceTrace(ctx context.Context, threshold int64, s3, return minioServiceTraceMock(ctx, threshold, s3, internal, storage, os, errTrace) } -func (ac AdminClientMock) listUsers(ctx context.Context) (map[string]madmin.UserInfo, error) { +func (ac AdminClientMock) listUsers(_ context.Context) (map[string]madmin.UserInfo, error) { return minioListUsersMock() } -func (ac AdminClientMock) addUser(ctx context.Context, accessKey, secretKey string) error { +func (ac AdminClientMock) addUser(_ context.Context, accessKey, secretKey string) error { return minioAddUserMock(accessKey, secretKey) } -func (ac AdminClientMock) removeUser(ctx context.Context, accessKey string) error { +func (ac AdminClientMock) removeUser(_ context.Context, accessKey string) error { return minioRemoveUserMock(accessKey) } -func (ac AdminClientMock) getUserInfo(ctx context.Context, accessKey string) (madmin.UserInfo, error) { +func (ac AdminClientMock) getUserInfo(_ context.Context, accessKey string) (madmin.UserInfo, error) { return minioGetUserInfoMock(accessKey) } -func (ac AdminClientMock) setUserStatus(ctx context.Context, accessKey string, status madmin.AccountStatus) error { +func (ac AdminClientMock) setUserStatus(_ context.Context, accessKey string, status madmin.AccountStatus) error { return minioSetUserStatusMock(accessKey, status) } diff --git a/restapi/admin_idp_test.go b/restapi/admin_idp_test.go index 1eed6f4e5..979d317d0 100644 --- a/restapi/admin_idp_test.go +++ b/restapi/admin_idp_test.go @@ -57,7 +57,7 @@ func (suite *IDPTestSuite) SetupTest() { os.Setenv(ConsoleMinIOServer, suite.server.URL) } -func (suite *IDPTestSuite) serverHandler(w http.ResponseWriter, r *http.Request) { +func (suite *IDPTestSuite) serverHandler(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(400) } diff --git a/restapi/admin_info_test.go b/restapi/admin_info_test.go index 6fefbb8b2..1001f1cf9 100644 --- a/restapi/admin_info_test.go +++ b/restapi/admin_info_test.go @@ -64,7 +64,7 @@ func (suite *AdminInfoTestSuite) SetupTest() { os.Setenv(ConsoleMinIOServer, suite.server.URL) } -func (suite *AdminInfoTestSuite) serverHandler(w http.ResponseWriter, r *http.Request) { +func (suite *AdminInfoTestSuite) serverHandler(w http.ResponseWriter, _ *http.Request) { if suite.isPrometheusRequest { w.WriteHeader(200) } else { diff --git a/restapi/admin_kms_test.go b/restapi/admin_kms_test.go index 8fa732596..37a5b5a51 100644 --- a/restapi/admin_kms_test.go +++ b/restapi/admin_kms_test.go @@ -50,7 +50,7 @@ func (suite *KMSTestSuite) SetupTest() { os.Setenv(ConsoleMinIOServer, suite.server.URL) } -func (suite *KMSTestSuite) serverHandler(w http.ResponseWriter, r *http.Request) { +func (suite *KMSTestSuite) serverHandler(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(400) } diff --git a/restapi/admin_releases.go b/restapi/admin_releases.go index 9d9863c9f..31b86d325 100644 --- a/restapi/admin_releases.go +++ b/restapi/admin_releases.go @@ -46,7 +46,7 @@ func registerReleasesHandlers(api *operations.ConsoleAPI) { }) } -func GetReleaseListResponse(session *models.Principal, params release.ListReleasesParams) (*models.ReleaseListResponse, *models.Error) { +func GetReleaseListResponse(_ *models.Principal, params release.ListReleasesParams) (*models.ReleaseListResponse, *models.Error) { ctx, cancel := context.WithCancel(params.HTTPRequest.Context()) defer cancel() repo := params.Repo diff --git a/restapi/admin_releases_test.go b/restapi/admin_releases_test.go index 506e593ca..df95219b5 100644 --- a/restapi/admin_releases_test.go +++ b/restapi/admin_releases_test.go @@ -56,7 +56,7 @@ func (suite *ReleasesTestSuite) TearDownSuite() { } func (suite *ReleasesTestSuite) getHandler( - w http.ResponseWriter, r *http.Request, + w http.ResponseWriter, _ *http.Request, ) { if suite.withError { w.WriteHeader(400) diff --git a/restapi/admin_site_replication_test.go b/restapi/admin_site_replication_test.go index c08676a26..55abbbd3c 100644 --- a/restapi/admin_site_replication_test.go +++ b/restapi/admin_site_replication_test.go @@ -77,9 +77,7 @@ func TestGetSiteReplicationInfo(t *testing.T) { } srInfo, err := adminClient.getSiteReplicationInfo(ctx) - if err != nil { - } - + assert.Nil(err) assert.Equal(expValueMock, srInfo, fmt.Sprintf("Failed on %s: length of lists is not the same", function)) } @@ -126,9 +124,7 @@ func TestAddSiteReplicationInfo(t *testing.T) { } srInfo, err := adminClient.addSiteReplicationInfo(ctx, sites) - if err != nil { - } - + assert.Nil(err) assert.Equal(expValueMock, srInfo, fmt.Sprintf("Failed on %s: length of lists is not the same", function)) } @@ -164,9 +160,7 @@ func TestEditSiteReplicationInfo(t *testing.T) { } srInfo, err := adminClient.editSiteReplicationInfo(ctx, site) - if err != nil { - } - + assert.Nil(err) assert.Equal(expValueMock, srInfo, fmt.Sprintf("Failed on %s: length of lists is not the same", function)) } @@ -201,9 +195,7 @@ func TestDeleteSiteReplicationInfo(t *testing.T) { } srInfo, err := adminClient.deleteSiteReplicationInfo(ctx, remReq) - if err != nil { - } - + assert.Nil(err) assert.Equal(expValueMock, srInfo, fmt.Sprintf("Failed on %s: length of lists is not the same", function)) } diff --git a/restapi/admin_subnet_test.go b/restapi/admin_subnet_test.go index e881b83b5..29ff5e20a 100644 --- a/restapi/admin_subnet_test.go +++ b/restapi/admin_subnet_test.go @@ -58,7 +58,7 @@ func (suite *AdminSubnetTestSuite) SetupTest() { os.Setenv(ConsoleMinIOServer, suite.server.URL) } -func (suite *AdminSubnetTestSuite) serverHandler(w http.ResponseWriter, r *http.Request) { +func (suite *AdminSubnetTestSuite) serverHandler(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(400) } diff --git a/restapi/client-admin.go b/restapi/client-admin.go index 46565e7e4..0850b7e18 100644 --- a/restapi/client-admin.go +++ b/restapi/client-admin.go @@ -311,7 +311,7 @@ func (ac AdminClient) stopProfiling(ctx context.Context) (io.ReadCloser, error) } // implements madmin.ServiceTrace() -func (ac AdminClient) serviceTrace(ctx context.Context, threshold int64, s3, internal, storage, os, errTrace bool) <-chan madmin.ServiceTraceInfo { +func (ac AdminClient) serviceTrace(ctx context.Context, threshold int64, _, internal, storage, os, errTrace bool) <-chan madmin.ServiceTraceInfo { thresholdT := time.Duration(threshold) tracingOptions := madmin.ServiceTraceOpts{ diff --git a/restapi/logs.go b/restapi/logs.go index 76403212b..1d8f3fa66 100644 --- a/restapi/logs.go +++ b/restapi/logs.go @@ -39,7 +39,7 @@ func logError(msg string, data ...interface{}) { errorLog.Printf(msg+"\n", data...) } -func logIf(ctx context.Context, err error, errKind ...interface{}) { +func logIf(_ context.Context, _ error, _ ...interface{}) { } // globally changeable logger styles diff --git a/restapi/logs_test.go b/restapi/logs_test.go index 790f92d85..6ec38cdc4 100644 --- a/restapi/logs_test.go +++ b/restapi/logs_test.go @@ -105,6 +105,6 @@ func TestContext_Load(t *testing.T) { } } -func Test_logInfo(t *testing.T) { +func Test_logInfo(_ *testing.T) { logInfo("message", nil) } diff --git a/restapi/user_buckets_test.go b/restapi/user_buckets_test.go index 2e6411a36..bd16b0f66 100644 --- a/restapi/user_buckets_test.go +++ b/restapi/user_buckets_test.go @@ -73,12 +73,12 @@ func (mc minioClientMock) setBucketPolicyWithContext(ctx context.Context, bucket } // mock function of removeBucket() -func (mc minioClientMock) removeBucket(ctx context.Context, bucketName string) error { +func (mc minioClientMock) removeBucket(_ context.Context, bucketName string) error { return minioRemoveBucketMock(bucketName) } // mock function of getBucketPolicy() -func (mc minioClientMock) getBucketPolicy(ctx context.Context, bucketName string) (string, error) { +func (mc minioClientMock) getBucketPolicy(_ context.Context, bucketName string) (string, error) { return minioGetBucketPolicyMock(bucketName) } diff --git a/restapi/user_logout_test.go b/restapi/user_logout_test.go index 71ea8241e..1624c9a37 100644 --- a/restapi/user_logout_test.go +++ b/restapi/user_logout_test.go @@ -24,6 +24,6 @@ func (ac consoleCredentialsMock) Expire() { // Implementing this method for the consoleCredentials interface } -func TestLogout(t *testing.T) { +func TestLogout(_ *testing.T) { // There's nothing to test right now } diff --git a/restapi/user_objects.go b/restapi/user_objects.go index 025e038a8..bc32008be 100644 --- a/restapi/user_objects.go +++ b/restapi/user_objects.go @@ -708,7 +708,7 @@ func getDeleteMultiplePathsResponse(session *models.Principal, params objectApi. func deleteObjects(ctx context.Context, client MCClient, bucket string, path string, versionID string, recursive, allVersions, nonCurrentVersionsOnly, bypass bool) error { // Delete All non-Current versions only. if nonCurrentVersionsOnly { - return deleteNonCurrentVersions(ctx, client, bucket, path, bypass) + return deleteNonCurrentVersions(ctx, client, bypass) } if recursive || allVersions { @@ -785,7 +785,7 @@ func deleteSingleObject(ctx context.Context, client MCClient, bucket, object str return nil } -func deleteNonCurrentVersions(ctx context.Context, client MCClient, bucket, path string, isBypass bool) error { +func deleteNonCurrentVersions(ctx context.Context, client MCClient, isBypass bool) error { lctx, cancel := context.WithCancel(ctx) defer cancel() diff --git a/restapi/ws_handle_test.go b/restapi/ws_handle_test.go index 23dc1c45b..f8622379f 100644 --- a/restapi/ws_handle_test.go +++ b/restapi/ws_handle_test.go @@ -46,7 +46,7 @@ func (c mockConn) close() error { return nil } -func TestWSHandle(t *testing.T) { +func TestWSHandle(_ *testing.T) { // assert := assert.New(t) mockWSConn := mockConn{}