From 6f5443ef86fa8c6cb21f86a35563ec5c58b55aec Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Thu, 5 Nov 2020 11:18:59 -0500 Subject: [PATCH] Fix a bunch of linter warnings --- agent/consul/acl_endpoint_test.go | 6 +++--- agent/consul/acl_test.go | 18 +++++++++--------- agent/consul/auto_config_endpoint_test.go | 2 +- agent/consul/autopilot.go | 12 ++++++------ agent/consul/client_test.go | 4 ++-- agent/consul/prepared_query_endpoint_test.go | 14 +++++++------- agent/consul/rpc_test.go | 8 ++++---- agent/local/state.go | 3 --- agent/local/testing.go | 2 +- 9 files changed, 33 insertions(+), 36 deletions(-) diff --git a/agent/consul/acl_endpoint_test.go b/agent/consul/acl_endpoint_test.go index f2176f4b5c02..56448443fdaa 100644 --- a/agent/consul/acl_endpoint_test.go +++ b/agent/consul/acl_endpoint_test.go @@ -449,9 +449,9 @@ func TestACLEndpoint_ReplicationStatus(t *testing.T) { err := msgpackrpc.CallWithCodec(codec, "ACL.ReplicationStatus", &getR, &status) require.NoError(t, err) - require.True(t, status.Enabled) - require.True(t, status.Running) - require.Equal(t, "dc2", status.SourceDatacenter) + require.True(r, status.Enabled) + require.True(r, status.Running) + require.Equal(r, "dc2", status.SourceDatacenter) }) } diff --git a/agent/consul/acl_test.go b/agent/consul/acl_test.go index 33fc4e9a828e..2544ad79afbd 100644 --- a/agent/consul/acl_test.go +++ b/agent/consul/acl_test.go @@ -1264,7 +1264,7 @@ func TestACLResolver_DownPolicy(t *testing.T) { legacy: false, localTokens: false, localPolicies: false, - tokenReadFn: func(args *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { + tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { if !tokenResolved { reply.Token = foundToken tokenResolved = true @@ -1330,7 +1330,7 @@ func TestACLResolver_DownPolicy(t *testing.T) { legacy: false, localTokens: false, localPolicies: false, - tokenReadFn: func(args *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { + tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { // no limit reply.Token = foundToken return nil @@ -1440,7 +1440,7 @@ func TestACLResolver_Client(t *testing.T) { legacy: false, localTokens: false, localPolicies: false, - tokenReadFn: func(args *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { + tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error { atomic.AddInt32(&tokenReads, 1) if deleted { return acl.ErrNotFound @@ -1558,7 +1558,7 @@ func TestACLResolver_Client(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { reply.Parent = "deny" reply.TTL = 30 reply.ETag = "nothing" @@ -1900,7 +1900,7 @@ func TestACLResolver_Legacy(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { if !cached { reply.Parent = "deny" reply.TTL = 30 @@ -1951,7 +1951,7 @@ func TestACLResolver_Legacy(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { if !cached { reply.Parent = "deny" reply.TTL = 0 @@ -2004,7 +2004,7 @@ func TestACLResolver_Legacy(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { if !cached { reply.Parent = "deny" reply.TTL = 0 @@ -2058,7 +2058,7 @@ func TestACLResolver_Legacy(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { if !cached { reply.Parent = "deny" reply.TTL = 0 @@ -2112,7 +2112,7 @@ func TestACLResolver_Legacy(t *testing.T) { legacy: true, localTokens: false, localPolicies: false, - getPolicyFn: func(args *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { + getPolicyFn: func(_ *structs.ACLPolicyResolveLegacyRequest, reply *structs.ACLPolicyResolveLegacyResponse) error { if !cached { reply.Parent = "deny" reply.TTL = 0 diff --git a/agent/consul/auto_config_endpoint_test.go b/agent/consul/auto_config_endpoint_test.go index 137b9adcee79..d38b5225e2d0 100644 --- a/agent/consul/auto_config_endpoint_test.go +++ b/agent/consul/auto_config_endpoint_test.go @@ -280,7 +280,7 @@ func TestAutoConfigInitialConfiguration(t *testing.T) { }, }, }, - patchResponse: func(t *testing.T, srv *Server, resp *pbautoconf.AutoConfigResponse) { + patchResponse: func(t *testing.T, _ *Server, resp *pbautoconf.AutoConfigResponse) { // we are expecting an ACL token but cannot check anything for equality // so here we check that it was set and overwrite it require.NotNil(t, resp.Config) diff --git a/agent/consul/autopilot.go b/agent/consul/autopilot.go index 2b4acf5540f0..dc5aa5da700b 100644 --- a/agent/consul/autopilot.go +++ b/agent/consul/autopilot.go @@ -41,12 +41,12 @@ func (d *AutopilotDelegate) NotifyState(state *autopilot.State) { } } -func (d *AutopilotDelegate) RemoveFailedServer(srv *autopilot.Server) error { - if err := d.server.RemoveFailedNode(srv.Name, false); err != nil { - return fmt.Errorf("failed to remove server: %w", err) - } - - return nil +func (d *AutopilotDelegate) RemoveFailedServer(srv *autopilot.Server) { + go func() { + if err := d.server.RemoveFailedNode(srv.Name, false); err != nil { + d.server.logger.Error("failedto remove server", "name", srv.Name, "id", srv.ID, "error", err) + } + }() } func (s *Server) initAutopilot(config *Config) { diff --git a/agent/consul/client_test.go b/agent/consul/client_test.go index 4af8a4629eb8..2fc08c4cf835 100644 --- a/agent/consul/client_test.go +++ b/agent/consul/client_test.go @@ -145,8 +145,8 @@ func TestClient_LANReap(t *testing.T) { // Check the router has both retry.Run(t, func(r *retry.R) { server := c1.router.FindLANServer() - require.NotNil(t, server) - require.Equal(t, s1.config.NodeName, server.Name) + require.NotNil(r, server) + require.Equal(r, s1.config.NodeName, server.Name) }) // shutdown the second dc diff --git a/agent/consul/prepared_query_endpoint_test.go b/agent/consul/prepared_query_endpoint_test.go index b2764e8cac31..b028159343ac 100644 --- a/agent/consul/prepared_query_endpoint_test.go +++ b/agent/consul/prepared_query_endpoint_test.go @@ -2900,7 +2900,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc1" { ret.Nodes = nodes() @@ -2928,7 +2928,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc3" { ret.Nodes = nodes() @@ -2978,7 +2978,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc4" { ret.Nodes = nodes() @@ -3007,7 +3007,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc4" { ret.Nodes = nodes() @@ -3036,7 +3036,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc4" { ret.Nodes = nodes() @@ -3069,7 +3069,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "dc1" { return fmt.Errorf("XXX") @@ -3103,7 +3103,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) { { mock := &mockQueryServer{ Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"}, - QueryFn: func(dc string, args interface{}, reply interface{}) error { + QueryFn: func(dc string, _ interface{}, reply interface{}) error { ret := reply.(*structs.PreparedQueryExecuteResponse) if dc == "xxx" { ret.Nodes = nodes() diff --git a/agent/consul/rpc_test.go b/agent/consul/rpc_test.go index 864d78a3098c..75d11874c1d9 100644 --- a/agent/consul/rpc_test.go +++ b/agent/consul/rpc_test.go @@ -164,7 +164,7 @@ func TestRPC_blockingQuery(t *testing.T) { var opts structs.QueryOptions var meta structs.QueryMeta var calls int - fn := func(ws memdb.WatchSet, state *state.Store) error { + fn := func(_ memdb.WatchSet, _ *state.Store) error { calls++ return nil } @@ -183,7 +183,7 @@ func TestRPC_blockingQuery(t *testing.T) { } var meta structs.QueryMeta var calls int - fn := func(ws memdb.WatchSet, state *state.Store) error { + fn := func(ws memdb.WatchSet, _ *state.Store) error { if calls == 0 { meta.Index = 3 @@ -219,7 +219,7 @@ func TestRPC_blockingQuery(t *testing.T) { } var meta structs.QueryMeta var calls int - fn := func(ws memdb.WatchSet, state *state.Store) error { + fn := func(ws memdb.WatchSet, _ *state.Store) error { if opts.MinQueryIndex > 0 { // If client requested blocking, block forever. This is simulating // waiting for the watched resource to be initialized/written to giving @@ -261,7 +261,7 @@ func TestRPC_blockingQuery(t *testing.T) { } var meta structs.QueryMeta var calls int - fn := func(ws memdb.WatchSet, state *state.Store) error { + fn := func(_ memdb.WatchSet, _ *state.Store) error { if calls == 0 { meta.Index = 3 diff --git a/agent/local/state.go b/agent/local/state.go index d7cce4251fd9..be0c481f3d51 100644 --- a/agent/local/state.go +++ b/agent/local/state.go @@ -905,10 +905,7 @@ func (l *State) updateSyncState() error { !reflect.DeepEqual(svcNode.TaggedAddresses, l.config.TaggedAddresses) || !reflect.DeepEqual(svcNode.Meta, l.metadata) { l.nodeInfoInSync = false - } else { - } - // Check which services need syncing // Look for local services that do not exist remotely and mark them for diff --git a/agent/local/testing.go b/agent/local/testing.go index 5871463e2240..283c68c5fd99 100644 --- a/agent/local/testing.go +++ b/agent/local/testing.go @@ -9,7 +9,7 @@ import ( ) // TestState returns a configured *State for testing. -func TestState(t testing.T) *State { +func TestState(_ testing.T) *State { logger := hclog.New(&hclog.LoggerOptions{ Output: os.Stderr, })