PR feedback

Author: stuartpa

cmd/modern/root/query_test.go

@@ -9,12 +9,15 @@ import (
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
 	"github.com/stretchr/testify/assert"
 	"os"
+	"runtime"
 	"testing"
 )
 
 // TestQuery runs a sanity test of `sqlcmd query` using the local instance on 1433
 func TestQuery(t *testing.T) {
-	t.Skip("stuartpa: This is failing in the pipeline (Login failed for user 'sa'.)")
+	if runtime.GOOS != "windows" {
+		t.Skip("stuartpa: This is failing in the pipeline (Login failed for user 'sa'.)")
+	}
 	cmdparser.TestSetup(t)
 
 	// if SQLCMDSERVER != "" add an endpoint using the --address

internal/output/output.go

@@ -82,12 +82,8 @@ func (o Output) InfofWithHints(hints []string, format string, a ...any) {
 }
 
 // InfofWithHintExamples logs an info-level message with a given format and
-// arguments a. It also displays additional hints with example usage in the
-// output, using the displayHintExamples helper function. The message is
-// formatted using the ensureEol helper function to ensure that it ends with
-// a newline character. If the logging level is set to Debug, the message is prefixed
-// with "INFO: ". The displayHintExamples helper function formats the hints
-// for display and passes them to the hintCallback function for output.
+// arguments. It also displays additional hints with example usage in the
+// output.
 func (o Output) InfofWithHintExamples(hintExamples [][]string, format string, a ...any) {
 	if o.loggingLevel >= verbosity.Info {
 		format = o.ensureEol(format)

internal/secret/secret.go

@@ -51,18 +51,15 @@ func Decode(cipherText string, decryptPassword bool) (plainText string) {
 }
 
 // DecodeAsUtf16 takes a cipher text and a boolean indicating whether to decrypt
-// and returns the resulting plain text as a byte array in UTF-16LE format which
+// and returns the resulting plain text as a byte array in UTF-16 format which
 // is required when passing the secret to applications written using managed
 // code (C#), such as Azure Data Studio.
 func DecodeAsUtf16(cipherText string, decryptPassword bool) []byte {
 	var buf bytes.Buffer
 	secret := Decode(cipherText, decryptPassword)
 	runes := utf16.Encode([]rune(secret))
 
-	const BOM = '\ufffe' //LE BOM
 	var b [2]byte
-	b[0] = BOM >> 8
-	b[1] = BOM & 255
 	for _, r := range runes {
 		b[1] = byte(r >> 8)
 		b[0] = byte(r & 255)

internal/tools/tool/base.go

@@ -9,13 +9,12 @@ import (
 )
 
 type Base struct {
-	name              string
-	isInstalledCalled bool
-	installed         bool
-	lookPathError     error
-	exeName           string
-	exeFullPath       string
-	description       Description
+	name          string
+	installed     *bool
+	lookPathError error
+	exeName       string
+	exeFullPath   string
+	description   Description
 }
 
 func (t *Base) Init() {
@@ -51,8 +50,8 @@ func (t *Base) Where() string {
 }
 
 func (t *Base) IsInstalled() bool {
-	if t.isInstalledCalled {
-		return t.installed
+	if t.installed != nil {
+		return *t.installed
 	}
 
 	if t.exeName == "" {
@@ -62,12 +61,11 @@ func (t *Base) IsInstalled() bool {
 	t.exeFullPath, t.lookPathError = exec.LookPath(t.exeName)
 
 	if t.lookPathError == nil {
-		t.installed = true
+		t.installed = new(bool)
+		*t.installed = true
 	}
 
-	t.isInstalledCalled = true
-
-	return t.installed
+	return *t.installed
 }
 
 func (t *Base) HowToInstall() string {
@@ -94,7 +92,7 @@ func (t *Base) HowToInstall() string {
 }
 
 func (t *Base) Run(args []string) (int, error) {
-	if !t.isInstalledCalled {
+	if t.installed == nil {
 		panic("Call IsInstalled before Run")
 	}
 

internal/tools/tool/base_test.go

@@ -2,7 +2,6 @@ package tool
 
 import (
 	"github.com/stretchr/testify/assert"
-	"os"
 	"testing"
 )
 
@@ -38,18 +37,6 @@ func TestIsInstalled(t *testing.T) {
 	base := Base{}
 	defer func() { assert.NotNil(t, recover(), "The code did not panic as expected") }()
 	base.IsInstalled()
-
-	// Test when exeName is set, but LookPath returns an error
-	base = Base{exeName: "test_exe"}
-	base.isInstalledCalled = true
-	base.lookPathError = os.ErrNotExist
-	assert.True(t, base.IsInstalled())
-
-	// Test when exeName is set, and LookPath returns no error
-	base = Base{exeName: "test_exe"}
-	base.isInstalledCalled = true
-	base.lookPathError = nil
-	assert.False(t, base.IsInstalled())
 }
 
 func TestHowToInstall(t *testing.T) {