chore: quick update fix/version at 2025-09-24 11:45:48

Author: kooksee

config/config.go

@@ -83,14 +83,22 @@ func loadEnvConfigMap(cfgPath string) EnvSpecMap {
 
 		pathList := listAllPath(envPath).Expect("failed to list env config path: %s", envPath)
 		for _, p := range pathList {
-			envConfigBytes := result.Wrap(os.ReadFile(p)).Expect("failed to handler env config data, path=%s", p)
-			envConfigBytes = bytes.TrimSpace(envConfigBytes)
+			envConfigBytes := result.Wrap(os.ReadFile(p)).
+				Map(bytes.TrimSpace).
+				Must(func(e *zerolog.Event) {
+					e.Str(logfields.Msg, fmt.Sprintf("failed to handler env config data, path=%s", p))
+				})
 			if len(envConfigBytes) == 0 {
 				continue
 			}
 
-			envConfigBytes = result.Wrap(envsubst.Bytes(envConfigBytes)).Expect("failed to handler config env data: %s", envConfigBytes)
-			assert.MustF(yaml.Unmarshal(envConfigBytes, &envSpecMap), "failed to unmarshal env config, data=%s path=%s", envConfigBytes, p)
+			envConfigBytes = cfgFormat(envConfigBytes, &config{workDir: filepath.Dir(cfgPath)})
+			envConfigBytes = result.Wrap(envsubst.Bytes(envConfigBytes)).Must(func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to handler config env data: %s", envConfigBytes))
+			})
+			result.Must(yaml.Unmarshal(envConfigBytes, &envSpecMap), func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to unmarshal env config, data=%s path=%s", envConfigBytes, p))
+			})
 		}
 	}
 	initEnv(envSpecMap)

config/envs.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/pubgo/funk/env"
-	"github.com/samber/lo"
+	"github.com/pubgo/funk/strutil"
 )
 
 type EnvSpecMap map[string]*EnvSpec
