pg-sidecar-service: minor error handling fixes, new build (#1122)

This fixes some uses of logrus.Fatal inside a function that returns an
error to its caller.

But, this also has the side-effect of rebuilding the package. We
haven't shipped pg-sidecar-service in a while. Because of the bug
fixed in #1111 we think that many installations likely have a small
problem where not all of pg-sidecar-service's dependencies are
installed. Shipping a new version will fix since the update
dependencies will get installed on upgrade.

Signed-off-by: Steven Danna <[email protected]>

Author: stevendanna

components/pg-sidecar-service/cmd/pg-sidecar-service/commands/serve.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"context"
-	"os"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -29,7 +28,7 @@ var serveCmd = &cobra.Command{
 		*/
 
 		if err = server.StartGRPC(context.Background(), conf); err != nil {
-			os.Exit(1)
+			log.Fatal(err)
 		}
 	},
 }

components/pg-sidecar-service/pkg/server/server.go

@@ -8,6 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/reflection"
@@ -27,20 +28,17 @@ import (
 func StartGRPC(ctx context.Context, cfg *Config) error {
 	tlsOpts, err := cfg.ReadCerts()
 	if err != nil {
-		logrus.WithError(err).Fatal("failed to load SSL key/cert files")
-		return err
+		return errors.Wrap(err, "failed to load SSL key/cert files")
 	}
 
 	platformConfig, err := platform.ConfigFromEnvironment()
 	if err != nil {
-		logrus.WithError(err).Fatal("failed to load platform config")
-		return err
+		return errors.Wrap(err, "failed to load platform config")
 	}
 
 	listener, err := net.Listen("tcp", cfg.ListenAddress())
 	if err != nil {
-		logrus.WithError(err).Fatalf("failed to listen on address %s", cfg.ListenAddress())
-		return err
+		return errors.Wrapf(err, "failed to listen on address %s", cfg.ListenAddress())
 	}
 
 	connFactory := secureconn.NewFactory(*tlsOpts, secureconn.WithVersionInfo(
@@ -75,9 +73,7 @@ func StartGRPC(ctx context.Context, cfg *Config) error {
 		os.Exit(0)
 	}()
 
-	grpcServer.Serve(listener)
-
-	return nil
+	return grpcServer.Serve(listener)
 }
 
 // PGSidecarServerOpt is a functional option for configuring the PGSidecarServer