contrib/registry/zookeeper: fix invalid searching prefix (#3598)

cruelchen · web-flow · commit 1e8f4287af40 · 2024-05-22T21:12:21.000+08:00
diff --git a/contrib/registry/zookeeper/zookeeper_discovery.go b/contrib/registry/zookeeper/zookeeper_discovery.go
@@ -19,7 +19,7 @@ import (
 
 // Search searches and returns services with specified condition.
 func (r *Registry) Search(_ context.Context, in gsvc.SearchInput) ([]gsvc.Service, error) {
-	prefix := strings.TrimPrefix(strings.ReplaceAll(in.Prefix, "/", "-"), "-")
+	prefix := strings.Trim(strings.ReplaceAll(in.Prefix, "/", "-"), "-")
 	instances, err, _ := r.group.Do(prefix, func() (interface{}, error) {
 		serviceNamePath := path.Join(r.opts.namespace, prefix)
 		servicesID, _, err := r.conn.Children(serviceNamePath)
diff --git a/contrib/registry/zookeeper/zookeeper_registrar.go b/contrib/registry/zookeeper/zookeeper_registrar.go
@@ -31,7 +31,7 @@ func (r *Registry) Register(_ context.Context, service gsvc.Service) (gsvc.Servi
 			r.opts.namespace,
 		)
 	}
-	prefix := strings.TrimPrefix(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-")
+	prefix := strings.Trim(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-")
 	servicePrefixPath := path.Join(r.opts.namespace, prefix)
 	if err = r.ensureName(servicePrefixPath, []byte(""), 0); err != nil {
 		return service, gerror.Wrapf(

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (r *Registry) Register(_ context.Context, service gsvc.Service) (gsvc.Servi`
`31`	`31`	`r.opts.namespace,`
`32`	`32`	`)`
`33`	`33`	`}`
`34`		`- prefix := strings.TrimPrefix(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-")`
	`34`	`+ prefix := strings.Trim(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-")`
`35`	`35`	`servicePrefixPath := path.Join(r.opts.namespace, prefix)`
`36`	`36`	`if err = r.ensureName(servicePrefixPath, []byte(""), 0); err != nil {`
`37`	`37`	`return service, gerror.Wrapf(`