Fixed bug with setting current context correctly, if a context with the same name is added again

Author: Stuart Padley

cmd/modern/root/config/add-context.go

@@ -5,6 +5,7 @@ package config
 
 import (
 	"fmt"
+
 	"github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
 	"github.com/microsoft/go-sqlcmd/internal/config"
@@ -82,7 +83,7 @@ func (c *AddContext) run() {
 		}
 	}
 
-	config.AddContext(context)
+	context.Name = config.AddContext(context)
 	config.SetCurrentContextName(context.Name)
 	output.InfofWithHintExamples([][]string{
 		{"Open in Azure Data Studio", "sqlcmd open ads"},

internal/config/context.go

@@ -6,15 +6,17 @@ package config
 import (
 	"errors"
 	"fmt"
-	. "github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 	"strconv"
+
+	. "github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 )
 
-// AddContext adds the context to the sqlconfig file.
+// AddContext adds the context to the sqlconfig file, and returns the context
+// name, which maybe uniquified, if the passed in name already exists.
 //
 // Before calling this method, verify the Endpoint exists and give the user
 // a descriptive error, (this function will panic, which should never be hit)
-func AddContext(context Context) {
+func AddContext(context Context) string {
 	if !EndpointExists(context.Endpoint) {
 		panic("Endpoint doesn't exist")
 	}
@@ -25,6 +27,8 @@ func AddContext(context Context) {
 	context.Name = FindUniqueContextName(context.Name, username)
 	config.Contexts = append(config.Contexts, context)
 	Save()
+
+	return context.Name
 }
 
 // CurrentContextName returns the name of the current context in the configuration.