Bump sigs.k8s.io/controller-runtime to v0.14.4 (#5507)
* Bump sigs.k8s.io/controller-runtime to v0.14.4 * Update gofmt
This commit is contained in:
13
vendor/k8s.io/cli-runtime/pkg/printers/tableprinter.go
generated
vendored
13
vendor/k8s.io/cli-runtime/pkg/printers/tableprinter.go
generated
vendored
@@ -212,18 +212,19 @@ func printTable(table *metav1.Table, output io.Writer, options PrintOptions) err
|
||||
case string:
|
||||
print := val
|
||||
truncated := false
|
||||
// truncate at newlines
|
||||
newline := strings.Index(print, "\n")
|
||||
if newline >= 0 {
|
||||
// Truncate at the first newline, carriage return or formfeed
|
||||
// (treated as a newline by tabwriter).
|
||||
breakchar := strings.IndexAny(print, "\f\n\r")
|
||||
if breakchar >= 0 {
|
||||
truncated = true
|
||||
print = print[:newline]
|
||||
print = print[:breakchar]
|
||||
}
|
||||
fmt.Fprint(output, print)
|
||||
WriteEscaped(output, print)
|
||||
if truncated {
|
||||
fmt.Fprint(output, "...")
|
||||
}
|
||||
default:
|
||||
fmt.Fprint(output, val)
|
||||
WriteEscaped(output, fmt.Sprint(val))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
39
vendor/k8s.io/cli-runtime/pkg/printers/terminal.go
generated
vendored
Normal file
39
vendor/k8s.io/cli-runtime/pkg/printers/terminal.go
generated
vendored
Normal file
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
Copyright 2022 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package printers
|
||||
|
||||
import (
|
||||
"io"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// terminalEscaper replaces ANSI escape sequences and other terminal special
|
||||
// characters to avoid terminal escape character attacks (issue #101695).
|
||||
var terminalEscaper = strings.NewReplacer("\x1b", "^[", "\r", "\\r")
|
||||
|
||||
// WriteEscaped replaces unsafe terminal characters with replacement strings
|
||||
// and writes them to the given writer.
|
||||
func WriteEscaped(writer io.Writer, output string) error {
|
||||
_, err := terminalEscaper.WriteString(writer, output)
|
||||
return err
|
||||
}
|
||||
|
||||
// EscapeTerminal escapes terminal special characters in a human readable (but
|
||||
// non-reversible) format.
|
||||
func EscapeTerminal(in string) string {
|
||||
return terminalEscaper.Replace(in)
|
||||
}
|
||||
Reference in New Issue
Block a user