Bug Bash feedback

stuartpa · stuartpa · commit cfea96b88b08 · 2023-02-21T02:31:23.000-08:00
diff --git a/cmd/modern/root.go b/cmd/modern/root.go
@@ -25,7 +25,7 @@ type Root struct {
 // It also provides usage examples for sqlcmd.
 func (c *Root) DefineCommand(...cmdparser.CommandOptions) {
 	// Example usage steps
-	steps := []string{"sqlcmd create mssql --using https://aka.ms/AdventureWorksLT.bak"}
+	steps := []string{"sqlcmd create mssql --accept-eula --using https://aka.ms/AdventureWorksLT.bak"}
 
 	if runtime.GOOS == "windows" {
 		steps = append(steps, "sqlcmd open ads")
@@ -39,8 +39,11 @@ func (c *Root) DefineCommand(...cmdparser.CommandOptions) {
 		Steps:       steps}}
 
 	commandOptions := cmdparser.CommandOptions{
-		Use:         "sqlcmd",
-		Short:       "sqlcmd: Install/Create/Query SQL Server, Azure SQL, and Tools",
+		Use: "sqlcmd",
+		Short: `sqlcmd: Install/Create/Query SQL Server, Azure SQL, and Tools
+
+Feedback:
+  https://github.com/microsoft/go-sqlcmd/issues/new`,
 		SubCommands: c.SubCommands(),
 		Examples:    examples,
 	}
@@ -86,6 +89,14 @@ func (c *Root) IsValidSubCommand(command string) bool {
 }
 
 func (c *Root) addGlobalFlags() {
+	var unused bool
+	c.AddFlag(cmdparser.FlagOptions{
+		Bool:      &unused,
+		Name:      "?",
+		Shorthand: "?",
+		Usage:     "help for backwards compatibility flags (-S, -U, -E etc.)",
+	})
+
 	c.AddFlag(cmdparser.FlagOptions{
 		String:        &c.configFilename,
 		DefaultString: config.DefaultFileName(),
diff --git a/cmd/modern/root/config.go b/cmd/modern/root/config.go
@@ -4,8 +4,10 @@
 package root
 
 import (
+	"fmt"
 	"github.com/microsoft/go-sqlcmd/cmd/modern/root/config"
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
+	"github.com/microsoft/go-sqlcmd/internal/pal"
 )
 
 // Config defines the `sqlcmd config` sub-commands
@@ -20,6 +22,17 @@ func (c *Config) DefineCommand(...cmdparser.CommandOptions) {
 		Use:         "config",
 		Short:       `Modify sqlconfig files using subcommands like "sqlcmd config use-context mssql"`,
 		SubCommands: c.SubCommands(),
+		Examples: []cmdparser.ExampleOptions{
+			{
+				Description: "Add context for existing endpoint and user",
+				Steps: []string{
+					fmt.Sprintf("%s SQLCMD_PASSWORD=<password>", pal.CreateEnvVarKeyword()),
+					"sqlcmd config add-user --name sa1434 --username sa",
+					fmt.Sprintf("%s SQLCMD_PASSWORD=", pal.CreateEnvVarKeyword()),
+					"sqlcmd config add-endpoint --name ep1434 --address localhost --port 1434",
+					"sqlcmd config add-context --name mssql1434 --user sa1434 --endpoint ep1434"},
+			},
+		},
 	}
 
 	c.Cmd.DefineCommand(options)
diff --git a/cmd/modern/root/config/add-context.go b/cmd/modern/root/config/add-context.go
@@ -26,10 +26,10 @@ func (c *AddContext) DefineCommand(...cmdparser.CommandOptions) {
 		Short: "Add a context",
 		Examples: []cmdparser.ExampleOptions{
 			{
-				Description: "Add a default context",
+				Description: "Add a context for a local instance of SQL Server on port 1433 using trusted authentication",
 				Steps: []string{
 					"sqlcmd config add-endpoint --name localhost-1433",
-					"sqlcmd config add-context --name my-context --endpoint localhost-1433"}},
+					"sqlcmd config add-context --name mssql --endpoint localhost-1433"}},
 		},
 		Run: c.run}
 
@@ -44,12 +44,12 @@ func (c *AddContext) DefineCommand(...cmdparser.CommandOptions) {
 	c.AddFlag(cmdparser.FlagOptions{
 		String: &c.endpointName,
 		Name:   "endpoint",
-		Usage:  "Name of endpoint this context will use, use `sqlcmd config get-endpoints` to see list"})
+		Usage:  "Name of endpoint this context will use"})
 
 	c.AddFlag(cmdparser.FlagOptions{
 		String: &c.userName,
 		Name:   "user",
-		Usage:  "Name of user this context will use, use `sqlcmd config get-users` to see list"})
+		Usage:  "Name of user this context will use"})
 }
 
 // run adds a context to the configuration and sets it as the current context. The
