From 817a10d2695f7074f5c5de36fcf7c7a9fcc0e96e Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Fri, 26 Nov 2021 20:01:34 +0100 Subject: [PATCH] Move TLS config to Server struct --- backend/server/server.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/backend/server/server.go b/backend/server/server.go index 0182f36..1c0f5d9 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -18,7 +18,6 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" - "google.golang.org/grpc/credentials" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/durationpb" ) @@ -273,6 +272,10 @@ func Start(options Options) error { log.Infof("Listening at %s", options.Config.BindAddr) + if options.Config.TLSCertFile != "" && options.Config.TLSKeyFile != "" { + return httpServer.ListenAndServeTLS(options.Config.TLSCertFile, options.Config.TLSKeyFile) + } + return httpServer.ListenAndServe() } @@ -300,18 +303,8 @@ func buildGRPCServer(c config.Config, logger *zap.Logger) (*grpc.Server, error) streamInterceptors = append(streamInterceptors, grpcrecovery.StreamServerInterceptor(panicOpts...)) } - options := []grpc.ServerOption{ + return grpc.NewServer( grpc.StreamInterceptor(grpcmiddleware.ChainStreamServer(streamInterceptors...)), grpc.UnaryInterceptor(grpcmiddleware.ChainUnaryServer(unaryInterceptors...)), - } - - if c.TLSCertFile != "" && c.TLSKeyFile != "" { - creds, err := credentials.NewServerTLSFromFile(c.TLSCertFile, c.TLSKeyFile) - if err != nil { - return nil, fmt.Errorf("error building credentials: %v", err) - } - options = append(options, grpc.Creds(creds)) - } - - return grpc.NewServer(options...), nil + ), nil }