Merger http/grpc servers into one binary

Author: shal

Dockerfile

@@ -17,9 +17,6 @@ COPY . .
 RUN export VERSION=$(cat VERSION) && \
     go build -ldflags "-X github.com/opencars/vin-decoder-api/pkg/version.Version=$VERSION" -o /go/bin/server ./cmd/server/main.go
 
-RUN export VERSION=$(cat VERSION) && \
-    go build -ldflags "-X github.com/opencars/vin-decoder-api/pkg/version.Version=$VERSION" -o /go/bin/grpc-server ./cmd/grpc-server/main.go
-
 FROM alpine
 
 RUN apk update && apk upgrade && apk add curl
@@ -28,5 +25,5 @@ WORKDIR /app
 
 COPY --from=build /go/bin/ ./
 
-EXPOSE 8080
+EXPOSE 8080 3000
 CMD ["./server"]

Makefile

@@ -1,5 +1,5 @@
 .PHONY: default all clean
-APPS     := server grpc-server
+APPS     := server
 BLDDIR   := bin
 VERSION  := $(shell cat VERSION)
 

cmd/grpc-server/main.go

@@ -9,7 +9,9 @@ import (
 
 	"github.com/opencars/schema/client"
 	"github.com/opencars/seedwork/logger"
+	"golang.org/x/sync/errgroup"
 
+	"github.com/opencars/vin-decoder-api/pkg/api/grpc"
 	"github.com/opencars/vin-decoder-api/pkg/api/http"
 	"github.com/opencars/vin-decoder-api/pkg/config"
 	"github.com/opencars/vin-decoder-api/pkg/domain/service"
@@ -18,7 +20,8 @@ import (
 
 func main() {
 	cfg := flag.String("config", "config/config.yaml", "Path to the configuration file")
-	port := flag.Int("port", 8080, "Port of the server")
+	httpPort := flag.Int("http-port", 8080, "Port for HTTP server")
+	grpcPort := flag.Int("grpc-port", 3000, "Port for gRPC server")
 
 	flag.Parse()
 
@@ -29,6 +32,13 @@ func main() {
 
 	logger.NewLogger(logger.LogLevel(conf.Log.Level), conf.Log.Mode == "dev")
 
+	// Initialize store
+	store, err := sqlstore.New(&conf.DB)
+	if err != nil {
+		logger.Fatalf("store: %v", err)
+	}
+
+	// Initialize NATS client
 	c, err := client.New(conf.NATS.Address())
 	if err != nil {
 		logger.Fatalf("nats: %v", err)
@@ -39,20 +49,36 @@ func main() {
 		logger.Fatalf("producer: %v", err)
 	}
 
-	store, err := sqlstore.New(&conf.DB)
-	if err != nil {
-		logger.Fatalf("store: %v", err)
-	}
-
-	svc := service.NewCustomerService(store.Manufacturer(), producer)
-
-	addr := ":" + strconv.Itoa(*port)
+	// Create services
+	customerSvc := service.NewCustomerService(store.Manufacturer(), producer)
+	internalSvc := service.NewInternalService(store.Manufacturer())
 
+	// Create context with cancellation
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 
-	logger.Infof("Listening on %s...", addr)
-	if err := http.Start(ctx, addr, &conf.Server, svc); err != nil {
-		logger.Fatalf("http server failed: %v", err)
+	// Create errgroup with cancellation
+	g, ctx := errgroup.WithContext(ctx)
+
+	// Start HTTP server
+	g.Go(func() error {
+		addr := ":" + strconv.Itoa(*httpPort)
+		logger.Infof("Starting HTTP server on %s...", addr)
+		return http.Start(ctx, addr, &conf.Server, customerSvc)
+	})
+
+	// Start gRPC server
+	g.Go(func() error {
+		addr := ":" + strconv.Itoa(*grpcPort)
+		logger.Infof("Starting gRPC server on %s...", addr)
+		api := grpc.New(addr, internalSvc)
+		return api.Run(ctx)
+	})
+
+	// Wait for interrupt signal or error from servers
+	logger.Infof("Servers started successfully. Press Ctrl+C to stop...")
+	if err := g.Wait(); err != nil {
+		logger.Fatalf("Server error: %v", err)
 	}
+	logger.Infof("Servers stopped gracefully")
 }

cmd/server/main.go

@@ -1,6 +1,8 @@
 module github.com/opencars/vin-decoder-api
 
-go 1.19
+go 1.23.0
+
+toolchain go1.23.2
 
 require (
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
@@ -32,6 +34,7 @@ require (
 	github.com/satori/go.uuid v1.2.0 // indirect
 	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
 	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
 	golang.org/x/text v0.3.6 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

go.mod

@@ -277,6 +277,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

go.sum

@@ -4,9 +4,7 @@ import (
 	"regexp"
 )
 
-var (
-	IsVIN = regexp.MustCompile(`^[A-HJ-NPR-Z0-9]{17}$`)
-)
+var IsVIN = regexp.MustCompile(`^[A-HJ-NPR-Z0-9]{17}$`)
 
 // Result is a union of information about vin-code and decoded vehicle.
 type Result struct {
@@ -35,6 +33,7 @@ type VIN struct {
 type Vehicle struct {
 	Manufacturer string `json:"manufacturer"`
 	Country      string `json:"country"`
+	CountryUA    string `json:"country_ua"`
 	Year         *uint  `json:"year,omitempty"`
 	Region       Region `json:"region"`
 	Check        bool   `json:"check"`