Add support for additional data types and improve observability

Makefile

@@ -1,9 +1,9 @@
 unit-test:
 	go test -race -v ./...
 
-test: unit-test
+test: generate-sources unit-test
 
-build: download-deps tidy-deps fmt test compile
+build: download-deps tidy-deps fmt test lint compile
 
 fmt: ## Run the code formatter
 	gofmt -l -s -w .
@@ -20,3 +20,15 @@ update-deps:
 
 compile:
 	go build -v ./...
+
+install-binary-dependencies:
+	go list -tags=tools -f '{{ join .Imports "\n" }}' ./tools | xargs go get -v
+	go list -tags=tools -f '{{ join .Imports "\n" }}' ./tools | xargs go install -v
+	go mod tidy
+
+generate-sources: install-binary-dependencies
+	go generate -v ./...
+
+lint: fmt install-binary-dependencies
+	golangci-lint run
+	goreleaser check

cmd/root.go

@@ -45,7 +45,9 @@ func main() {
 
 func runRootCommand(_ *cobra.Command, _ []string) error {
 	logger := constructLogger()
-	defer logger.Sync()
+	defer func(logger *zap.Logger) {
+		_ = logger.Sync()
+	}(logger)
 	cfg, err := config.LoadDefaultConfig(context.Background())
 	if err != nil {
 		return fmt.Errorf("error while loading aws config: %w", err)
@@ -78,6 +80,7 @@ func constructLogger() *zap.Logger {
 	productionConfig.EncoderConfig.TimeKey = "timestamp"
 	productionConfig.EncoderConfig.EncodeTime = zapcore.RFC3339NanoTimeEncoder
 	productionConfig.Level = zap.NewAtomicLevelAt(logLevel())
+	productionConfig.DisableStacktrace = true
 	logger, _ := productionConfig.Build()
 	return logger
 }

pkg/listener.go

@@ -26,12 +26,19 @@ func NewPostgresRedshiftDataAPIProxy(listenAddress string, simpleQueryFn wire.Si
 }
 
 func (proxy *postgresRedshiftProxy) Run() error {
-	server, err := wire.NewServer(wire.Logger(proxy.logger), wire.SimpleQuery(proxy.simpleQueryFn), wire.ClientAuth(tls.NoClientCert))
+	server, err := wire.NewServer(
+		wire.Logger(proxy.logger),
+		wire.SimpleQuery(proxy.simpleQueryFn),
+		wire.ClientAuth(tls.NoClientCert))
 	if err != nil {
+		proxy.logger.Error("error while instantiating server", zap.Error(err))
 		return fmt.Errorf("error while instantiating server: %w", err)
 	}
 	err = server.ListenAndServe(proxy.listenAddress)
 	if err != nil {
+		proxy.logger.Error("error while listening to listen address",
+			zap.String("listenAddress", proxy.listenAddress),
+			zap.Error(err))
 		return fmt.Errorf("error while listening to %s: %w", proxy.listenAddress, err)
 	}
 	return nil

pkg/rdapp_test.go

@@ -5,47 +5,52 @@ import (
 	"github.com/jackc/pgx/v4"
 	wire "github.com/jeroenrinzema/psql-wire"
 	rdapp "github.com/kishaningithub/rdapp/pkg"
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"testing"
 )
 
-func TestRedshiftDataAPIProxy(t *testing.T) {
+var (
+	_ suite.SetupAllSuite    = (*RedshiftDataAPIProxyTestSuite)(nil)
+	_ suite.TearDownAllSuite = (*RedshiftDataAPIProxyTestSuite)(nil)
+)
+
+type RedshiftDataAPIProxyTestSuite struct {
+	suite.Suite
+	conn *pgx.Conn
+}
+
+func TestRedshiftDataAPIProxyTestSuite(t *testing.T) {
+	suite.Run(t, new(RedshiftDataAPIProxyTestSuite))
+}
+
+func (suite *RedshiftDataAPIProxyTestSuite) SetupSuite() {
 	listenAddress := "localhost:25432"
-	logger := constructLogger(t)
+	logger := zap.NewExample()
 	go func() {
 		logger.Info("Starting test instance of postgres redshift proxy...")
 		err := rdapp.NewPostgresRedshiftDataAPIProxy(listenAddress, func(ctx context.Context, query string, writer wire.DataWriter, parameters []string) error {
 			return writer.Complete("OK")
 		}, logger).Run()
-		require.NoError(t, err)
+		suite.Require().NoError(err)
 	}()
 	databaseUrl := "postgres://postgres:mypassword@localhost:25432/postgres"
 	conn, err := pgx.Connect(context.Background(), databaseUrl)
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, conn.Close(context.Background()))
-	})
-
-	t.Run("test connectivity", func(t *testing.T) {
-		connInfo := conn.Config()
-		require.Equal(t, "localhost", connInfo.Host)
-	})
-
-	t.Run("test query execution", func(t *testing.T) {
-		rows, err := conn.Query(context.Background(), "select name, weight from widgets limit 1")
-		require.NoError(t, err)
-		require.NoError(t, rows.Err())
-	})
+	suite.Require().NoError(err)
+	suite.conn = conn
+}
+
+func (suite *RedshiftDataAPIProxyTestSuite) TearDownSuite() {
+	_ = suite.conn.Close(context.Background())
+}
+
+func (suite *RedshiftDataAPIProxyTestSuite) TestConnectivity() {
+	connInfo := suite.conn.Config()
+	suite.Require().Equal("localhost", connInfo.Host)
 }
 
-func constructLogger(t *testing.T) *zap.Logger {
-	t.Helper()
-	productionConfig := zap.NewProductionConfig()
-	productionConfig.EncoderConfig.TimeKey = "timestamp"
-	productionConfig.EncoderConfig.EncodeTime = zapcore.RFC3339NanoTimeEncoder
-	productionConfig.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
-	logger, _ := productionConfig.Build()
-	return logger
+func (suite *RedshiftDataAPIProxyTestSuite) TestQueryExecution() {
+	rows, err := suite.conn.Query(context.Background(), "select name, weight from widgets limit 1")
+	suite.Require().NoError(err)
+	suite.Require().NoError(rows.Err())
 }