package miscimport ( "encoding/json" "fmt" "path/filepath" "strings" log "github.com/sirupsen/logrus")// Separator used to visually group related log lines.var credentialSeparator = strings.Repeat("-", 67)// LogSavingCredentials emits a consistent log message when persisting auth material.func LogSavingCredentials(path string) { if path == "" { return } // Use filepath.Clean so logs remain stable even if callers pass redundant separators. fmt.Printf("Saving credentials to %s\n", filepath.Clean(path))}// LogCredentialSeparator adds a visual separator to group auth/key processing logs.func LogCredentialSeparator() { log.Debug(credentialSeparator)}// MergeMetadata serializes the source struct into a map and merges the provided metadata into it.func MergeMetadata(source any, metadata map[string]any) (map[string]any, error) { var data map[string]any // Fast path: if source is already a map, just copy it to avoid mutation of original if srcMap, ok := source.(map[string]any); ok { data = make(map[string]any, len(srcMap)+len(metadata)) for k, v := range srcMap { data[k] = v } } else if source != nil { // Slow path: marshal to JSON and back to map to respect JSON tags temp, errMarshal := json.Marshal(source) if errMarshal != nil { return nil, fmt.Errorf("failed to marshal source: %w", errMarshal) } if errUnmarshal := json.Unmarshal(temp, &data); errUnmarshal != nil { return nil, fmt.Errorf("failed to unmarshal to map: %w", errUnmarshal) } } // Merge extra metadata if metadata != nil { if data == nil { data = make(map[string]any) } for k, v := range metadata { data[k] = v } } return data, nil}
package misc
import (
"encoding/json"
"fmt"
"path/filepath"
"strings"
log "github.com/sirupsen/logrus"
)
// Separator used to visually group related log lines.
var credentialSeparator = strings.Repeat("-", 67)
// LogSavingCredentials emits a consistent log message when persisting auth material.
func LogSavingCredentials(path string) {
if path == "" {
return
}
// Use filepath.Clean so logs remain stable even if callers pass redundant separators.
fmt.Printf("Saving credentials to %s\n", filepath.Clean(path))
}
// LogCredentialSeparator adds a visual separator to group auth/key processing logs.
func LogCredentialSeparator() {
log.Debug(credentialSeparator)
}
// MergeMetadata serializes the source struct into a map and merges the provided metadata into it.
func MergeMetadata(source any, metadata map[string]any) (map[string]any, error) {
var data map[string]any
// Fast path: if source is already a map, just copy it to avoid mutation of original
if srcMap, ok := source.(map[string]any); ok {
data = make(map[string]any, len(srcMap)+len(metadata))
for k, v := range srcMap {
data[k] = v
}
} else if source != nil {
// Slow path: marshal to JSON and back to map to respect JSON tags
temp, errMarshal := json.Marshal(source)
if errMarshal != nil {
return nil, fmt.Errorf("failed to marshal source: %w", errMarshal)
}
if errUnmarshal := json.Unmarshal(temp, &data); errUnmarshal != nil {
return nil, fmt.Errorf("failed to unmarshal to map: %w", errUnmarshal)
}
}
// Merge extra metadata
if metadata != nil {
if data == nil {
data = make(map[string]any)
}
for k, v := range metadata {
data[k] = v
}
}
return data, nil
}