Make port/portStr variables in cmd more consistent (#803)

snowflakedb · May 26, 2023 · 90cde5d · 90cde5d
1 parent 755ab1f
commit 90cde5d
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 29 deletions.
diff --git a/cmd/externalbrowser/externalbrowser.go b/cmd/externalbrowser/externalbrowser.go
@@ -26,19 +26,23 @@ func getDSN() (string, *sf.Config, error) {
 	account := env("SNOWFLAKE_TEST_ACCOUNT", true)
 	user := env("SNOWFLAKE_TEST_USER", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
-	portStr, err := strconv.Atoi(port)
-	if err != nil {
-		return "", nil, err
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 	cfg := &sf.Config{
 		Authenticator: sf.AuthTypeExternalBrowser,
 		Account:       account,
 		User:          user,
 		Host:          host,
-		Port:          portStr,
+		Port:          port,
 		Protocol:      protocol,
 	}
 

diff --git a/cmd/keepalive/keepalive.go b/cmd/keepalive/keepalive.go
@@ -31,23 +31,28 @@ func getDSN() (string, *sf.Config, error) {
 	user := env("SNOWFLAKE_TEST_USER", true)
 	password := env("SNOWFLAKE_TEST_PASSWORD", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
 	params := make(map[string]*string)
 	valueTrue := "true"
 	params["client_session_keep_alive"] = &valueTrue
 
-	portStr, err := strconv.Atoi(port)
-	if err != nil {
-		return "", nil, err
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
 	}
+
 	cfg := &sf.Config{
 		Account:  account,
 		User:     user,
 		Password: password,
 		Host:     host,
-		Port:     portStr,
+		Port:     port,
 		Protocol: protocol,
 		Params:   params,
 	}

diff --git a/cmd/keypair/keypair.go b/cmd/keypair/keypair.go
@@ -52,7 +52,6 @@ func getDSN() (string, *sf.Config, error) {
 	rsaPrivateKey, _ := privKey.(*rsa.PrivateKey)
 
 	port := 443 // snowflake default port
-	//var err error
 	if len(portStr) > 0 {
 		port, err = strconv.Atoi(portStr)
 		if err != nil {

diff --git a/cmd/mfa/mfa.go b/cmd/mfa/mfa.go
@@ -27,20 +27,24 @@ func getDSN() (string, *sf.Config, error) {
 	user := env("SNOWFLAKE_TEST_USER", true)
 	password := env("SNOWFLAKE_TEST_PASSWORD", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
-	portStr, err := strconv.Atoi(port)
-	if err != nil {
-		return "", nil, err
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 	cfg := &sf.Config{
 		Account:       account,
 		Authenticator: sf.AuthTypeUsernamePasswordMFA,
 		User:          user,
 		Host:          host,
 		Password:      password,
-		Port:          portStr,
+		Port:          port,
 		Protocol:      protocol,
 	}
 

diff --git a/cmd/noconnpool/noconnpool.go b/cmd/noconnpool/noconnpool.go
@@ -32,10 +32,17 @@ func getDSN() (string, *sf.Config, error) {
 	user := env("SNOWFLAKE_TEST_USER", true)
 	password := env("SNOWFLAKE_TEST_PASSWORD", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
-	portStr, err := strconv.Atoi(port)
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
+	}
 	if err != nil {
 		return "", nil, err
 	}
@@ -44,7 +51,7 @@ func getDSN() (string, *sf.Config, error) {
 		User:     user,
 		Password: password,
 		Host:     host,
-		Port:     portStr,
+		Port:     port,
 		Protocol: protocol,
 	}
 

diff --git a/cmd/selectmany/selectmany.go b/cmd/selectmany/selectmany.go
@@ -40,19 +40,23 @@ func getDSN() (string, *sf.Config, error) {
 	user := env("SNOWFLAKE_TEST_USER", true)
 	password := env("SNOWFLAKE_TEST_PASSWORD", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
-	portStr, err := strconv.Atoi(port)
-	if err != nil {
-		return "", nil, err
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 	cfg := &sf.Config{
 		Account:  account,
 		User:     user,
 		Password: password,
 		Host:     host,
-		Port:     portStr,
+		Port:     port,
 		Protocol: protocol,
 	}
 

diff --git a/cmd/showparam/showparam.go b/cmd/showparam/showparam.go
@@ -28,19 +28,23 @@ func getDSN(params map[string]*string) (string, *sf.Config, error) {
 	user := env("SNOWFLAKE_TEST_USER", true)
 	password := env("SNOWFLAKE_TEST_PASSWORD", true)
 	host := env("SNOWFLAKE_TEST_HOST", false)
-	port := env("SNOWFLAKE_TEST_PORT", false)
+	portStr := env("SNOWFLAKE_TEST_PORT", false)
 	protocol := env("SNOWFLAKE_TEST_PROTOCOL", false)
 
-	portStr, err := strconv.Atoi(port)
-	if err != nil {
-		return "", nil, err
+	port := 443 // snowflake default port
+	var err error
+	if len(portStr) > 0 {
+		port, err = strconv.Atoi(portStr)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 	cfg := &sf.Config{
 		Account:  account,
 		User:     user,
 		Password: password,
 		Host:     host,
-		Port:     portStr,
+		Port:     port,
 		Protocol: protocol,
 		Params:   params,
 	}