fix: remove deprecated dependencies (#1837)

* fix: remove deprecated dependencies

* backup

* fix test error
This commit is contained in:
Kevin Wan
2022-04-27 21:34:54 +08:00
committed by GitHub
parent c3a49ece8d
commit f7a60cdc24
11 changed files with 154 additions and 53 deletions

View File

@@ -5,6 +5,7 @@ import (
"strconv"
"strings"
"github.com/zeromicro/go-zero/zrpc/resolver/internal/targets"
"google.golang.org/grpc/resolver"
)
@@ -25,14 +26,15 @@ type Service struct {
// ParseTarget parses the resolver.Target.
func ParseTarget(target resolver.Target) (Service, error) {
var service Service
service.Namespace = target.Authority
service.Namespace = targets.GetAuthority(target)
if len(service.Namespace) == 0 {
service.Namespace = defaultNamespace
}
segs := strings.SplitN(target.Endpoint, colon, 2)
endpoints := targets.GetEndpoints(target)
segs := strings.SplitN(endpoints, colon, 2)
if len(segs) < 2 {
return emptyService, fmt.Errorf("bad endpoint: %s", target.Endpoint)
return emptyService, fmt.Errorf("bad endpoint: %s", endpoints)
}
service.Name = segs[0]