Skip to content

Commit

Permalink
Escape ‘%’ in console.OutStyle arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
11janci committed Apr 5, 2019
1 parent b832ff3 commit a6ec2ad
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 10 deletions.
8 changes: 6 additions & 2 deletions pkg/minikube/console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,19 @@ func HasStyle(style string) bool {

// OutStyle writes a stylized and formatted message to stdout
func OutStyle(style, format string, a ...interface{}) error {
OutStyle, err := applyStyle(style, useColor, fmt.Sprintf(format, a...))
outStyled, err := applyStyle(style, useColor, format, a...)
// format the output string and escape any outstanding '%' signs so that they don't
// get interpreted as a formatting directive down the line
outStyled = strings.Replace(outStyled, "%", "%%", -1)

if err != nil {
glog.Errorf("applyStyle(%s): %v", style, err)
if oerr := OutLn(format, a...); oerr != nil {
glog.Errorf("Out failed: %v", oerr)
}
return err
}
return Out(OutStyle)
return Out(outStyled)
}

// Out writes a basic formatted string to stdout
Expand Down
31 changes: 23 additions & 8 deletions pkg/minikube/console/console_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,37 @@ func TestOutStyle(t *testing.T) {
style string
envValue string
message string
params []interface{}
want string
}{
{"happy", "true", "This is happy.", "😄 This is happy.\n"},
{"Docker", "true", "This is Docker.", "🐳 This is Docker.\n"},
{"option", "true", "This is option.", " ▪ This is option.\n"},

{"happy", "false", "This is happy.", "o This is happy.\n"},
{"Docker", "false", "This is Docker.", "- This is Docker.\n"},
{"option", "false", "This is option.", " - This is option.\n"},
{"happy", "true", "This is happy.", nil, "😄 This is happy.\n"},
{"Docker", "true", "This is Docker.", nil, "🐳 This is Docker.\n"},
{"option", "true", "This is option.", nil, " ▪ This is option.\n"},
{
"option",
"true",
"Message with params: %s %s",
[]interface{}{"encode '%' signs", "%s%%%d"},
" ▪ Message with params: encode '%' signs %s%%%d\n",
},

{"happy", "false", "This is happy.", nil, "o This is happy.\n"},
{"Docker", "false", "This is Docker.", nil, "- This is Docker.\n"},
{"option", "false", "This is option.", nil, " - This is option.\n"},
{
"option",
"false",
"Message with params: %s %s",
[]interface{}{"encode '%' signs", "%s%%%d"},
" - Message with params: encode '%' signs %s%%%d\n",
},
}
for _, tc := range tests {
t.Run(tc.style+"-"+tc.envValue, func(t *testing.T) {
os.Setenv(OverrideEnv, tc.envValue)
f := newFakeFile()
SetOutFile(f)
if err := OutStyle(tc.style, tc.message); err != nil {
if err := OutStyle(tc.style, tc.message, tc.params...); err != nil {
t.Errorf("unexpected error: %q", err)
}
got := f.String()
Expand Down

0 comments on commit a6ec2ad

Please sign in to comment.