grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

.*: Use `strings.ReplaceAll(.....)` (#7554)

This commit is contained in:
bytetigers 2024-08-27 01:09:35 +08:00 committed by GitHub
parent 6d976887d4
commit a8e6e11cf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/googlecloud/googlecloud.go
View File

@ -62,9 +62,9 @@ func isRunningOnGCE(manufacturer []byte, goos string) bool {
name = strings.TrimSpace(name) name = strings.TrimSpace(name)
return name == "Google" || name == "Google Compute Engine" return name == "Google" || name == "Google Compute Engine"
case "windows": case "windows":
name = strings.Replace(name, " ", "", -1) name = strings.ReplaceAll(name, " ", "")
name = strings.Replace(name, "\n", "", -1) name = strings.ReplaceAll(name, "\n", "")
name = strings.Replace(name, "\r", "", -1) name = strings.ReplaceAll(name, "\r", "")
return name == "Google" return name == "Google"
default: default:
return false return false

2
internal/xds/bootstrap/template.go
View File

@ -34,7 +34,7 @@ func PopulateResourceTemplate(template, target string) string {
if strings.HasPrefix(template, "xdstp:") { if strings.HasPrefix(template, "xdstp:") {
target = percentEncode(target) target = percentEncode(target)
} }
return strings.Replace(template, "%s", target, -1) return strings.ReplaceAll(template, "%s", target)
} }
// percentEncode percent encode t, except for "/". See the tests for examples. // percentEncode percent encode t, except for "/". See the tests for examples.

10
resolver_balancer_ext_test.go
View File

@ -45,7 +45,7 @@ import (
// 4. balancer.ClientConn.ResolveNow() -> // 4. balancer.ClientConn.ResolveNow() ->
// 5. resolver.Resolver.ResolveNow() -> // 5. resolver.Resolver.ResolveNow() ->
func (s) TestResolverBalancerInteraction(t *testing.T) { func (s) TestResolverBalancerInteraction(t *testing.T) {
name := strings.Replace(strings.ToLower(t.Name()), "/", "", -1) name := strings.ReplaceAll(strings.ToLower(t.Name()), "/", "")
bf := stub.BalancerFuncs{ bf := stub.BalancerFuncs{
UpdateClientConnState: func(bd *stub.BalancerData, ccs balancer.ClientConnState) error { UpdateClientConnState: func(bd *stub.BalancerData, ccs balancer.ClientConnState) error {
bd.ClientConn.ResolveNow(resolver.ResolveNowOptions{}) bd.ClientConn.ResolveNow(resolver.ResolveNowOptions{})
@ -104,7 +104,7 @@ func (b *resolverBuilderWithErr) Close() {}
// 4. resolver.Builder.Build() fails. // 4. resolver.Builder.Build() fails.
func (s) TestResolverBuildFailure(t *testing.T) { func (s) TestResolverBuildFailure(t *testing.T) {
enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn)) enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn))
name := strings.Replace(strings.ToLower(t.Name()), "/", "", -1) name := strings.ReplaceAll(strings.ToLower(t.Name()), "/", "")
resErrCh := make(chan error, 1) resErrCh := make(chan error, 1)
resolver.Register(&resolverBuilderWithErr{errCh: resErrCh, scheme: name}) resolver.Register(&resolverBuilderWithErr{errCh: resErrCh, scheme: name})
@ -130,7 +130,7 @@ func (s) TestResolverBuildFailure(t *testing.T) {
// the channel enters idle mode. // the channel enters idle mode.
func (s) TestEnterIdleDuringResolverUpdateState(t *testing.T) { func (s) TestEnterIdleDuringResolverUpdateState(t *testing.T) {
enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn)) enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn))
name := strings.Replace(strings.ToLower(t.Name()), "/", "", -1) name := strings.ReplaceAll(strings.ToLower(t.Name()), "/", "")
// Create a manual resolver that spams UpdateState calls until it is closed. // Create a manual resolver that spams UpdateState calls until it is closed.
rb := manual.NewBuilderWithScheme(name) rb := manual.NewBuilderWithScheme(name)
@ -175,7 +175,7 @@ func (s) TestEnterIdleDuringResolverUpdateState(t *testing.T) {
// time as the balancer being closed while the channel enters idle mode. // time as the balancer being closed while the channel enters idle mode.
func (s) TestEnterIdleDuringBalancerUpdateState(t *testing.T) { func (s) TestEnterIdleDuringBalancerUpdateState(t *testing.T) {
enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn)) enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn))
name := strings.Replace(strings.ToLower(t.Name()), "/", "", -1) name := strings.ReplaceAll(strings.ToLower(t.Name()), "/", "")
// Create a balancer that calls UpdateState once asynchronously, attempting // Create a balancer that calls UpdateState once asynchronously, attempting
// to make the channel appear ready even after entering idle. // to make the channel appear ready even after entering idle.
@ -220,7 +220,7 @@ func (s) TestEnterIdleDuringBalancerNewSubConn(t *testing.T) {
channelz.TurnOn() channelz.TurnOn()
defer internal.ChannelzTurnOffForTesting() defer internal.ChannelzTurnOffForTesting()
enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn)) enterIdle := internal.EnterIdleModeForTesting.(func(*grpc.ClientConn))
name := strings.Replace(strings.ToLower(t.Name()), "/", "", -1) name := strings.ReplaceAll(strings.ToLower(t.Name()), "/", "")
// Create a balancer that calls NewSubConn once asynchronously, attempting // Create a balancer that calls NewSubConn once asynchronously, attempting
// to create a subchannel after going idle. // to create a subchannel after going idle.

2
stats/opencensus/opencensus.go
View File

@ -88,7 +88,7 @@ func ServerOption(to TraceOptions) grpc.ServerOption {
func (csh *clientStatsHandler) createCallSpan(ctx context.Context, method string) (context.Context, *trace.Span) { func (csh *clientStatsHandler) createCallSpan(ctx context.Context, method string) (context.Context, *trace.Span) {
var span *trace.Span var span *trace.Span
if !csh.to.DisableTrace { if !csh.to.DisableTrace {
mn := strings.Replace(removeLeadingSlash(method), "/", ".", -1) mn := strings.ReplaceAll(removeLeadingSlash(method), "/", ".")
ctx, span = trace.StartSpan(ctx, mn, trace.WithSampler(csh.to.TS), trace.WithSpanKind(trace.SpanKindClient)) ctx, span = trace.StartSpan(ctx, mn, trace.WithSampler(csh.to.TS), trace.WithSpanKind(trace.SpanKindClient))
} }
return ctx, span return ctx, span

4
stats/opencensus/trace.go
View File

@ -39,7 +39,7 @@ type traceInfo struct {
// about this span into gRPC Metadata. // about this span into gRPC Metadata.
func (csh *clientStatsHandler) traceTagRPC(ctx context.Context, rti *stats.RPCTagInfo) (context.Context, *traceInfo) { func (csh *clientStatsHandler) traceTagRPC(ctx context.Context, rti *stats.RPCTagInfo) (context.Context, *traceInfo) {
// TODO: get consensus on whether this method name of "s.m" is correct. // TODO: get consensus on whether this method name of "s.m" is correct.
mn := "Attempt." + strings.Replace(removeLeadingSlash(rti.FullMethodName), "/", ".", -1) mn := "Attempt." + strings.ReplaceAll(removeLeadingSlash(rti.FullMethodName), "/", ".")
// Returned context is ignored because will populate context with data that // Returned context is ignored because will populate context with data that
// wraps the span instead. Don't set span kind client on this attempt span // wraps the span instead. Don't set span kind client on this attempt span
// to prevent backend from prepending span name with "Sent.". // to prevent backend from prepending span name with "Sent.".
@ -57,7 +57,7 @@ func (csh *clientStatsHandler) traceTagRPC(ctx context.Context, rti *stats.RPCTa
// spanContext deserialized from context passed in (wire data in gRPC metadata) // spanContext deserialized from context passed in (wire data in gRPC metadata)
// if present. // if present.
func (ssh *serverStatsHandler) traceTagRPC(ctx context.Context, rti *stats.RPCTagInfo) (context.Context, *traceInfo) { func (ssh *serverStatsHandler) traceTagRPC(ctx context.Context, rti *stats.RPCTagInfo) (context.Context, *traceInfo) {
mn := strings.Replace(removeLeadingSlash(rti.FullMethodName), "/", ".", -1) mn := strings.ReplaceAll(removeLeadingSlash(rti.FullMethodName), "/", ".")
var span *trace.Span var span *trace.Span
if sc, ok := propagation.FromBinary(stats.Trace(ctx)); ok { if sc, ok := propagation.FromBinary(stats.Trace(ctx)); ok {

4
xds/server_test.go
View File

@ -410,7 +410,7 @@ func (s) TestServeSuccess(t *testing.T) {
case <-ctx.Done(): case <-ctx.Done():
t.Fatalf("Timeout when waiting for an LDS request to be sent out") t.Fatalf("Timeout when waiting for an LDS request to be sent out")
} }
wantNames := []string{strings.Replace(e2e.ServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)} wantNames := []string{strings.ReplaceAll(e2e.ServerListenerResourceNameTemplate, "%s", lis.Addr().String())}
if !cmp.Equal(gotNames, wantNames) { if !cmp.Equal(gotNames, wantNames) {
t.Fatalf("LDS watch registered for names %v, want %v", gotNames, wantNames) t.Fatalf("LDS watch registered for names %v, want %v", gotNames, wantNames)
} }
@ -647,7 +647,7 @@ func (s) TestHandleListenerUpdate_ErrorUpdate(t *testing.T) {
case <-ctx.Done(): case <-ctx.Done():
t.Fatalf("Timeout when waiting for an LDS request to be sent out") t.Fatalf("Timeout when waiting for an LDS request to be sent out")
} }
wantNames := []string{strings.Replace(e2e.ServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)} wantNames := []string{strings.ReplaceAll(e2e.ServerListenerResourceNameTemplate, "%s", lis.Addr().String())}
if !cmp.Equal(gotNames, wantNames) { if !cmp.Equal(gotNames, wantNames) {
t.Fatalf("LDS watch registered for names %v, want %v", gotNames, wantNames) t.Fatalf("LDS watch registered for names %v, want %v", gotNames, wantNames)
} }