Skip to content

Commit 8320224

Browse files
arvindbr8arvindbr8
authored
.*: revive from unused_parameters (#7577)
1 parent 845f62c commit 8320224

File tree

147 files changed

+426
-427
lines changed

Some content is hidden

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

147 files changed

+426
-427
lines changed

‎balancer/base/balancer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type baseBuilder struct {
3636
config Config
3737
}
3838

39-
func (bb *baseBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) balancer.Balancer {
39+
func (bb *baseBuilder) Build(cc balancer.ClientConn, _ balancer.BuildOptions) balancer.Balancer {
4040
bal := &baseBalancer{
4141
cc: cc,
4242
pickerBuilder: bb.pickerBuilder,
@@ -259,6 +259,6 @@ type errPicker struct {
259259
err error // Pick() always returns this err.
260260
}
261261

262-
func (p *errPicker) Pick(info balancer.PickInfo) (balancer.PickResult, error) {
262+
func (p *errPicker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
263263
return balancer.PickResult{}, p.err
264264
}

‎balancer/base/balancer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type testSubConn struct {
4444
updateState func(balancer.SubConnState)
4545
}
4646

47-
func (sc *testSubConn) UpdateAddresses(addresses []resolver.Address) {}
47+
func (sc *testSubConn) UpdateAddresses([]resolver.Address) {}
4848

4949
func (sc *testSubConn) Connect() {}
5050

@@ -88,7 +88,7 @@ func TestBaseBalancerReserveAttributes(t *testing.T) {
8888
}
8989
pickBuilder := &testPickBuilder{validate: v}
9090
b := (&baseBuilder{pickerBuilder: pickBuilder}).Build(&testClientConn{
91-
newSubConn: func(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
91+
newSubConn: func(_ []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
9292
return &testSubConn{updateState: opts.StateListener}, nil
9393
},
9494
}, balancer.BuildOptions{}).(*baseBalancer)

‎balancer/endpointsharding/endpointsharding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (es *endpointSharding) ResolverError(err error) {
165165
}
166166
}
167167

168-
func (es *endpointSharding) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
168+
func (es *endpointSharding) UpdateSubConnState(balancer.SubConn, balancer.SubConnState) {
169169
// UpdateSubConnState is deprecated.
170170
}
171171

‎balancer/endpointsharding/endpointsharding_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (fakePetioleBuilder) Build(cc balancer.ClientConn, opts balancer.BuildOptio
7979
return fp
8080
}
8181

82-
func (fakePetioleBuilder) ParseConfig(s json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
82+
func (fakePetioleBuilder) ParseConfig(json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
8383
return nil, nil
8484
}
8585

‎balancer/grpclb/grpclb_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (c *serverNameCheckCreds) Info() credentials.ProtocolInfo {
126126
func (c *serverNameCheckCreds) Clone() credentials.TransportCredentials {
127127
return &serverNameCheckCreds{}
128128
}
129-
func (c *serverNameCheckCreds) OverrideServerName(s string) error {
129+
func (c *serverNameCheckCreds) OverrideServerName(string) error {
130130
return nil
131131
}
132132

@@ -307,7 +307,7 @@ type testServer struct {
307307

308308
const testmdkey = "testmd"
309309

310-
func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
310+
func (s *testServer) EmptyCall(ctx context.Context, _ *testpb.Empty) (*testpb.Empty, error) {
311311
md, ok := metadata.FromIncomingContext(ctx)
312312
if !ok {
313313
return nil, status.Error(codes.Internal, "failed to receive metadata")
@@ -319,7 +319,7 @@ func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.E
319319
return &testpb.Empty{}, nil
320320
}
321321

322-
func (s *testServer) FullDuplexCall(stream testgrpc.TestService_FullDuplexCallServer) error {
322+
func (s *testServer) FullDuplexCall(testgrpc.TestService_FullDuplexCallServer) error {
323323
return nil
324324
}
325325

@@ -1378,7 +1378,7 @@ func (s) TestGRPCLBWithTargetNameFieldInConfig(t *testing.T) {
13781378

13791379
type failPreRPCCred struct{}
13801380

1381-
func (failPreRPCCred) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
1381+
func (failPreRPCCred) GetRequestMetadata(_ context.Context, uri ...string) (map[string]string, error) {
13821382
if strings.Contains(uri[0], failtosendURI) {
13831383
return nil, fmt.Errorf("rpc should fail to send")
13841384
}
@@ -1619,7 +1619,7 @@ func (s) TestGRPCLBStatsStreamingFailedToSend(t *testing.T) {
16191619
func (s) TestGRPCLBStatsQuashEmpty(t *testing.T) {
16201620
ch := make(chan *lbpb.ClientStats)
16211621
defer close(ch)
1622-
if err := runAndCheckStats(t, false, ch, func(cc *grpc.ClientConn) {
1622+
if err := runAndCheckStats(t, false, ch, func(*grpc.ClientConn) {
16231623
// Perform no RPCs; wait for load reports to start, which should be
16241624
// zero, then expect no other load report within 5x the update
16251625
// interval.

‎balancer/grpclb/grpclb_util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func newMockClientConn() *mockClientConn {
5252
}
5353
}
5454

55-
func (mcc *mockClientConn) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
55+
func (mcc *mockClientConn) NewSubConn(addrs []resolver.Address, _ balancer.NewSubConnOptions) (balancer.SubConn, error) {
5656
sc := &mockSubConn{mcc: mcc}
5757
mcc.mu.Lock()
5858
defer mcc.mu.Unlock()

‎balancer/leastrequest/balancer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func setupBackends(t *testing.T) []string {
127127
// Construct and start three working backends.
128128
for i := 0; i < numBackends; i++ {
129129
backend := &stubserver.StubServer{
130-
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
130+
EmptyCallF: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
131131
return &testpb.Empty{}, nil
132132
},
133133
FullDuplexCallF: func(stream testgrpc.TestService_FullDuplexCallServer) error {

‎balancer/pickfirst/pickfirst.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const (
5050

5151
type pickfirstBuilder struct{}
5252

53-
func (pickfirstBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) balancer.Balancer {
53+
func (pickfirstBuilder) Build(cc balancer.ClientConn, _ balancer.BuildOptions) balancer.Balancer {
5454
b := &pickfirstBalancer{cc: cc}
5555
b.logger = internalgrpclog.NewPrefixLogger(logger, fmt.Sprintf(logPrefix, b))
5656
return b

‎balancer/rls/balancer_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ func (s) TestConfigUpdate_ControlChannel(t *testing.T) {
6969
// Start a couple of test backends, and set up the fake RLS servers to return
7070
// these as a target in the RLS response.
7171
backendCh1, backendAddress1 := startBackend(t)
72-
rlsServer1.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
72+
rlsServer1.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
7373
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress1}}}
7474
})
7575
backendCh2, backendAddress2 := startBackend(t)
76-
rlsServer2.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
76+
rlsServer2.SetResponseCallback(func(context.Context, *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
7777
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress2}}}
7878
})
7979

@@ -155,7 +155,7 @@ func (s) TestConfigUpdate_ControlChannelWithCreds(t *testing.T) {
155155
// and set up the fake RLS server to return this as the target in the RLS
156156
// response.
157157
backendCh, backendAddress := startBackend(t, grpc.Creds(serverCreds))
158-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
158+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
159159
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress}}}
160160
})
161161

@@ -219,7 +219,7 @@ func (s) TestConfigUpdate_ControlChannelServiceConfig(t *testing.T) {
219219
// Start a test backend, and set up the fake RLS server to return this as a
220220
// target in the RLS response.
221221
backendCh, backendAddress := startBackend(t)
222-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
222+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
223223
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress}}}
224224
})
225225

@@ -300,7 +300,7 @@ func (s) TestConfigUpdate_ChildPolicyConfigs(t *testing.T) {
300300
testBackendCh, testBackendAddress := startBackend(t)
301301

302302
// Set up the RLS server to respond with the test backend.
303-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
303+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
304304
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{testBackendAddress}}}
305305
})
306306

@@ -521,7 +521,7 @@ func (s) TestConfigUpdate_BadChildPolicyConfigs(t *testing.T) {
521521
// Set up the RLS server to respond with a bad target field which is expected
522522
// to cause the child policy's ParseTarget to fail and should result in the LB
523523
// policy creating a lame child policy wrapper.
524-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
524+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
525525
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{e2e.RLSChildPolicyBadTarget}}}
526526
})
527527

@@ -590,7 +590,7 @@ func (s) TestConfigUpdate_DataCacheSizeDecrease(t *testing.T) {
590590
// these as targets in the RLS response, based on request keys.
591591
backendCh1, backendAddress1 := startBackend(t)
592592
backendCh2, backendAddress2 := startBackend(t)
593-
rlsServer.SetResponseCallback(func(ctx context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
593+
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
594594
if req.KeyMap["k1"] == "v1" {
595595
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress1}}}
596596
}
@@ -717,7 +717,7 @@ func (s) TestPickerUpdateOnDataCacheSizeDecrease(t *testing.T) {
717717
// these as targets in the RLS response, based on request keys.
718718
backendCh1, backendAddress1 := startBackend(t)
719719
backendCh2, backendAddress2 := startBackend(t)
720-
rlsServer.SetResponseCallback(func(ctx context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
720+
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
721721
if req.KeyMap["k1"] == "v1" {
722722
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress1}}}
723723
}
@@ -859,7 +859,7 @@ func (s) TestDataCachePurging(t *testing.T) {
859859
// Start a test backend, and set up the fake RLS server to return this as a
860860
// target in the RLS response.
861861
backendCh, backendAddress := startBackend(t)
862-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
862+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
863863
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress}}}
864864
})
865865

