update TODO

TODO.md

@@ -1,5 +1,6 @@
 # TODO
 
+- [ ] Test and troubleshoot GRPC Gateway supprot
 - [ ] Finish implementing GRPC service support
 - [ ] Expand config test case to cover GRPC config
 - [ ] Expand tracing

pkg/app/run.go

@@ -9,9 +9,6 @@ import (
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
 )
 
-// TODO: Make Configurable
-const GRPC_GW_API_PATH = "/api"
-
 func (a *App) Done() <-chan any {
 	return a.appDone
 }

pkg/app/run_grpc.go

@@ -25,7 +25,7 @@ func (a *App) runGRPC(ctx context.Context) {
 		}
 
 		a.HTTP.Handlers = append(a.HTTP.Handlers, opts.HTTPHandler{
-			Prefix:      GRPC_GW_API_PATH,
+			Prefix:      a.cfg.GRPC.GRPCGatewayPath,
 			StripPrefix: true,
 			Handler:     a.GRPC.GetGatewayMux(),
 		})

pkg/config/types_grpc.go

@@ -15,4 +15,6 @@ type GRPCConfig struct {
 	LogRequests           bool   `yaml:"logRequests" env:"APP_GRPC_LOG_REQUESTS" json:"logRequests,omitempty"`
 	EnableReflection      bool   `yaml:"enableReflection" env:"APP_GRPC_ENABLE_REFLECTION" json:"enableReflection,omitempty"`
 	EnableInstrumentation bool   `yaml:"enableInstrumentation" env:"APP_GRPC_ENABLE_INSTRUMENTATION" json:"enableInstrumentation,omitempty"` // requires OTEL
+	EnableGRPCGateway     bool   `yaml:"enableGRPCGateway" json:"enableGRPCGateway,omitempty" env:"APP_GRPC_ENABLE_GATEWAY" default:"true"`
+	GRPCGatewayPath       string `yaml:"grpcGatewayPath" json:"grpcGatewayPath,omitempty" env:"APP_GRPC_GATEWAY_PATH" default:"/grpc-api"`
 }

pkg/srv/grpc/gateway.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"

pkg/srv/grpc/grpc.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"

pkg/srv/grpc/opts/config.go

@@ -3,7 +3,7 @@ package opts
 import (
 	"context"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
@@ -25,12 +25,14 @@ type AppGRPC struct {
 }
 
 type GRPCService struct {
-	Name                string                                                             // Descriptive name of service
+	Name                string               // Descriptive name of service
-	Type                *grpc.ServiceDesc                                                  // Type (from protoc generated code)
+	Type                *grpc.ServiceDesc    // Type (from protoc generated code)
-	Service             any                                                                // Implementation of GRPCService.Type (ptr)
+	Service             any                  // Implementation of GRPCService.Type (ptr)
-	GwRegistrationFuncs []func(context.Context, *runtime.ServeMux, *grpc.ClientConn) error // Gateway regustration handler funcs
+	GwRegistrationFuncs []GwRegistrationFunc // Gateway regustration handler funcs
 }
 
+type GwRegistrationFunc func(context.Context, *runtime.ServeMux, *grpc.ClientConn) error
+
 func (a *AppGRPC) SetGatewayMux(mux *runtime.ServeMux) {
 	a.gatewayMux = mux
 }

pkg/srv/grpc/run.go

@@ -8,7 +8,6 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.27.0"
 )
 
-// TODO: Implement
 func (a *appGRPCServer) runGRPCServer(spanCtx context.Context) error {
 	_, span := a.tracer.Start(spanCtx, "appgrpc.init.start")
 	defer span.End()

pkg/srv/grpc/services.go

@@ -19,7 +19,9 @@ func (a *appGRPCServer) registerGRPCServices(ctx context.Context) {
 
 	for _, service := range a.opts.Services {
 		a.registerGRPCService(ctx, service)
-		a.registerServiceGatewayHandlers(ctx, service)
+		if a.opts.EnableGRPCGateway {
+			a.registerServiceGatewayHandlers(ctx, service)
+		}
 	}
 
 	span.SetStatus(codes.Ok, "")