chore: Change some type checks to use stringer

clevyr · Oct 25, 2023 · 34e7a31 · 34e7a31
1 parent 5541b78
commit 34e7a31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/command/builder.go b/internal/command/builder.go
@@ -33,10 +33,10 @@ func (j Builder) String() string {
 		switch v := v.(type) {
 		case string:
 			buf.WriteString(shellescape.Quote(v))
-		case Env:
-			buf.WriteString(v.String())
 		case Raw:
 			buf.WriteString(string(v))
+		case fmt.Stringer:
+			buf.WriteString(v.String())
 		default:
 			panic(fmt.Errorf("unknown value in command: %#v", v))
 		}

diff --git a/internal/log_hooks/redact.go b/internal/log_hooks/redact.go
@@ -21,10 +21,8 @@ func (r Redact) Fire(entry *log.Entry) error {
 		switch field := field.(type) {
 		case string:
 			entry.Data[i] = strings.ReplaceAll(field, string(r), "***")
-		default:
-			if field, ok := field.(fmt.Stringer); ok {
-				entry.Data[i] = strings.ReplaceAll(field.String(), string(r), "***")
-			}
+		case fmt.Stringer:
+			entry.Data[i] = strings.ReplaceAll(field.String(), string(r), "***")
 		}
 	}
 	return nil