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

internal: use strings.Replace instead strings.ReplaceAll (#4279) 

strings.ReplaceAll is only available after go 1.12. We still support go 1.11.
This commit is contained in:
Menghan Li 2021-03-18 16:01:39 -07:00 committed by GitHub
parent 967933baf5
commit bce1cded4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/server.go
View File

@ -204,7 +204,7 @@ func (s *GRPCServer) Serve(lis net.Listener) error {
}
name := cfg.ServerListenerResourceNameTemplate
if strings.Contains(cfg.ServerListenerResourceNameTemplate, "%s") {
name = strings.ReplaceAll(cfg.ServerListenerResourceNameTemplate, "%s", lis.Addr().String())
name = strings.Replace(cfg.ServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)
}
// Create a listenerWrapper which handles all functionality required by

8
xds/server_test.go
View File

@ -334,7 +334,7 @@ func (s) TestServeSuccess(t *testing.T) {
if err != nil {
t.Fatalf("error when waiting for a ListenerWatch: %v", err)
}
wantName := strings.ReplaceAll(testServerListenerResourceNameTemplate, "%s", lis.Addr().String())
wantName := strings.Replace(testServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)
if name != wantName {
t.Fatalf("LDS watch registered for name %q, want %q", name, wantName)
}
@ -421,7 +421,7 @@ func (s) TestServeWithStop(t *testing.T) {
server.Stop()
t.Fatalf("error when waiting for a ListenerWatch: %v", err)
}
wantName := strings.ReplaceAll(testServerListenerResourceNameTemplate, "%s", lis.Addr().String())
wantName := strings.Replace(testServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)
if name != wantName {
server.Stop()
t.Fatalf("LDS watch registered for name %q, wantPrefix %q", name, wantName)
@ -618,7 +618,7 @@ func (s) TestHandleListenerUpdate_NoXDSCreds(t *testing.T) {
if err != nil {
t.Fatalf("error when waiting for a ListenerWatch: %v", err)
}
wantName := strings.ReplaceAll(testServerListenerResourceNameTemplate, "%s", lis.Addr().String())
wantName := strings.Replace(testServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)
if name != wantName {
t.Fatalf("LDS watch registered for name %q, want %q", name, wantName)
}
@ -696,7 +696,7 @@ func (s) TestHandleListenerUpdate_ErrorUpdate(t *testing.T) {
if err != nil {
t.Fatalf("error when waiting for a ListenerWatch: %v", err)
}
wantName := strings.ReplaceAll(testServerListenerResourceNameTemplate, "%s", lis.Addr().String())
wantName := strings.Replace(testServerListenerResourceNameTemplate, "%s", lis.Addr().String(), -1)
if name != wantName {
t.Fatalf("LDS watch registered for name %q, want %q", name, wantName)
}