Saving changes

Author: stuartpa

cmd/modern/root.go

@@ -89,6 +89,10 @@ func (c *Root) IsValidSubCommand(command string) bool {
 }
 
 func (c *Root) addGlobalFlags() {
+
+	// BUG:(stuartpa) - This is a temporary flag until we have migrated
+	// the kong impl to cobra.  sqlcmd -? will show the kong help (all the back-compat
+	// flags), sqlcmd --? will show the kong "did you mean one of" help.
 	var unused bool
 	c.AddFlag(cmdparser.FlagOptions{
 		Bool:      &unused,

cmd/modern/root/open/ads.go

@@ -38,13 +38,13 @@ func (c *Ads) DefineCommand(...cmdparser.CommandOptions) {
 func (c *Ads) run() {
 	endpoint, user := config.CurrentContext()
 
-	hostname := endpoint.EndpointDetails.Address
-
 	// If the context has a local container, ensure it is running, otherwise bail out
 	if endpoint.AssetDetails != nil && endpoint.AssetDetails.ContainerDetails != nil {
 		c.ensureContainerIsRunning(endpoint)
 	}
 
+	hostname := endpoint.EndpointDetails.Address
+
 	// If the hostname is localhost, ADS will not connect to the container
 	// because it will try to connect to the host machine. To work around
 	// BUG(stuartpa): I think this might be a bug in ADS?
@@ -75,7 +75,6 @@ func (c *Ads) ensureContainerIsRunning(endpoint sqlconfig.Endpoint) {
 // launchAds launches the Azure Data Studio using the specified server and username.
 func (c *Ads) launchAds(host string, port int, username string) {
 	output := c.Output()
-
 	args := []string{
 		"-r",
 		fmt.Sprintf(

internal/config/context.go

@@ -20,13 +20,15 @@ func AddContext(context Context) string {
 	if !EndpointExists(context.Endpoint) {
 		panic("Endpoint doesn't exist")
 	}
-
 	username := ""
-	if context.User != nil && *context.User != "" {
+	if context.User != nil {
 		username = *context.User
 	}
 	context.Name = FindUniqueContextName(context.Name, username)
 
+	// The command line parser sets user by default to "", in the case there
+	// is no user (therefore Windows Authentication), we omit the
+	// user from the sqlconfig file yaml by setting it to nil here.
 	if context.User != nil && *context.User == "" {
 		context.User = nil
 	}