1
0
mirror of https://github.com/rancher/norman.git synced 2025-09-04 16:50:41 +00:00

Don't strip strings on output

This commit is contained in:
Darren Shepherd
2018-08-10 08:53:47 -07:00
parent 58f46da754
commit 5e344d90cd
2 changed files with 9 additions and 2 deletions

View File

@@ -330,6 +330,9 @@ func ConvertSimple(fieldType string, value interface{}, op Operation) (interface
case "password": case "password":
return convert.ToString(value), nil return convert.ToString(value), nil
case "string": case "string":
if op.IsList() {
return convert.ToStringNoTrim(value), nil
}
return convert.ToString(value), nil return convert.ToString(value), nil
case "dnsLabel": case "dnsLabel":
str := convert.ToString(value) str := convert.ToString(value)

View File

@@ -44,7 +44,7 @@ func Singular(value interface{}) interface{} {
return value return value
} }
func ToString(value interface{}) string { func ToStringNoTrim(value interface{}) string {
if t, ok := value.(time.Time); ok { if t, ok := value.(time.Time); ok {
return t.Format(time.RFC3339) return t.Format(time.RFC3339)
} }
@@ -52,7 +52,11 @@ func ToString(value interface{}) string {
if single == nil { if single == nil {
return "" return ""
} }
return strings.TrimSpace(fmt.Sprint(single)) return fmt.Sprint(single)
}
func ToString(value interface{}) string {
return strings.TrimSpace(ToStringNoTrim(value))
} }
func ToTimestamp(value interface{}) (int64, error) { func ToTimestamp(value interface{}) (int64, error) {