Skip to content

Commit e912015

Browse files
authored
cleanup: Fix usages of non-constant format strings (#7959)
1 parent 681334a commit e912015

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

internal/testutils/blocking_context_dialer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (s) TestBlockingDialer_HoldWaitFail(t *testing.T) {
125125
}()
126126

127127
if !h.Wait(ctx) {
128-
t.Fatalf("Timeout while waiting for a connection attempt to " + h.addr)
128+
t.Fatal("Timeout while waiting for a connection attempt to " + h.addr)
129129
}
130130
select {
131131
case err = <-dialError:

internal/transport/handler_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,5 +498,5 @@ func mapRecvMsgError(err error) error {
498498
if strings.Contains(err.Error(), "body closed by handler") {
499499
return status.Error(codes.Canceled, err.Error())
500500
}
501-
return connectionErrorf(true, err, err.Error())
501+
return connectionErrorf(true, err, "%s", err.Error())
502502
}

stream.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ func (ss *serverStream) RecvMsg(m any) (err error) {
17661766
return err
17671767
}
17681768
if err == io.ErrUnexpectedEOF {
1769-
err = status.Errorf(codes.Internal, io.ErrUnexpectedEOF.Error())
1769+
err = status.Error(codes.Internal, io.ErrUnexpectedEOF.Error())
17701770
}
17711771
return toRPCErr(err)
17721772
}

test/creds_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ type methodTestCreds struct{}
186186

187187
func (m *methodTestCreds) GetRequestMetadata(ctx context.Context, _ ...string) (map[string]string, error) {
188188
ri, _ := credentials.RequestInfoFromContext(ctx)
189-
return nil, status.Errorf(codes.Unknown, ri.Method)
189+
return nil, status.Error(codes.Unknown, ri.Method)
190190
}
191191

192192
func (m *methodTestCreds) RequireTransportSecurity() bool { return false }

test/end2end_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4692,7 +4692,7 @@ func (s) TestTapTimeout(t *testing.T) {
46924692
ss := &stubserver.StubServer{
46934693
EmptyCallF: func(ctx context.Context, _ *testpb.Empty) (*testpb.Empty, error) {
46944694
<-ctx.Done()
4695-
return nil, status.Errorf(codes.Canceled, ctx.Err().Error())
4695+
return nil, status.Error(codes.Canceled, ctx.Err().Error())
46964696
},
46974697
}
46984698
if err := ss.Start(sopts); err != nil {
@@ -5104,7 +5104,7 @@ func (s) TestStatusInvalidUTF8Message(t *testing.T) {
51045104

51055105
ss := &stubserver.StubServer{
51065106
EmptyCallF: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
5107-
return nil, status.Errorf(codes.Internal, origMsg)
5107+
return nil, status.Error(codes.Internal, origMsg)
51085108
},
51095109
}
51105110
if err := ss.Start(nil); err != nil {

xds/internal/balancer/clusterimpl/picker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (d *picker) Pick(info balancer.PickInfo) (balancer.PickResult, error) {
129129
if d.loadStore != nil {
130130
d.loadStore.CallDropped("")
131131
}
132-
return balancer.PickResult{}, status.Errorf(codes.Unavailable, err.Error())
132+
return balancer.PickResult{}, status.Error(codes.Unavailable, err.Error())
133133
}
134134
}
135135

xds/internal/xdsclient/transport/ads/ads_stream.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ func (s *StreamImpl) onError(err error, msgReceived bool) {
664664
// connection hitting its max connection age limit.
665665
// (see [gRFC A9](https://github.com/grpc/proposal/blob/master/A9-server-side-conn-mgt.md)).
666666
if msgReceived {
667-
err = xdsresource.NewErrorf(xdsresource.ErrTypeStreamFailedAfterRecv, err.Error())
667+
err = xdsresource.NewErrorf(xdsresource.ErrTypeStreamFailedAfterRecv, "%s", err.Error())
668668
}
669669

670670
s.eventHandler.OnADSStreamError(err)

0 commit comments

Comments
 (0)