Feature grpc version echo api

cmd/podinfo/main.go

@@ -13,8 +13,8 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/stefanprodan/podinfo/pkg/api"
-	"github.com/stefanprodan/podinfo/pkg/grpc"
+	"github.com/stefanprodan/podinfo/pkg/api/grpc"
+	"github.com/stefanprodan/podinfo/pkg/api/http"
 	"github.com/stefanprodan/podinfo/pkg/signals"
 	"github.com/stefanprodan/podinfo/pkg/version"
 	go_grpc "google.golang.org/grpc"
@@ -138,11 +138,13 @@ func main() {
 	var grpcServer *go_grpc.Server
 	if grpcCfg.Port > 0 {
 		grpcSrv, _ := grpc.NewServer(&grpcCfg, logger)
+		//grpcinfoSrv, _ := grpc.NewInfoServer(&grpcCfg)
+
 		grpcServer = grpcSrv.ListenAndServe()
 	}
 
 	// load HTTP server config
-	var srvCfg api.Config
+	var srvCfg http.Config
 	if err := viper.Unmarshal(&srvCfg); err != nil {
 		logger.Panic("config unmarshal failed", zap.Error(err))
 	}
@@ -155,7 +157,7 @@ func main() {
 	)
 
 	// start HTTP server
-	srv, _ := api.NewServer(&srvCfg, logger)
+	srv, _ := http.NewServer(&srvCfg, logger)
 	httpServer, httpsServer, healthy, ready := srv.ListenAndServe()
 
 	// graceful shutdown

pkg/api/grpc/echo.go

@@ -0,0 +1,17 @@
+package grpc
+
+import (
+	"context"
+	"log"
+
+	"github.com/stefanprodan/podinfo/pkg/api/grpc/echo"
+)
+
+type echoServer struct {
+	 echo.UnimplementedEchoServiceServer
+}
+
+func (s *echoServer) Echo (ctx context.Context, message *echo.Message) (*echo.Message, error){
+	log.Printf("Received message body from client: %s", message.Body)
+	return &echo.Message {Body: message.Body}, nil
+}

pkg/api/grpc/echo/echo.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+option go_package = "./echo";
+
+package echo;
+
+message Message {
+    string body = 1;
+}
+
+
+service EchoService {
+    rpc Echo(Message) returns (Message) {}
+}

pkg/api/grpc/echo_test.go

@@ -0,0 +1,69 @@
+package grpc
+
+import (
+	"context"
+	"log"
+	"net"
+	"regexp"
+	"testing"
+
+	"github.com/stefanprodan/podinfo/pkg/api/grpc/echo"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/status"
+	"google.golang.org/grpc/test/bufconn"
+)
+
+func TestGrpcEcho(t *testing.T) {
+
+	// Server initialization
+	// bufconn => uses in-memory connection instead of system network I/O
+	lis := bufconn.Listen(1024*1024)
+	t.Cleanup(func() {
+		lis.Close()
+	})
+
+	srv := grpc.NewServer()
+	t.Cleanup(func() {
+		srv.Stop()
+	})
+
+	echo.RegisterEchoServiceServer(srv, &echoServer{})
+
+	go func(){
+		if err := srv.Serve(lis); err != nil {
+			log.Fatalf("srv.Serve %v", err)
+		}
+	}()
+
+	// - Test
+	dialer := func(context.Context, string) (net.Conn, error){
+		return lis.Dial()
+	}
+
+	ctx := context.Background()
+
+	conn, err := grpc.DialContext(ctx, "", grpc.WithContextDialer(dialer), grpc.WithInsecure())
+	t.Cleanup(func() {
+		conn.Close()
+	})
+
+	if err != nil {
+		t.Fatalf("grpc.DialContext %v", err)
+	}
+
+	client := echo.NewEchoServiceClient(conn)
+	res , err := client.Echo(context.Background(), &echo.Message{Body:"test123-test"})
+
+	// Check the status code is what we expect.
+	if _, ok := status.FromError(err); !ok {
+		t.Errorf("Echo returned type %T, want %T", err, status.Error)
+	}
+
+	// Check the response body is what we expect.
+	expected := ".*body.*test123-test.*"
+	r := regexp.MustCompile(expected)
+	if !r.MatchString(res.String()) {
+		t.Fatalf("Returned unexpected body:\ngot \n%v \nwant \n%s",
+			res, expected)
+	}
+}