Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/envutil/envfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ func LoadEnvFile(path string) error {
}

// Parse KEY=VALUE
parts := strings.SplitN(line, "=", 2)
if len(parts) != 2 {
key, value, ok := strings.Cut(line, "=")
if !ok {
continue
}

key := strings.TrimSpace(parts[0])
value := strings.TrimSpace(parts[1])
key = strings.TrimSpace(key)
value = strings.TrimSpace(value)

// Expand $VAR references in value
value = os.ExpandEnv(value)
Expand Down
5 changes: 1 addition & 4 deletions internal/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,7 @@ func matchPattern(namespace, pattern string) bool {
return strings.HasSuffix(namespace, suffix)
}
// Middle wildcard: split and check both parts
parts := strings.SplitN(pattern, "*", 2)
if len(parts) == 2 {
prefix := parts[0]
suffix := parts[1]
if prefix, suffix, ok := strings.Cut(pattern, "*"); ok {
return strings.HasPrefix(namespace, prefix) && strings.HasSuffix(namespace, suffix)
}
}
Expand Down
16 changes: 7 additions & 9 deletions internal/sanitize/sanitize.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,17 +167,15 @@ func SanitizeArgs(args []string) []string {
for i := 0; i < len(args); i++ {
arg := args[i]

// Check if this is an environment variable value after a -e flag
// Check if this is an environment variable value after a -e flag.
// Format: -e VAR=VALUE
if i > 0 && args[i-1] == "-e" && strings.Contains(arg, "=") {
// Split on first = to get VAR and VALUE.
// strings.SplitN with n=2 always returns exactly 2 parts when "=" is present.
parts := strings.SplitN(arg, "=", 2)
sanitized[i] = parts[0] + "=" + TruncateSecret(parts[1])
} else {
// Pass through unchanged
sanitized[i] = arg
if i > 0 && args[i-1] == "-e" {
if varName, varValue, ok := strings.Cut(arg, "="); ok {
sanitized[i] = varName + "=" + TruncateSecret(varValue)
continue
}
}
sanitized[i] = arg
}
return sanitized
}
Loading