GRPC Client wrapper

AB#8170

grpcclient/client.go

@@ -0,0 +1,69 @@
+package grpcclient
+
+import (
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+type Client struct {
+	name    string
+	log     Logger
+	address string
+	conn    *grpc.ClientConn
+	options []grpc.DialOption
+}
+
+func (g *Client) Open() error {
+	if g.conn != nil {
+		return nil
+	}
+
+	var err error
+	var conn *grpc.ClientConn
+
+	g.log.Debugf("Open %s client at %v", g.name, g.address)
+	conn, err = grpc.Dial(g.address, g.options...)
+	if err != nil {
+		return err
+	}
+	g.conn = conn
+	g.log.Debugf("Open %s client successful", g.name)
+	return nil
+}
+
+func (g *Client) Close() {
+	if g.conn != nil {
+		g.log.Debugf("Close %s client at %v", g.name, g.address)
+		g.conn.Close()
+		g.conn = nil
+	}
+}
+
+func (g *Client) String() string {
+	return g.name
+}
+
+func (g *Client) Connector() *ClientConn {
+	return g.conn
+}
+
+type ClientOption func(*Client)
+
+func WithDialOptions(d ...DialOption) ClientOption {
+	return func(t *Client) {
+		t.options = append(t.options, d...)
+	}
+}
+
+func New(log Logger, name string, address string, opts ...ClientOption) *Client {
+	t := Client{
+		name:    name,
+		address: address,
+		log:     log.WithIndex("grpcclient", name),
+		options: []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())},
+	}
+	for _, opt := range opts {
+		opt(&t)
+	}
+	return &t
+}

grpcclient/grpc.go

@@ -0,0 +1,9 @@
+package grpcclient
+
+import (
+	"google.golang.org/grpc"
+)
+
+type UnaryClientInterceptor = grpc.UnaryClientInterceptor
+type DialOption = grpc.DialOption
+type ClientConn = grpc.ClientConn

grpcclient/interface.go

@@ -0,0 +1,7 @@
+package grpcclient
+
+type ClientProvider interface {
+	Open() error
+	Close()
+	String() string
+}

grpcclient/logger.go

@@ -0,0 +1,7 @@
+package grpcclient
+
+import (
+	"github.com/datatrails/go-datatrails-common/logger"
+)
+
+type Logger = logger.Logger

restproxyserver/restproxyserver.go

@@ -13,7 +13,6 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 )
 
 const (
@@ -159,9 +158,9 @@ func WithAppendedDialOption(d DialOption) RESTProxyServerOption {
 }
 
 // WithPrependedDialOption prepends a grpc dial option.
-func WithPrependedDialOption(d DialOption) RESTProxyServerOption {
+func WithPrependedDialOptions(d ...DialOption) RESTProxyServerOption {
 	return func(g *RESTProxyServer) {
-		g.dialOptions = append([]DialOption{d}, g.dialOptions...)
+		g.dialOptions = append(d, g.dialOptions...)
 	}
 }
 
@@ -186,7 +185,7 @@ func New(log Logger, name string, port string, opts ...RESTProxyServerOption) RE
 	g := RESTProxyServer{
 		name:        strings.ToLower(name),
 		port:        port,
-		dialOptions: []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())},
+		dialOptions: []grpc.DialOption{},
 		options:     []runtime.ServeMuxOption{},
 		filePaths:   []filePath{},
 		handlers:    []HandleChainFunc{},