[3.4] backport 12675: Cleanup grpc clientv3/naming API

Signed-off-by: Chao Chen <chaochn@amazon.com>
etcd-io · Oct 20, 2023 · d8be61d · d8be61d
1 parent 9b18c4f
commit d8be61d
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 330 deletions.
diff --git a/clientv3/naming/endpoints/endpoints_impl.go b/clientv3/naming/endpoints/endpoints_impl.go
@@ -55,7 +55,7 @@ func (m *endpointManager) Update(ctx context.Context, updates []*UpdateWithOpts)
 	ops := make([]clientv3.Op, 0, len(updates))
 	for _, update := range updates {
 		if !strings.HasPrefix(update.Key, m.target+"/") {
-			return status.Errorf(codes.InvalidArgument, "endpoints: endpoint key should be prefixed with %s/", m.target)
+			return status.Errorf(codes.InvalidArgument, "endpoints: endpoint key should be prefixed with '%s/' got: '%s'", m.target, update.Key)
 		}
 		switch update.Op {
 		case Add:

diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go
diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go