cleanup: use testutils.MarshalAny in more places (#4404)

Author: dfawley

channelz/service/func_linux.go

@@ -25,6 +25,7 @@ import (
 	durpb "github.com/golang/protobuf/ptypes/duration"
 	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
 	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/testutils"
 )
 
 func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
@@ -34,41 +35,32 @@ func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
 func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
 	var opts []*channelzpb.SocketOption
 	if skopts.Linger != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionLinger{
-			Active:   skopts.Linger.Onoff != 0,
-			Duration: convertToPtypesDuration(int64(skopts.Linger.Linger), 0),
+		opts = append(opts, &channelzpb.SocketOption{
+			Name: "SO_LINGER",
+			Additional: testutils.MarshalAny(&channelzpb.SocketOptionLinger{
+				Active:   skopts.Linger.Onoff != 0,
+				Duration: convertToPtypesDuration(int64(skopts.Linger.Linger), 0),
+			}),
 		})
-		if err == nil {
-			opts = append(opts, &channelzpb.SocketOption{
-				Name:       "SO_LINGER",
-				Additional: additional,
-			})
-		}
 	}
 	if skopts.RecvTimeout != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
-			Duration: convertToPtypesDuration(int64(skopts.RecvTimeout.Sec), int64(skopts.RecvTimeout.Usec)),
+		opts = append(opts, &channelzpb.SocketOption{
+			Name: "SO_RCVTIMEO",
+			Additional: testutils.MarshalAny(&channelzpb.SocketOptionTimeout{
+				Duration: convertToPtypesDuration(int64(skopts.RecvTimeout.Sec), int64(skopts.RecvTimeout.Usec)),
+			}),
 		})
-		if err == nil {
-			opts = append(opts, &channelzpb.SocketOption{
-				Name:       "SO_RCVTIMEO",
-				Additional: additional,
-			})
-		}
 	}
 	if skopts.SendTimeout != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
-			Duration: convertToPtypesDuration(int64(skopts.SendTimeout.Sec), int64(skopts.SendTimeout.Usec)),
+		opts = append(opts, &channelzpb.SocketOption{
+			Name: "SO_SNDTIMEO",
+			Additional: testutils.MarshalAny(&channelzpb.SocketOptionTimeout{
+				Duration: convertToPtypesDuration(int64(skopts.SendTimeout.Sec), int64(skopts.SendTimeout.Usec)),
+			}),
 		})
-		if err == nil {
-			opts = append(opts, &channelzpb.SocketOption{
-				Name:       "SO_SNDTIMEO",
-				Additional: additional,
-			})
-		}
 	}
 	if skopts.TCPInfo != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTcpInfo{
+		additional := testutils.MarshalAny(&channelzpb.SocketOptionTcpInfo{
 			TcpiState:       uint32(skopts.TCPInfo.State),
 			TcpiCaState:     uint32(skopts.TCPInfo.Ca_state),
 			TcpiRetransmits: uint32(skopts.TCPInfo.Retransmits),
@@ -99,12 +91,10 @@ func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOptio
 			TcpiAdvmss:       skopts.TCPInfo.Advmss,
 			TcpiReordering:   skopts.TCPInfo.Reordering,
 		})
-		if err == nil {
-			opts = append(opts, &channelzpb.SocketOption{
-				Name:       "TCP_INFO",
-				Additional: additional,
-			})
-		}
+		opts = append(opts, &channelzpb.SocketOption{
+			Name:       "TCP_INFO",
+			Additional: additional,
+		})
 	}
 	return opts
 }

xds/csds/csds_test.go

@@ -34,10 +34,11 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/internal/testutils"
 	"google.golang.org/grpc/internal/xds"
 	"google.golang.org/grpc/xds/internal/client"
 	_ "google.golang.org/grpc/xds/internal/httpfilter/router"
-	"google.golang.org/grpc/xds/internal/testutils"
+	xtestutils "google.golang.org/grpc/xds/internal/testutils"
 	"google.golang.org/grpc/xds/internal/testutils/e2e"
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/anypb"
@@ -150,19 +151,19 @@ var (
 func init() {
 	for i := range ldsTargets {
 		listeners[i] = e2e.DefaultClientListener(ldsTargets[i], rdsTargets[i])
-		listenerAnys[i], _ = ptypes.MarshalAny(listeners[i])
+		listenerAnys[i] = testutils.MarshalAny(listeners[i])
 	}
 	for i := range rdsTargets {
 		routes[i] = e2e.DefaultRouteConfig(rdsTargets[i], ldsTargets[i], cdsTargets[i])
-		routeAnys[i], _ = ptypes.MarshalAny(routes[i])
+		routeAnys[i] = testutils.MarshalAny(routes[i])
 	}
 	for i := range cdsTargets {
 		clusters[i] = e2e.DefaultCluster(cdsTargets[i], edsTargets[i], e2e.SecurityLevelNone)
-		clusterAnys[i], _ = ptypes.MarshalAny(clusters[i])
+		clusterAnys[i] = testutils.MarshalAny(clusters[i])
 	}
 	for i := range edsTargets {
 		endpoints[i] = e2e.DefaultEndpoint(edsTargets[i], ips[i], ports[i])
-		endpointAnys[i], _ = ptypes.MarshalAny(endpoints[i])
+		endpointAnys[i] = testutils.MarshalAny(endpoints[i])
 	}
 }
 
@@ -286,9 +287,9 @@ func commonSetup(t *testing.T) (xdsClientInterfaceWithWatch, *e2e.ManagementServ
 	}
 	v3statuspbgrpc.RegisterClientStatusDiscoveryServiceServer(server, csdss)
 	// Create a local listener and pass it to Serve().
-	lis, err := testutils.LocalTCPListener()
+	lis, err := xtestutils.LocalTCPListener()
 	if err != nil {
-		t.Fatalf("testutils.LocalTCPListener() failed: %v", err)
+		t.Fatalf("xtestutils.LocalTCPListener() failed: %v", err)
 	}
 	go func() {
 		if err := server.Serve(lis); err != nil {