diff --git a/cmd/modern/root/config/add-user.go b/cmd/modern/root/config/add-user.go
@@ -4,7 +4,9 @@
 package config
 
 import (
+	"fmt"
 	"github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
+	"github.com/microsoft/go-sqlcmd/internal/pal"
 	"os"
 
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
@@ -30,8 +32,10 @@ func (c *AddUser) DefineCommand(...cmdparser.CommandOptions) {
 			{
 				Description: "Add a user",
 				Steps: []string{
-					`SET SQLCMD_PASSWORD="AComp!exPa$$w0rd"`,
-					"sqlcmd config add-user --name my-user --name user1"},
+					fmt.Sprintf(`%s SQLCMD_PASSWORD=<password>`, pal.CreateEnvVarKeyword()),
+					"sqlcmd config add-user --name my-user --username user1",
+					fmt.Sprintf(`%s SQLCMD_PASSWORD=`, pal.CreateEnvVarKeyword()),
+				},
 			},
 		},
 		Run: c.run}
diff --git a/cmd/modern/root/config/add-user_windows.go b/cmd/modern/root/config/add-user_windows.go
@@ -9,6 +9,6 @@ func (c *AddUser) encryptPasswordFlag() {
 	c.AddFlag(cmdparser.FlagOptions{
 		Bool:  &c.encryptPassword,
 		Name:  "encrypt-password",
-		Usage: "Encode the password",
+		Usage: "Encrypt the password",
 	})
 }
diff --git a/cmd/modern/root/config/view.go b/cmd/modern/root/config/view.go
@@ -21,15 +21,15 @@ func (c *View) DefineCommand(...cmdparser.CommandOptions) {
 		Short: "Display merged sqlconfig settings or a specified sqlconfig file",
 		Examples: []cmdparser.ExampleOptions{
 			{
-				Description: "Show merged sqlconfig settings",
+				Description: "Show sqlconfig settings, with REDACTED authentication data",
 				Steps:       []string{"sqlcmd config view"},
 			},
 			{
-				Description: "Show merged sqlconfig settings and raw authentication data",
+				Description: "Show sqlconfig settings and raw authentication data",
 				Steps:       []string{"sqlcmd config view --raw"},
 			},
 		},
-		Aliases: []string{"use", "change-context", "set-context"},
+		Aliases: []string{"show"},
 		Run:     c.run,
 	}
 
