Feature: grpc cert option

Author: aopoltorzhicky

pkg/modules/grpc/client.go

@@ -11,7 +11,6 @@ import (
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc"
 	gogrpc "google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/keepalive"
 )
 
@@ -35,14 +34,22 @@ func (client *Client) Name() string {
 }
 
 // Connect - connects to server
-func (client *Client) Connect(ctx context.Context) error {
-	conn, err := gogrpc.Dial(
-		client.serverAddress,
-		gogrpc.WithTransportCredentials(insecure.NewCredentials()),
+func (client *Client) Connect(ctx context.Context, opts ...ConnectOption) error {
+	dialOpts := []gogrpc.DialOption{
 		gogrpc.WithKeepaliveParams(keepalive.ClientParameters{
 			Time:    20 * time.Second,
 			Timeout: 10 * time.Second,
 		}),
+	}
+	connectOpts := newConnectOptions()
+	for i := range opts {
+		opts[i](&connectOpts)
+	}
+	dialOpts = append(dialOpts, gogrpc.WithTransportCredentials(connectOpts.creds))
+
+	conn, err := gogrpc.Dial(
+		client.serverAddress,
+		dialOpts...,
 	)
 	if err != nil {
 		return errors.Wrap(err, "dial connection")
@@ -53,15 +60,23 @@ func (client *Client) Connect(ctx context.Context) error {
 }
 
 // WaitConnect - trying to connect to server
-func (client *Client) WaitConnect(ctx context.Context) error {
-	conn, err := gogrpc.Dial(
-		client.serverAddress,
+func (client *Client) WaitConnect(ctx context.Context, opts ...ConnectOption) error {
+	dialOpts := []gogrpc.DialOption{
 		gogrpc.WithBlock(),
-		gogrpc.WithTransportCredentials(insecure.NewCredentials()),
 		gogrpc.WithKeepaliveParams(keepalive.ClientParameters{
 			Time:    20 * time.Second,
 			Timeout: 10 * time.Second,
 		}),
+	}
+	connectOpts := newConnectOptions()
+	for i := range opts {
+		opts[i](&connectOpts)
+	}
+	dialOpts = append(dialOpts, gogrpc.WithTransportCredentials(connectOpts.creds))
+
+	conn, err := gogrpc.Dial(
+		client.serverAddress,
+		dialOpts...,
 	)
 	if err != nil {
 		return errors.Wrap(err, "dial connection")

pkg/modules/grpc/options.go

@@ -0,0 +1,29 @@
+package grpc
+
+import (
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+// ConnectOptions -
+type ConnectOptions struct {
+	creds credentials.TransportCredentials
+}
+
+func newConnectOptions() ConnectOptions {
+	return ConnectOptions{
+		creds: insecure.NewCredentials(),
+	}
+}
+
+// ConnectOption -
+type ConnectOption func(opts *ConnectOptions)
+
+// WithTlsFromCert -
+func WithTlsFromCert(domain string) ConnectOption {
+	return func(opts *ConnectOptions) {
+		if domain != "" {
+			opts.creds = credentials.NewClientTLSFromCert(nil, domain)
+		}
+	}
+}