Merge branches

Author: dgiagio

connector.go

@@ -63,16 +63,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 		CanUseMultipleCatalogs: &c.cfg.CanUseMultipleCatalogs,
 	})
 	if err != nil {
-		return nil, dbsqlerrint.NewRequestError(
-			ctx,
-			fmt.Sprintf(
-				"error connecting: host=%s port=%d, httpPath=%s",
-				c.cfg.Host,
-				c.cfg.Port,
-				c.cfg.HTTPPath,
-			),
-			err,
-		)
+		return nil, dbsqlerrint.NewRequestError(ctx, fmt.Sprintf("error connecting: host=%s port=%d, httpPath=%s", c.cfg.Host, c.cfg.Port, c.cfg.HTTPPath), err)
 	}
 
 	conn := &conn{
@@ -83,8 +74,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 	}
 	log := logger.WithContext(conn.id, driverctx.CorrelationIdFromContext(ctx), "")
 
-	log.Info().
-		Msgf("connect: host=%s port=%d httpPath=%s serverProtocolVersion=0x%X", c.cfg.Host, c.cfg.Port, c.cfg.HTTPPath, session.ServerProtocolVersion)
+	log.Info().Msgf("connect: host=%s port=%d httpPath=%s serverProtocolVersion=0x%X", c.cfg.Host, c.cfg.Port, c.cfg.HTTPPath, session.ServerProtocolVersion)
 
 	return conn, nil
 }
@@ -251,10 +241,7 @@ func WithSessionParams(params map[string]string) ConnOption {
 func WithSkipTLSHostVerify() ConnOption {
 	return func(c *config.Config) {
 		if c.TLSConfig == nil {
-			c.TLSConfig = &tls.Config{
-				MinVersion:         tls.VersionTLS12,
-				InsecureSkipVerify: true,
-			} // #nosec G402
+			c.TLSConfig = &tls.Config{MinVersion: tls.VersionTLS12, InsecureSkipVerify: true} // #nosec G402
 		} else {
 			c.TLSConfig.InsecureSkipVerify = true // #nosec G402
 		}

internal/config/config.go

@@ -10,14 +10,14 @@ import (
 	"strings"
 	"time"
 
+	dbsqlerr "github.com/databricks/databricks-sql-go/errors"
 	"github.com/pkg/errors"
 
 	"github.com/databricks/databricks-sql-go/auth"
 	"github.com/databricks/databricks-sql-go/auth/noop"
 	"github.com/databricks/databricks-sql-go/auth/oauth/m2m"
 	"github.com/databricks/databricks-sql-go/auth/oauth/u2m"
 	"github.com/databricks/databricks-sql-go/auth/pat"
-	dbsqlerr "github.com/databricks/databricks-sql-go/errors"
 	"github.com/databricks/databricks-sql-go/internal/cli_service"
 	dbsqlerrint "github.com/databricks/databricks-sql-go/internal/errors"
 	"github.com/databricks/databricks-sql-go/logger"
@@ -198,6 +198,7 @@ func WithDefaults() *Config {
 		ThriftProtocolVersion:     cli_service.TProtocolVersion_SPARK_CLI_SERVICE_PROTOCOL_V8,
 		ThriftDebugClientProtocol: false,
 	}
+
 }
 
 // ParseDSN constructs UserConfig and CloudFetchConfig by parsing DSN string supplied to `sql.Open()`
@@ -208,22 +209,14 @@ func ParseDSN(dsn string) (UserConfig, error) {
 	}
 	parsedURL, err := url.Parse(fullDSN)
 	if err != nil {
-		return UserConfig{}, dbsqlerrint.NewRequestError(
-			context.TODO(),
-			dbsqlerr.ErrInvalidDSNFormat,
-			err,
-		)
+		return UserConfig{}, dbsqlerrint.NewRequestError(context.TODO(), dbsqlerr.ErrInvalidDSNFormat, err)
 	}
 	ucfg := UserConfig{}.WithDefaults()
 	ucfg.Protocol = parsedURL.Scheme
 	ucfg.Host = parsedURL.Hostname()
 	port, err := strconv.Atoi(parsedURL.Port())
 	if err != nil {
-		return UserConfig{}, dbsqlerrint.NewRequestError(
-			context.TODO(),
-			dbsqlerr.ErrInvalidDSNPort,
-			err,
-		)
+		return UserConfig{}, dbsqlerrint.NewRequestError(context.TODO(), dbsqlerr.ErrInvalidDSNPort, err)
 	}
 	ucfg.Port = port
 
@@ -402,11 +395,7 @@ func (params *extractableParams) extractAsInt(key string) (int, bool, error) {
 	if intString, ok := extractParam(key, params, false, true); ok {
 		i, err := strconv.Atoi(intString)
 		if err != nil {
-			return 0, true, dbsqlerrint.NewRequestError(
-				context.TODO(),
-				dbsqlerr.InvalidDSNFormat(key, intString, "int"),
-				err,
-			)
+			return 0, true, dbsqlerrint.NewRequestError(context.TODO(), dbsqlerr.InvalidDSNFormat(key, intString, "int"), err)
 		}
 
 		return i, true, nil
@@ -419,11 +408,7 @@ func (params *extractableParams) extractAsBool(key string) (bool, bool, error) {
 	if boolString, ok := extractParam(key, params, false, true); ok {
 		b, err := strconv.ParseBool(boolString)
 		if err != nil {
-			return false, true, dbsqlerrint.NewRequestError(
-				context.TODO(),
-				dbsqlerr.InvalidDSNFormat(key, boolString, "bool"),
-				err,
-			)
+			return false, true, dbsqlerrint.NewRequestError(context.TODO(), dbsqlerr.InvalidDSNFormat(key, boolString, "bool"), err)
 		}
 
 		return b, true, nil
@@ -437,12 +422,7 @@ func (params *extractableParams) getNoCase(key string) (string, bool) {
 	return extractParam(key, params, true, false)
 }
 
-func extractParam(
-	key string,
-	params *extractableParams,
-	ignoreCase bool,
-	delValue bool,
-) (string, bool) {
+func extractParam(key string, params *extractableParams, ignoreCase bool, delValue bool) (string, bool) {
 	if ignoreCase {
 		key = strings.ToLower(key)
 	}