Replaced %q with %s

cmd/kubectx/delete.go

@@ -21,7 +21,7 @@ func (op DeleteOp) Run(_, stderr io.Writer) error {
 		// TODO inefficency here. we open/write/close the same file many times.
 		deletedName, wasActiveContext, err := deleteContext(ctx)
 		if err != nil {
-			return errors.Wrapf(err, "error deleting context %q", deletedName)
+			return errors.Wrapf(err, "error deleting context \"%s\"", deletedName)
 		}
 		if wasActiveContext {
 			printer.Warning(stderr, "You deleted the current context. Use \"%s\" to select a new context.",

cmd/kubectx/fzf.go

@@ -54,6 +54,6 @@ func (op InteractiveSwitchOp) Run(_, stderr io.Writer) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to switch context")
 	}
-	printer.Success(stderr, "Switched to context %q.", printer.SuccessColor.Sprint(name))
+	printer.Success(stderr, "Switched to context \"%s\".", printer.SuccessColor.Sprint(name))
 	return nil
 }

cmd/kubectx/help_test.go

@@ -14,10 +14,10 @@ func TestPrintHelp(t *testing.T) {
 
 	out := buf.String()
 	if !strings.Contains(out, "USAGE:") {
-		t.Errorf("help string doesn't contain USAGE: ; output=%q", out)
+		t.Errorf("help string doesn't contain USAGE: ; output=\"%s\"", out)
 	}
 
 	if !strings.HasSuffix(out, "\n") {
-		t.Errorf("does not end with New line; output=%q", out)
+		t.Errorf("does not end with New line; output=\"%s\"", out)
 	}
 }

cmd/kubectx/rename.go

@@ -47,11 +47,11 @@ func (op RenameOp) Run(_, stderr io.Writer) error {
 	}
 
 	if !kc.ContextExists(op.Old) {
-		return errors.Errorf("context %q not found, can't rename it", op.Old)
+		return errors.Errorf("context \"%s\" not found, can't rename it", op.Old)
 	}
 
 	if kc.ContextExists(op.New) {
-		printer.Warning(stderr, "context %q exists, overwriting it.", op.New)
+		printer.Warning(stderr, "context \"%s\" exists, overwriting it.", op.New)
 		if err := kc.DeleteContextEntry(op.New); err != nil {
 			return errors.Wrap(err, "failed to delete new context to overwrite it")
 		}

cmd/kubectx/state_test.go

@@ -15,7 +15,7 @@ func Test_readLastContext_nonExistingFile(t *testing.T) {
 		t.Fatal(err)
 	}
 	if s != "" {
-		t.Fatalf("expected empty string; got=%q", s)
+		t.Fatalf("expected empty string; got=\"%s\"", s)
 	}
 }
 
@@ -28,7 +28,7 @@ func Test_readLastContext(t *testing.T) {
 		t.Fatal(err)
 	}
 	if expected := "foo"; s != expected {
-		t.Fatalf("expected=%q; got=%q", expected, s)
+		t.Fatalf("expected=\"%s\"; got=\"%s\"", expected, s)
 	}
 }
 
@@ -56,7 +56,7 @@ func Test_writeLastContext(t *testing.T) {
 		t.Fatal(err)
 	}
 	if expected := "ctx1"; v != expected {
-		t.Fatalf("read wrong value=%q; expected=%q", v, expected)
+		t.Fatalf("read wrong value=\"%s\"; expected=\"%s\"", v, expected)
 	}
 }
 
@@ -71,7 +71,7 @@ func Test_kubectxFilePath(t *testing.T) {
 		t.Fatal(err)
 	}
 	if v != expected {
-		t.Fatalf("expected=%q got=%q", expected, v)
+		t.Fatalf("expected=\"%s\" got=\"%s\"", expected, v)
 	}
 }
 

cmd/kubectx/switch.go

@@ -26,7 +26,7 @@ func (op SwitchOp) Run(_, stderr io.Writer) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to switch context")
 	}
-	err = printer.Success(stderr, "Switched to context %q.", newCtx)
+	err = printer.Success(stderr, "Switched to context \"%s\".", printer.SuccessColor.Sprint(newCtx))
 	return errors.Wrap(err, "print error")
 }
 
