etcdclient: remove decodeMeta from membersFromUpdates

To resolve errors after removing Metadata field from Endpoint struct which was causing integration tests to fail.

Signed-off-by: Nico Wong <nicowong8@gmail.com>

Author: nicomwong

server/proxy/grpcproxy/cluster.go

@@ -17,7 +17,6 @@ package grpcproxy
 import (
 	"context"
 	"errors"
-	"fmt"
 	"os"
 	"sync"
 
@@ -138,18 +137,14 @@ func (cp *clusterProxy) MemberUpdate(ctx context.Context, r *pb.MemberUpdateRequ
 	return cp.clus.MemberUpdate(ctx, r)
 }
 
-func (cp *clusterProxy) membersFromUpdates() ([]*pb.Member, error) {
+func (cp *clusterProxy) membersFromUpdates() []*pb.Member {
 	cp.umu.RLock()
 	defer cp.umu.RUnlock()
 	mbs := make([]*pb.Member, 0, len(cp.umap))
 	for _, upt := range cp.umap {
-		m, err := decodeMeta(fmt.Sprint())
-		if err != nil {
-			return nil, err
-		}
-		mbs = append(mbs, &pb.Member{Name: m.Name, ClientURLs: []string{upt.Addr}})
+		mbs = append(mbs, &pb.Member{Name: "", ClientURLs: []string{upt.Addr}})
 	}
-	return mbs, nil
+	return mbs
 }
 
 // MemberList wraps member list API with following rules:
@@ -160,10 +155,7 @@ func (cp *clusterProxy) membersFromUpdates() ([]*pb.Member, error) {
 func (cp *clusterProxy) MemberList(ctx context.Context, r *pb.MemberListRequest) (*pb.MemberListResponse, error) {
 	if cp.advaddr != "" {
 		if cp.prefix != "" {
-			mbs, err := cp.membersFromUpdates()
-			if err != nil {
-				return nil, err
-			}
+			mbs := cp.membersFromUpdates()
 			if len(mbs) > 0 {
 				return &pb.MemberListResponse{Members: mbs}, nil
 			}

server/proxy/grpcproxy/register.go

@@ -15,8 +15,6 @@
 package grpcproxy
 
 import (
-	"encoding/json"
-
 	"go.uber.org/zap"
 	"golang.org/x/time/rate"
 
@@ -84,14 +82,3 @@ func registerSession(lg *zap.Logger, c *clientv3.Client, prefix string, addr str
 	)
 	return ss, nil
 }
-
-// meta represents metadata of proxy register.
-type meta struct {
-	Name string `json:"name"`
-}
-
-func decodeMeta(s string) (meta, error) {
-	m := meta{}
-	err := json.Unmarshal([]byte(s), &m)
-	return m, err
-}

tests/integration/proxy/grpcproxy/cluster_test.go

@@ -16,7 +16,6 @@ package grpcproxy
 
 import (
 	"net"
-	"os"
 	"testing"
 	"time"
 
@@ -42,7 +41,6 @@ func TestClusterProxyMemberList(t *testing.T) {
 	lg := zaptest.NewLogger(t)
 	serverEps := []string{clus.Members[0].GRPCURL}
 	prefix := "test-prefix"
-	hostname, _ := os.Hostname()
 	cts := newClusterProxyServer(lg, serverEps, prefix, t)
 	defer cts.close(t)
 
@@ -63,7 +61,7 @@ func TestClusterProxyMemberList(t *testing.T) {
 
 	require.Lenf(t, mresp.Members, 1, "len(mresp.Members) expected 1, got %d (%+v)", len(mresp.Members), mresp.Members)
 	require.Lenf(t, mresp.Members[0].ClientURLs, 1, "len(mresp.Members[0].ClientURLs) expected 1, got %d (%+v)", len(mresp.Members[0].ClientURLs), mresp.Members[0].ClientURLs[0])
-	assert.Contains(t, mresp.Members, &pb.Member{Name: hostname, ClientURLs: []string{cts.caddr}})
+	assert.Contains(t, mresp.Members, &pb.Member{Name: "", ClientURLs: []string{cts.caddr}})
 
 	// test proxy member add
 	newMemberAddr := "127.0.0.2:6789"
@@ -75,7 +73,7 @@ func TestClusterProxyMemberList(t *testing.T) {
 	mresp, err = client.Cluster.MemberList(t.Context())
 	require.NoErrorf(t, err, "err %v, want nil", err)
 	require.Lenf(t, mresp.Members, 2, "len(mresp.Members) expected 2, got %d (%+v)", len(mresp.Members), mresp.Members)
-	assert.Contains(t, mresp.Members, &pb.Member{Name: hostname, ClientURLs: []string{newMemberAddr}})
+	assert.Contains(t, mresp.Members, &pb.Member{Name: "", ClientURLs: []string{newMemberAddr}})
 
 	// test proxy member delete
 	deregisterMember(cts.c, prefix, newMemberAddr, t)
@@ -86,7 +84,7 @@ func TestClusterProxyMemberList(t *testing.T) {
 	mresp, err = client.Cluster.MemberList(t.Context())
 	require.NoErrorf(t, err, "err %v, want nil", err)
 	require.Lenf(t, mresp.Members, 1, "len(mresp.Members) expected 1, got %d (%+v)", len(mresp.Members), mresp.Members)
-	assert.Contains(t, mresp.Members, &pb.Member{Name: hostname, ClientURLs: []string{cts.caddr}})
+	assert.Contains(t, mresp.Members, &pb.Member{Name: "", ClientURLs: []string{cts.caddr}})
 }
 
 type clusterproxyTestServer struct {