Use pop store to ping the db instead of making a new connection

pkg/cli/dbconn.go

@@ -13,7 +13,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/service/rds"
 	pop "github.com/gobuffalo/pop/v6"
-	"github.com/jmoiron/sqlx"
 	"github.com/luna-duclos/instrumentedsql"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
@@ -391,6 +390,10 @@ func InitDatabase(v *viper.Viper, creds *credentials.Credentials, logger *zap.Lo
 	return connection, nil
 }
 
+type pinger interface {
+	Ping() error
+}
+
 // testConnection tests the connection to determine successful ping
 func testConnection(dbConnDetails *pop.ConnectionDetails, useIam bool, logger *zap.Logger) error {
 	// Copy connection info as we don't want to alter connection info
@@ -433,16 +436,15 @@ func testConnection(dbConnDetails *pop.ConnectionDetails, useIam bool, logger *z
 		return err
 	}
 
-	// Check the connection
-	db, err := sqlx.Open(connection.Dialect.Details().Dialect, connection.Dialect.URL())
-	if err != nil {
-		logger.Warn("Failed to open DB by driver name", zap.Error(err))
-		return err
+	dbWithPinger, ok := connection.Store.(pinger)
+	if !ok {
+		logger.Error("Failed to convert to pinger interface")
+		return errors.New("Failed to convert to pinger interface")
 	}
 
 	// Make the db ping
 	logger.Info("Starting database ping....")
-	err = db.Ping()
+	err = dbWithPinger.Ping()
 	if err != nil {
 		logger.Warn("Failed to ping DB connection", zap.Error(err))
 		return err