@@ -45,7 +45,7 @@ func switchContext(name string) (string, error) {
 
 	prev := kc.GetCurrentContext()
 	if !kc.ContextExists(name) {
-		return "", errors.Errorf("no context exists with the name: %q", name)
+		return "", errors.Errorf("no context exists with the name: \"%s\"", name)
 	}
 	if err := kc.ModifyCurrentContext(name); err != nil {
 		return "", err

cmd/kubens/current.go

@@ -25,7 +25,7 @@ func (c CurrentOp) Run(stdout, _ io.Writer) error {
 	}
 	ns, err := kc.NamespaceOfContext(ctx)
 	if err != nil {
-		return errors.Wrapf(err, "failed to read namespace of %q", ctx)
+		return errors.Wrapf(err, "failed to read namespace of \"%s\"", ctx)
 	}
 	_, err = fmt.Fprintln(stdout, ns)
 	return errors.Wrap(err, "write error")

cmd/kubens/fzf.go

@@ -55,6 +55,6 @@ func (op InteractiveSwitchOp) Run(_, stderr io.Writer) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to switch namespace")
 	}
-	printer.Success(stderr, "Active namespace is %q.", printer.SuccessColor.Sprint(name))
+	printer.Success(stderr, "Active namespace is \"%s\".", printer.SuccessColor.Sprint(name))
 	return nil
 }

cmd/kubens/statefile_test.go

@@ -33,6 +33,6 @@ func TestNSFile(t *testing.T) {
 		t.Fatal(err)
 	}
 	if expected := "bar"; v != expected {
-		t.Fatalf("Load()=%q; expected=%q", v, expected)
+		t.Fatalf("Load()=\"%s\"; expected=\"%s\"", v, expected)
 	}
 }

cmd/kubens/switch.go

@@ -25,7 +25,7 @@ func (s SwitchOp) Run(_, stderr io.Writer) error {
 	if err != nil {
 		return err
 	}
-	err = printer.Success(stderr, "Active namespace is %q", toNS)
+	err = printer.Success(stderr, "Active namespace is \"%s\"", printer.SuccessColor.Sprint(toNS))
 	return err
 }
 
@@ -57,11 +57,11 @@ func switchNamespace(kc *kubeconfig.Kubeconfig, ns string) (string, error) {
 		return "", errors.Wrap(err, "failed to query if namespace exists (is cluster accessible?)")
 	}
 	if !ok {
-		return "", errors.Errorf("no namespace exists with name %q", ns)
+		return "", errors.Errorf("no namespace exists with name \"%s\"", ns)
 	}
 
 	if err := kc.SetNamespace(ctx, ns); err != nil {
-		return "", errors.Wrapf(err, "failed to change to namespace %q", ns)
+		return "", errors.Wrapf(err, "failed to change to namespace \"%s\"", ns)
 	}
 	if err := kc.Save(); err != nil {
 		return "", errors.Wrap(err, "failed to save kubeconfig file")

internal/cmdutil/deprecated_test.go

@@ -26,9 +26,9 @@ func TestPrintDeprecatedEnvWarnings_bgColors(t *testing.T) {
 	})
 	v := out.String()
 	if !strings.Contains(v, "KUBECTX_CURRENT_FGCOLOR") {
-		t.Fatalf("output doesn't contain 'KUBECTX_CURRENT_FGCOLOR': %q", v)
+		t.Fatalf("output doesn't contain 'KUBECTX_CURRENT_FGCOLOR': \"%s\"", v)
 	}
 	if !strings.Contains(v, "KUBECTX_CURRENT_BGCOLOR") {
-		t.Fatalf("output doesn't contain 'KUBECTX_CURRENT_BGCOLOR': %q", v)
+		t.Fatalf("output doesn't contain 'KUBECTX_CURRENT_BGCOLOR': \"%s\"", v)
 	}
 }

internal/cmdutil/kubeconfigloader_test.go

@@ -62,7 +62,7 @@ func Test_homeDir(t *testing.T) {
 
 			got := HomeDir()
 			if got != c.want {
-				t.Errorf("expected:%q got:%q", c.want, got)
+				t.Errorf("expected:\"%s\" got:\"%s\"", c.want, got)
 			}
 			for _, u := range unsets {
 				u()
@@ -80,7 +80,7 @@ func Test_kubeconfigPath(t *testing.T) {
 		t.Fatal(err)
 	}
 	if got != expected {
-		t.Fatalf("got=%q expected=%q", got, expected)
+		t.Fatalf("got=\"%s\" expected=\"%s\"", got, expected)
 	}
 }
 
@@ -103,7 +103,7 @@ func Test_kubeconfigPath_envOvveride(t *testing.T) {
 		t.Fatal(err)
 	}
 	if expected := "foo"; v != expected {
-		t.Fatalf("expected=%q, got=%q", expected, v)
+		t.Fatalf("expected=\"%s\", got=\"%s\"", expected, v)
 	}
 }
 