diff --git a/cmd/modern/root/open/ads.go b/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,6 +75,7 @@ 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(
diff --git a/cmd/modern/root/open/ads_windows.go b/cmd/modern/root/open/ads_windows.go
@@ -2,10 +2,10 @@ package open
 
 import (
 	"fmt"
-	"github.com/99designs/keyring"
 	"github.com/microsoft/go-sqlcmd/cmd/modern/sqlconfig"
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
 	"github.com/microsoft/go-sqlcmd/internal/credman"
+	"github.com/microsoft/go-sqlcmd/internal/secret"
 )
 
 // Type Ads is used to implement the "open ads" which launches Azure
@@ -33,7 +33,7 @@ func (c *Ads) persistCredentialForAds(
 
 	// Store the SQL password in the Windows Credential Manager with the
 	// generated target name
-	/*c.credential = credman.Credential{
+	c.credential = credman.Credential{
 		TargetName: targetName,
 		CredentialBlob: secret.DecodeAsUtf16(
 			user.BasicAuth.Password, user.BasicAuth.PasswordEncrypted),
@@ -43,15 +43,6 @@ func (c *Ads) persistCredentialForAds(
 
 	c.removePreviousCredential()
 	c.writeCredential()
-	*/
-	ring, _ := keyring.Open(keyring.Config{
-		ServiceName: "example",
-	})
-
-	_ = ring.Set(keyring.Item{
-		Key:  "foo",
-		Data: []byte("secret-bar"),
-	})
 }
 
 // adsKey returns the credential target name for the given instance, database,
@@ -86,6 +77,13 @@ func (c *Ads) removePreviousCredential() {
 
 // writeCredential stores the current instance's credential in the Windows Credential Manager
 func (c *Ads) writeCredential() {
+	output := c.Output()
+
 	err := credman.WriteCredential(&c.credential, credman.CredTypeGeneric)
-	c.CheckErr(err)
+	if err != nil {
+		output.FatalfErrorWithHints(
+			err,
+			[]string{"A 'Not enough memory resources are available' error can be caused by too many credentials already stored in Windows Credential Manager"},
+			"Failed to write credential to Windows Credential Manager")
+	}
 }
diff --git a/cmd/sqlcmd/sqlcmd.go b/cmd/sqlcmd/sqlcmd.go
@@ -61,7 +61,7 @@ type SQLCmdArguments struct {
 	MultiSubnetFailover         bool              `short:"M" help:"Provided for backward compatibility. Sqlcmd always optimizes detection of the active replica of a SQL Failover Cluster."`
 	Password                    string            `short:"P" help:"Obsolete. The initial passwords must be set using the SQLCMDPASSWORD environment variable or entered at the password prompt."`
 	// Keep Help at the end of the list
-	Help bool `short:"?" help:"Show syntax summary."`
+	Help bool `short:"?" help:"-? shows this syntax summary, --help shows modern sqlcmd sub-command help"`
 }
 
 // Validate accounts for settings not described by Kong attributes
diff --git a/go.mod b/go.mod
@@ -16,28 +16,34 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.1
-	golang.org/x/sys v0.0.0-20220908164124-27713097b956
+	golang.org/x/sys v0.3.0
 	golang.org/x/text v0.4.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
+	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
+	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -47,6 +53,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/term v0.0.0-20221120202655-abb19827d345 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
@@ -66,6 +73,7 @@ require (
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/term v0.3.0 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
diff --git a/go.sum b/go.sum
@@ -36,6 +36,10 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
+github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
+github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
+github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2 h1:lneMk5qtUMulXa/eVxjVd+/bDYMEDIqYpLzLa2/EsNI=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
@@ -71,6 +75,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
+github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -90,6 +96,8 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
+github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -106,6 +114,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
+github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -185,6 +195,8 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
+github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -238,7 +250,10 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
+github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
@@ -462,14 +477,19 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -635,6 +655,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
diff --git a/internal/cmdparser/cmd.go b/internal/cmdparser/cmd.go
@@ -238,7 +238,7 @@ func (c *Cmd) generateExamples() string {
 	for i, e := range c.options.Examples {
 		sb.WriteString(fmt.Sprintf("# %v%v", e.Description, pal.LineBreak()))
 		for ii, s := range e.Steps {
-			sb.WriteString(fmt.Sprintf("  - %v", s))
+			sb.WriteString(fmt.Sprintf("  %v", s))
 			if ii != len(e.Steps)-1 {
 				sb.WriteString(pal.LineBreak())
 			}
diff --git a/internal/config/context.go b/internal/config/context.go
@@ -25,8 +25,12 @@ func AddContext(context Context) string {
 	if context.User != nil && *context.User != "" {
 		username = *context.User
 	}
-
 	context.Name = FindUniqueContextName(context.Name, username)
+
+	if context.User != nil && *context.User == "" {
+		context.User = nil
+	}
+
 	config.Contexts = append(config.Contexts, context)
 	Save()
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ func (c *AddUser) encryptPasswordFlag() {`
`9`	`9`	`c.AddFlag(cmdparser.FlagOptions{`
`10`	`10`	`Bool: &c.encryptPassword,`
`11`	`11`	`Name: "encrypt-password",`
`12`		`- Usage: "Encode the password",`
	`12`	`+ Usage: "Encrypt the password",`
`13`	`13`	`})`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ func (c *View) DefineCommand(...cmdparser.CommandOptions) {`
`21`	`21`	`Short: "Display merged sqlconfig settings or a specified sqlconfig file",`
`22`	`22`	`Examples: []cmdparser.ExampleOptions{`
`23`	`23`	`{`
`24`		`- Description: "Show merged sqlconfig settings",`
	`24`	`+ Description: "Show sqlconfig settings, with REDACTED authentication data",`
`25`	`25`	`Steps: []string{"sqlcmd config view"},`
`26`	`26`	`},`
`27`	`27`	`{`
`28`		`- Description: "Show merged sqlconfig settings and raw authentication data",`
	`28`	`+ Description: "Show sqlconfig settings and raw authentication data",`
`29`	`29`	`Steps: []string{"sqlcmd config view --raw"},`
`30`	`30`	`},`
`31`	`31`	`},`
`32`		`- Aliases: []string{"use", "change-context", "set-context"},`
	`32`	`+ Aliases: []string{"show"},`
`33`	`33`	`Run: c.run,`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ type SQLCmdArguments struct {`
`61`	`61`	MultiSubnetFailover bool `short:"M" help:"Provided for backward compatibility. Sqlcmd always optimizes detection of the active replica of a SQL Failover Cluster."`
`62`	`62`	Password string `short:"P" help:"Obsolete. The initial passwords must be set using the SQLCMDPASSWORD environment variable or entered at the password prompt."`
`63`	`63`	`// Keep Help at the end of the list`
`64`		- Help bool `short:"?" help:"Show syntax summary."`
	`64`	+ Help bool `short:"?" help:"-? shows this syntax summary, --help shows modern sqlcmd sub-command help"`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// Validate accounts for settings not described by Kong attributes`