Merge conflicts

Author: stuartpa

build/azure-pipelines/build-common.yml

@@ -50,7 +50,19 @@ steps:
   displayName: 'Go: build sqlcmd'
   inputs:
     command: 'build'
-    arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }} -ldflags="-X main.version=${{ parameters.VersionTag }}"'
+    arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }} -ldflags="-s -w -X main.version=${{ parameters.VersionTag }}"'
+    workingDirectory: '$(Build.SourcesDirectory)/cmd/modern'
+  env:
+      GOOS: ${{ parameters.OS }}
+      GOARCH: ${{ parameters.Arch }}
+      GOBIN: $(Build.SourcesDirectory)
+      CGO_ENABLED: 0 # Enables Docker image based off 'scratch'
+
+- task: Go@0
+  displayName: 'Go: build sqlcmd with debug symbols'
+  inputs:
+    command: 'build'
+    arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }}_debug -ldflags="-X main.version=${{ parameters.VersionTag }}"'
     workingDirectory: '$(Build.SourcesDirectory)/cmd/modern'
   env:
       GOOS: ${{ parameters.OS }}

cmd/modern/main.go

@@ -45,10 +45,32 @@ func main() {
 		cmdparser.Initialize(initializeCallback)
 		rootCmd.Execute()
 	} else {
+		initializeEnvVars()
 		legacyCmd.Execute(version)
 	}
 }
 
+// initializeEnvVars intializes SQLCMDSERVER, SQLCMDUSER and SQLCMDPASSWORD
+// if the currentContext is set and if these env vars are not already set.
+// In terms of precedence, command line switches/flags take higher precedence
+// than env variables and env variables take higher precedence over config
+// file info.
+func initializeEnvVars() {
+	initializeCallback()
+	if config.CurrentContextName() != "" {
+		server, username, password := config.GetCurrentContextInfo()
+		if os.Getenv("SQLCMDSERVER") == "" {
+			os.Setenv("SQLCMDSERVER", server)
+		}
+		if os.Getenv("SQLCMDUSER") == "" {
+			os.Setenv("SQLCMDUSER", username)
+		}
+		if os.Getenv("SQLCMDPASSWORD") == "" {
+			os.Setenv("SQLCMDPASSWORD", password)
+		}
+	}
+}
+
 // isFirstArgModernCliSubCommand is TEMPORARY code, to be removed when
 // we remove the Kong based CLI
 func isFirstArgModernCliSubCommand() (isNewCliCommand bool) {

internal/config/context.go

@@ -75,10 +75,12 @@ func CurrentContext() (endpoint Endpoint, user *User) {
 				}
 			}
 
-			for _, u := range config.Users {
-				if c.User != nil && u.Name == *c.User {
-					user = &u
-					break
+			if UserExists(c) {
+				for _, u := range config.Users {
+					if u.Name == *c.User {
+						user = &u
+						break
+					}
 				}
 			}
 		}
@@ -94,6 +96,23 @@ func CurrentContext() (endpoint Endpoint, user *User) {
 	return
 }
 
+// GetCurrentContextInfo returns endpoint and basic auth info
+// associated with current context
+func GetCurrentContextInfo() (server string, username string, password string) {
+	endpoint, user := CurrentContext()
+	server = fmt.Sprintf("%s,%d", endpoint.Address, endpoint.Port)
+	if user != nil {
+		username = user.BasicAuth.Username
+		if user.AuthenticationType == "basic" {
+			password = decryptCallback(
+				user.BasicAuth.Password,
+				user.BasicAuth.PasswordEncrypted,
+			)
+		}
+	}
+	return
+}
+
 // DeleteContext removes the context with the given name from the application's
 // configuration. If the context does not exist, the function does nothing. The
 // function also updates the CurrentContext field in the configuration to the

internal/config/user.go

@@ -5,8 +5,9 @@ package config
 
 import (
 	"fmt"
-	. "github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 	"strconv"
+
+	. "github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 )
 
 // AddUser adds a new user to the configuration.

pkg/sqlcmd/connect.go

@@ -127,7 +127,7 @@ func (connect ConnectSettings) ConnectionString() (connectionString string, err
 		query.Add("applicationintent", connect.ApplicationIntent)
 	}
 	if connect.LoginTimeoutSeconds > 0 {
-		query.Add("connection timeout", fmt.Sprint(connect.LoginTimeoutSeconds))
+		query.Add("dial timeout", fmt.Sprint(connect.LoginTimeoutSeconds))
 	}
 	if connect.PacketSize > 0 {
 		query.Add("packet size", fmt.Sprint(connect.PacketSize))

pkg/sqlcmd/sqlcmd_test.go

@@ -39,8 +39,8 @@ func TestConnectionStringFromSqlCmd(t *testing.T) {
 			"sqlserver://.?database=somedatabase&trustservercertificate=true&workstation+id=mystation",
 		},
 		{
-			&ConnectSettings{WorkstationName: "mystation", Encrypt: "false", Database: "somedatabase"},
-			"sqlserver://.?database=somedatabase&encrypt=false&workstation+id=mystation",
+			&ConnectSettings{WorkstationName: "mystation", Encrypt: "false", Database: "somedatabase", LoginTimeoutSeconds: 50},
+			"sqlserver://.?database=somedatabase&dial+timeout=50&encrypt=false&workstation+id=mystation",
 		},
 		{
 			&ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver\instance`, Database: "somedatabase", UserName: "someuser"},
@@ -631,10 +631,11 @@ func newConnect(t testing.TB) *ConnectSettings {
 }
 
 func TestSqlcmdPrefersSharedMemoryProtocol(t *testing.T) {
-	if runtime.GOOS != "windows" {
-		t.Skip()
+	if runtime.GOOS != "windows" || runtime.GOARCH != "amd64" {
+		t.Skip("Only valid on Windows amd64")
 	}
 	assert.EqualValuesf(t, "lpc", msdsn.ProtocolParsers[0].Protocol(), "lpc should be first protocol")
-	assert.EqualValuesf(t, "np", msdsn.ProtocolParsers[1].Protocol(), "np should be second protocol")
-	assert.EqualValuesf(t, "tcp", msdsn.ProtocolParsers[2].Protocol(), "tcp should be third protocol")
+	assert.EqualValuesf(t, "tcp", msdsn.ProtocolParsers[1].Protocol(), "tcp should be second protocol")
+	assert.EqualValuesf(t, "np", msdsn.ProtocolParsers[2].Protocol(), "np should be third protocol")
+
 }

pkg/sqlcmd/sqlcmd_windows_amd64.go

@@ -8,10 +8,11 @@ import (
 
 func init() {
 	if len(msdsn.ProtocolParsers) == 3 {
-		// reorder the protocol parsers to lpc->np->tcp
+		// reorder the protocol parsers to lpc->tcp->np
 		// ODBC follows this same order.
 		var tcp = msdsn.ProtocolParsers[0]
 		msdsn.ProtocolParsers[0] = msdsn.ProtocolParsers[2]
-		msdsn.ProtocolParsers[2] = tcp
+		msdsn.ProtocolParsers[2] = msdsn.ProtocolParsers[1]
+		msdsn.ProtocolParsers[1] = tcp
 	}
 }