@@ -950,7 +950,7 @@ func (s) TestControlChannelConnectivityStateMonitoring(t *testing.T) {
950950
// Start a test backend, and set up the fake RLS server to return this as a
951951
// target in the RLS response.
952952
backendCh, backendAddress := startBackend(t)
953-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
953+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
954954
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{backendAddress}}}
955955
})
956956

@@ -1121,7 +1121,7 @@ func (s) TestUpdateStatePauses(t *testing.T) {
11211121

11221122
// Start a test backend and set the RLS server to respond with it.
11231123
testBackendCh, testBackendAddress := startBackend(t)
1124-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
1124+
rlsServer.SetResponseCallback(func(_ context.Context, _ *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
11251125
return &rlstest.RouteLookupResponse{Resp: &rlspb.RouteLookupResponse{Targets: []string{testBackendAddress}}}
11261126
})
11271127

‎balancer/rls/control_channel_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (s) TestLookupFailure(t *testing.T) {
7474
overrideAdaptiveThrottler(t, neverThrottlingThrottler())
7575

7676
// Setup the RLS server to respond with errors.
77-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
77+
rlsServer.SetResponseCallback(func(context.Context, *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
7878
return &rlstest.RouteLookupResponse{Err: errors.New("rls failure")}
7979
})
8080

@@ -109,7 +109,7 @@ func (s) TestLookupFailure(t *testing.T) {
109109
// respond within the configured rpc timeout.
110110
func (s) TestLookupDeadlineExceeded(t *testing.T) {
111111
// A unary interceptor which returns a status error with DeadlineExceeded.
112-
interceptor := func(ctx context.Context, req any, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
112+
interceptor := func(context.Context, any, *grpc.UnaryServerInfo, grpc.UnaryHandler) (resp any, err error) {
113113
return nil, status.Error(codes.DeadlineExceeded, "deadline exceeded")
114114
}
115115

@@ -260,7 +260,7 @@ func testControlChannelCredsSuccess(t *testing.T, sopts []grpc.ServerOption, bop
260260
overrideAdaptiveThrottler(t, neverThrottlingThrottler())
261261

262262
// Setup the RLS server to respond with a valid response.
263-
rlsServer.SetResponseCallback(func(_ context.Context, req *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
263+
rlsServer.SetResponseCallback(func(context.Context, *rlspb.RouteLookupRequest) *rlstest.RouteLookupResponse {
264264
return lookupResponse
265265
})
266266

‎balancer/rls/helpers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type fakeBackoffStrategy struct {
6161
backoff time.Duration
6262
}
6363

64-
func (f *fakeBackoffStrategy) Backoff(retries int) time.Duration {
64+
func (f *fakeBackoffStrategy) Backoff(int) time.Duration {
6565
return f.backoff
6666
}
6767

@@ -171,7 +171,7 @@ func startBackend(t *testing.T, sopts ...grpc.ServerOption) (rpcCh chan struct{}
171171

172172
rpcCh = make(chan struct{}, 1)
173173
backend := &stubserver.StubServer{
174-
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
174+
EmptyCallF: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
175175
select {
176176
case rpcCh <- struct{}{}:
177177
default:

0 commit comments

Comments
 (0)