Correct format specifier for port (#489)

Author: apoorvdeshmukh

cmd/modern/root/config/connection-strings.go

@@ -58,11 +58,11 @@ func (c *ConnectionStrings) run() {
 
 	// connectionStringFormats borrowed from "portal.azure.com" "connection strings" pane
 	var connectionStringFormats = map[string]string{
-		"ADO.NET": "Server=tcp:%s,%d;Initial Catalog=%s;Persist Security Info=False;User ID=%s;Password=%s;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=%s;Connection Timeout=30;",
-		"JDBC":    "jdbc:sqlserver://%s:%d;database=%s;user=%s;password=%s;encrypt=true;trustServerCertificate=%s;loginTimeout=30;",
-		"ODBC":    "Driver={ODBC Driver 18 for SQL Server};Server=tcp:%s,%d;Database=%s;Uid=%s;Pwd=%s;Encrypt=yes;TrustServerCertificate=%s;Connection Timeout=30;",
+		"ADO.NET": "Server=tcp:%s,%#v;Initial Catalog=%s;Persist Security Info=False;User ID=%s;Password=%s;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=%s;Connection Timeout=30;",
+		"JDBC":    "jdbc:sqlserver://%s:%#v;database=%s;user=%s;password=%s;encrypt=true;trustServerCertificate=%s;loginTimeout=30;",
+		"ODBC":    "Driver={ODBC Driver 18 for SQL Server};Server=tcp:%s,%#v;Database=%s;Uid=%s;Pwd=%s;Encrypt=yes;TrustServerCertificate=%s;Connection Timeout=30;",
 		"GO":      "sqlserver://%s:%s@%s,%d?database=%s;encrypt=true;trustServerCertificate=%s;dial+timeout=30",
-		"SQLCMD":  "sqlcmd -S %s,%d -U %s",
+		"SQLCMD":  "sqlcmd -S %s,%#v -U %s",
 	}
 
 	endpoint, user := config.CurrentContext()

cmd/modern/root/install/mssql-base.go

@@ -391,7 +391,7 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 	hints = append(hints, []string{localizer.Sprintf("Remove"), "sqlcmd delete"})
 
 	output.InfoWithHintExamples(hints,
-		localizer.Sprintf("Now ready for client connections on port %d",
+		localizer.Sprintf("Now ready for client connections on port %#v",
 			c.port),
 	)
 }

cmd/modern/root/open/ads.go

@@ -71,7 +71,7 @@ func (c *Ads) launchAds(host string, port int, username string) {
 		"-r",
 		fmt.Sprintf(
 			"--server=%s", fmt.Sprintf(
-				"%s,%d",
+				"%s,%#v",
 				host,
 				port)),
 	}

cmd/modern/root/open/ads_windows.go

@@ -39,7 +39,7 @@ func (c *Ads) persistCredentialForAds(
 ) {
 	// Create the target name that ADS will look for
 	targetName := c.adsKey(
-		fmt.Sprintf("%s,%d", hostname, rune(endpoint.Port)),
+		fmt.Sprintf("%s,%#v", hostname, rune(endpoint.Port)),
 		"", // The default database is set on the user login
 		"SqlLogin",
 		user.BasicAuth.Username)

internal/net/net.go

@@ -16,7 +16,7 @@ func IsLocalPortAvailable(port int) (portAvailable bool) {
 
 	hostPort := net.JoinHostPort("localhost", strconv.Itoa(port))
 	trace(
-		"Checking if local port %d is available using DialTimeout(tcp, %v, timeout: %d)",
+		"Checking if local port %#v is available using DialTimeout(tcp, %v, timeout: %d)",
 		port,
 		hostPort,
 		timeout,
@@ -28,7 +28,7 @@ func IsLocalPortAvailable(port int) (portAvailable bool) {
 	)
 	if err != nil {
 		trace(
-			"Expected connecting error '%v' on local port %d, therefore port is available)",
+			"Expected connecting error '%v' on local port %#v, therefore port is available)",
 			err,
 			port,
 		)
@@ -37,9 +37,9 @@ func IsLocalPortAvailable(port int) (portAvailable bool) {
 	if conn != nil {
 		err := conn.Close()
 		checkErr(err)
-		trace("Local port '%d' is not available", port)
+		trace("Local port '%#v' is not available", port)
 	} else {
-		trace("Local port '%d' is available", port)
+		trace("Local port '%#v' is available", port)
 	}
 
 	return

internal/net/net_test.go

@@ -17,10 +17,10 @@ func TestIsLocalPortAvailable(t *testing.T) {
 		isPortAvailable := IsLocalPortAvailable(i)
 		if isPortAvailable {
 			testedPortAvailable = true
-			t.Logf("Port %d is available", i)
+			t.Logf("Port %#v is available", i)
 		} else {
 			testedNotPortAvailable = true
-			t.Logf("Port %d is not available", i)
+			t.Logf("Port %#v is not available", i)
 		}
 		if testedPortAvailable && testedNotPortAvailable {
 			return

internal/sql/mssql.go

@@ -35,7 +35,7 @@ func (m *mssql) Connect(
 	m.sqlcmd.Format = sqlcmd.NewSQLCmdDefaultFormatter(false, sqlcmd.ControlIgnore)
 	connect := sqlcmd.ConnectSettings{
 		ServerName: fmt.Sprintf(
-			"%s,%d",
+			"%s,%#v",
 			endpoint.EndpointDetails.Address,
 			endpoint.EndpointDetails.Port),
 		ApplicationName: "sqlcmd",

internal/translations/catalog.go

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/de-DE/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/en-US/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/es-ES/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/fr-FR/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/it-IT/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/ja-JP/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/ko-KR/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/pt-BR/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/ru-RU/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,

internal/translations/locales/zh-CN/out.gotext.json

@@ -2127,7 +2127,7 @@
             "placeholders": [
                 {
                     "id": "Port",
-                    "string": "%[1]d",
+                    "string": "%#[1]v",
                     "type": "int",
                     "underlyingType": "int",
                     "argNum": 1,