From c2e01ea9b65c4ee63df36b416aeb1e2d45dc61f7 Mon Sep 17 00:00:00 2001 From: Sahil Badla Date: Tue, 16 Jan 2024 10:01:48 -0800 Subject: [PATCH] feat: enable rest/http support Signed-off-by: Sahil Badla --- cmd/serve/serve.go | 6 +++--- pkg/server/server.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/serve/serve.go b/cmd/serve/serve.go index 712d0c3..0622fe7 100644 --- a/cmd/serve/serve.go +++ b/cmd/serve/serve.go @@ -33,7 +33,7 @@ var ( port string metricsPort string backend string - enableRest bool + enableHttp bool ) var ServeCmd = &cobra.Command{ @@ -127,7 +127,7 @@ var ServeCmd = &cobra.Command{ Backend: aiProvider.Name, Port: port, MetricsPort: metricsPort, - EnableRest: enableRest, + EnableHttp: enableHttp, Token: aiProvider.Password, Logger: logger, } @@ -155,5 +155,5 @@ func init() { ServeCmd.Flags().StringVarP(&port, "port", "p", "8080", "Port to run the server on") ServeCmd.Flags().StringVarP(&metricsPort, "metrics-port", "", "8081", "Port to run the metrics-server on") ServeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider") - ServeCmd.Flags().BoolVarP(&enableRest, "enable-REST", "r", false, "Enable REST api using gppc-gateway") + ServeCmd.Flags().BoolVarP(&enableHttp, "enable-http", "http", false, "Enable REST/http using gppc-gateway") } diff --git a/pkg/server/server.go b/pkg/server/server.go index cb4fec0..27d4fe3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -49,7 +49,7 @@ type Config struct { Logger *zap.Logger metricsServer *http.Server listener net.Listener - EnableRest bool + EnableHttp bool } type Health struct { @@ -97,8 +97,8 @@ func (s *Config) Serve() error { reflection.Register(grpcServer) rpc.RegisterServerServiceServer(grpcServer, s.Handler) - if s.EnableRest { - s.Logger.Info("enabling rest api") + if s.EnableHttp { + s.Logger.Info("enabling rest/http api") gwmux := runtime.NewServeMux() err = rpc.RegisterServerServiceHandlerFromEndpoint(context.Background(), gwmux, fmt.Sprintf("localhost:%s", s.Port), []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}) if err != nil {