@@ -13,16 +13,14 @@ type EnvSpec struct {
 	Name        string `yaml:"name"`
 	Description string `yaml:"description"`
 	Default     string `yaml:"default"`
+	Value       string `yaml:"value"`
 	Required    bool   `yaml:"required"`
 	Example     string `yaml:"example"`
-	Versions    string `yaml:"versions"`
-	Tags        string `yaml:"tags"`
 }
 
 func initEnv(envMap EnvSpecMap) {
 	for name, cfg := range envMap {
-		envData := env.Get(name)
-		envData = strings.TrimSpace(lo.Ternary(envData != "", envData, cfg.Default))
+		envData := strings.TrimSpace(strutil.FirstNotEmpty(env.Get(name), cfg.Value, cfg.Default))
 		if cfg.Required && envData == "" {
 			panic("env " + cfg.Name + " is required")
 		}

env/env.go

@@ -9,10 +9,11 @@ import (
 
 	"github.com/a8m/envsubst"
 	"github.com/joho/godotenv"
+	"github.com/samber/lo"
+
 	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/pathutil"
 	"github.com/pubgo/funk/v2/result"
-	"github.com/samber/lo"
 )
 
 func Set(key, value string) result.Error {
@@ -120,7 +121,7 @@ func Key(key string) string {
 
 func LoadFiles(files ...string) (r result.Error) {
 	files = lo.Filter(files, func(item string, index int) bool { return pathutil.IsExist(item) })
-	if result.Catch(&r, godotenv.Load(files...)) {
+	if result.Catch(&r, godotenv.Overload(files...)) {
 		return
 	}
 

env/reload.go

@@ -1,17 +1,14 @@
 package env
 
 import (
+	"fmt"
+	"log/slog"
 	"os"
 	"strings"
 
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
+	"github.com/pubgo/funk/log/logfields"
 )
 
-func init() {
-	loadEnv()
-}
-
 func Reload() {
 	loadEnv()
 }
@@ -26,16 +23,17 @@ func Init() {
 // a-b=>a_b, a.b=>a_b, a/b=>a_b
 func loadEnv() {
 	envPrefix := getEnvPrefix()
-	logger := log.With().Str("operation", "reload_env").Logger()
-	envPrefixEventFn := func(e *zerolog.Event) {
-		e.Dict("env_prefix", zerolog.Dict().Str("key", PrefixKey).Str("value", envPrefix))
-	}
-	logRecord(logger.Info(), envPrefixEventFn).Msg("reload env")
+
+	logger := slog.With(
+		slog.String(logfields.Module, "env"),
+		slog.String(logfields.Operation, "reload_env"),
+	)
+	logger.Info("reload env", slog.Any("env_prefix", map[string]any{"key": PrefixKey, "value": envPrefix}))
 
 	for _, env := range os.Environ() {
 		kvs := strings.SplitN(env, "=", 2)
 		if len(kvs) != 2 {
-			logRecord(logger.Error()).Msg("split env error")
+			logger.Error("split env error")
 			continue
 		}
 
@@ -44,7 +42,7 @@ func loadEnv() {
 			strings.HasPrefix(rawEnvKey, "_") ||
 			strings.HasPrefix(rawEnvKey, "=") ||
 			!hasEnvPrefix(rawEnvKey, envPrefix) {
-			logRecord(logger.Warn()).Msgf("unset env, key=%s", rawEnvKey)
+			logger.Warn(fmt.Sprintf("unset env, key=%s", rawEnvKey))
 			_ = os.Unsetenv(rawEnvKey)
 			continue
 		}
@@ -56,7 +54,7 @@ func loadEnv() {
 			}
 
 			setOk := os.Setenv(key, kvs[1]) == nil
-			logRecord(logger.Info()).Msgf("reset env, old_key=%s new_key=%s set_ok=%v", rawEnvKey, key, setOk)
+			logger.Info(fmt.Sprintf("reset env, old_key=%s new_key=%s set_ok=%v", rawEnvKey, key, setOk))
 		} else {
 			_ = os.Unsetenv(rawEnvKey)
 		}

env/util.go

@@ -5,16 +5,8 @@ import (
 	"strings"
 
 	"github.com/ettle/strcase"
-	"github.com/rs/zerolog"
-
-	"github.com/pubgo/funk/log/logfields"
-	"github.com/pubgo/funk/log/logutil"
 )
 
-var logFn = func(e *zerolog.Event) {
-	e.Str(logfields.Module, "env")
-}
-
 const PrefixKey = "ENV_PREFIX"
 
 func hasEnvPrefix(key string, prefix string) bool {
@@ -58,7 +50,3 @@ func Normalize(key string) (string, bool) {
 
 	return KeyHandler(key), true
 }
-
-func logRecord(evt *zerolog.Event, funcs ...func(e *zerolog.Event)) *zerolog.Event {
-	return logutil.Record(evt, append(funcs, logFn)...)
-}

env/util_test.go

@@ -1,23 +1,22 @@
 package env_test
 
 import (
+	"log/slog"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/pubgo/funk/env"
+	"github.com/pubgo/funk/log"
 	"github.com/pubgo/funk/pretty"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestResetEnv(t *testing.T) {
-	os.Setenv("abc", "1")
-	t.Log(os.Getenv("abc"))
-	os.Setenv("abc", "2")
-	t.Log(os.Getenv("abc"))
+	assert.NoError(t, os.Setenv("abc", "1"))
+	assert.Equal(t, os.Getenv("abc"), "1")
+	assert.NoError(t, os.Setenv("abc", "2"))
+	assert.Equal(t, os.Getenv("abc"), "2")
 }
 
 func TestNormalize(t *testing.T) {
@@ -27,11 +26,7 @@ func TestNormalize(t *testing.T) {
 }
 
 func TestEnvPrefix(t *testing.T) {
-	log.Logger = log.Hook(zerolog.HookFunc(func(e *zerolog.Event, level zerolog.Level, message string) {
-		if strings.HasPrefix(message, "unset not match env") {
-			e.Discard()
-		}
-	}))
+	slog.SetDefault(slog.New(log.NewSlog(log.GetLogger(""))))
 
 	env.Reload()
 	pretty.Println("env_keys", lo.Keys(env.Map()))

log/impl.slog.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log/slog"
 
+	"github.com/pubgo/funk/log/slogutil"
 	"github.com/rs/zerolog"
 	slogcommon "github.com/samber/slog-common"
 )
@@ -56,7 +57,11 @@ func (s slogImpl) Handle(ctx context.Context, r slog.Record) error {
 	}
 
 	r.Attrs(func(attr slog.Attr) bool {
-		evt.Any(attr.Key, attr.Value.Any())
+		if fn, ok := attr.Value.Any().(slogutil.LogFunc); ok {
+			evt.Func(fn)
+		} else {
+			evt.Any(attr.Key, attr.Value.Any())
+		}
 		return true
 	})
 

log/logfields/fields.go

@@ -1,9 +1,12 @@
 package logfields
 
 const (
-	Module      = "module"
-	Msg         = "log_msg"
-	Logger      = "logger"
+	Module    = "module"
+	Operation = "operation"
+	Action    = "action"
+	Msg       = "log_msg"
+	Logger    = "logger"
+
 	Error       = "error"
 	ErrorDetail = "error_detail"
 	ErrorStack  = "error_stack"

log/slogutil/util.go

@@ -0,0 +1,13 @@
+package slogutil
+
+import (
+	"log/slog"
+
+	"github.com/rs/zerolog"
+)
+
+type LogFunc func(evt *zerolog.Event)
+
+func Func(fn LogFunc) slog.Attr {
+	return slog.Any("func", fn)
+}

log/z_slog_test.go

@@ -0,0 +1,18 @@
+package log_test
+
+import (
+	"log/slog"
+	"testing"
+
+	"github.com/pubgo/funk/log"
+	"github.com/pubgo/funk/log/slogutil"
+	"github.com/rs/zerolog"
+)
+
+func TestSlog(t *testing.T) {
+	slog.SetDefault(slog.New(log.NewSlog(log.GetLogger(""))))
+	slog.Info("ok")
+	slog.Info("ok", slogutil.Func(func(evt *zerolog.Event) {
+		evt.Str("record", "ok")
+	}))
+}