internal/kubeconfig/contexts.go

@@ -27,7 +27,7 @@ func (k *Kubeconfig) contextNode(name string) (*yaml.Node, error) {
 			return contextNode, nil
 		}
 	}
-	return nil, errors.Errorf("context with name %q not found", name)
+	return nil, errors.Errorf("context with name \"%s\" not found", name)
 }
 
 func (k *Kubeconfig) ContextNames() []string {

internal/kubeconfig/currentcontext_test.go

@@ -16,7 +16,7 @@ func TestKubeconfig_GetCurrentContext(t *testing.T) {
 
 	expected := "foo"
 	if v != expected {
-		t.Fatalf("expected=%q; got=%q", expected, v)
+		t.Fatalf("expected=\"%s\"; got=\"%s\"", expected, v)
 	}
 }
 
@@ -30,7 +30,7 @@ func TestKubeconfig_GetCurrentContext_missingField(t *testing.T) {
 
 	expected := ""
 	if v != expected {
-		t.Fatalf("expected=%q; got=%q", expected, v)
+		t.Fatalf("expected=\"%s\"; got=\"%s\"", expected, v)
 	}
 }
 
@@ -50,6 +50,6 @@ func TestKubeconfig_UnsetCurrentContext(t *testing.T) {
 	out := tl.Output()
 	expected := testutil.KC().WithCurrentCtx("").ToYAML(t)
 	if out != expected {
-		t.Fatalf("expected=%q; got=%q", expected, out)
+		t.Fatalf("expected=\"%s\"; got=\"%s\"", expected, out)
 	}
 }

internal/kubeconfig/namespace_test.go

@@ -35,15 +35,15 @@ func TestKubeconfig_NamespaceOfContext(t *testing.T) {
 		t.Fatal("expected err")
 	}
 	if expected := `default`; v1 != expected {
-		t.Fatalf("c1: expected=%q got=%q", expected, v1)
+		t.Fatalf("c1: expected=\"%s\" got=\"%s\"", expected, v1)
 	}
 
 	v2, err := kc.NamespaceOfContext("c2")
 	if err != nil {
 		t.Fatal("expected err")
 	}
 	if expected := `c2n1`; v2 != expected {
-		t.Fatalf("c2: expected=%q got=%q", expected, v2)
+		t.Fatalf("c2: expected=\"%s\" got=\"%s\"", expected, v2)
 	}
 }
 

internal/printer/printer.go

@@ -3,7 +3,6 @@ package printer
 import (
 	"fmt"
 	"io"
-	"strings"
 
 	"github.com/fatih/color"
 )
@@ -31,21 +30,16 @@ func init() {
 }
 
 func Error(w io.Writer, format string, args ...interface{}) error {
-	return writeOutput(w, ErrorColor.Sprint("error: ")+format+"\n", args...)
+	_, err := fmt.Fprintf(w, ErrorColor.Sprint("error: ")+format+"\n", args...)
+	return err
 }
 
 func Warning(w io.Writer, format string, args ...interface{}) error {
-	return writeOutput(w, WarningColor.Sprint("warning: ")+format+"\n", args...)
+	_, err := fmt.Fprintf(w, WarningColor.Sprint("warning: ")+format+"\n", args...)
+	return err
 }
 
 func Success(w io.Writer, format string, args ...interface{}) error {
-	return writeOutput(w, SuccessColor.Sprint("✔ ")+format+"\n", args...)
-}
-
-func writeOutput(w io.Writer, format string, args ...interface{}) error {
-	// Replace %q with "%s" so unescaped color sequences are written to output
-	format = strings.ReplaceAll(format, "%q", "\"%s\"")
-
-	_, err := fmt.Fprintf(w, format, args...)
+	_, err := fmt.Fprintf(w, SuccessColor.Sprint("✔ ")+fmt.Sprintf(format+"\n", args...))
 	return err
 }