refactor: replace Unwrap with Must in config merge calls

Author: kooksee

component/etcdv3/client.go

@@ -12,7 +12,7 @@ import (
 )
 
 func New(conf *Config) *Client {
-	conf = config.MergeR(DefaultCfg(), *conf).Unwrap()
+	conf = config.MergeR(DefaultCfg(), *conf).Must()
 	cfg := merge.Struct(new(client3.Config), conf).Unwrap()
 	cfg.DialOptions = append(
 		cfg.DialOptions,

component/gormclient/builder.go

@@ -23,7 +23,7 @@ func NewClients(conf map[string]*Config, logs log.Logger) map[string]*Client {
 
 func New(conf *Config, logs log.Logger) *Client {
 	logs = logs.WithName(Name)
-	conf = config.MergeR(generic.Ptr(DefaultCfg()), conf).Unwrap()
+	conf = config.MergeR(generic.Ptr(DefaultCfg()), conf).Must()
 
 	ormCfg := merge.Copy(new(gorm.Config), conf).Unwrap()
 	ormCfg.NowFunc = func() time.Time { return time.Now().UTC() }

env/env.go

@@ -28,25 +28,26 @@ func Set(key, value string) result.Error {
 
 func MustSet(key, value string) { Set(key, value).Must() }
 
-func GetDefault(name string, defaultVal string) string {
-	val := Get(name)
-	return lo.If(val != "", val).Else(defaultVal)
-}
-
 func Get(names ...string) string {
 	var val string
-	GetVal(&val, names...)
+	getVal(&val, names...)
 	return val
 }
 
 func MustGet(names ...string) string {
-	var val string
-	GetVal(&val, names...)
+	val := Get(names...)
 	assert.If(val == "", "env not found, names=%q", names)
 	return val
 }
 
-func GetVal(val *string, names ...string) {
+func GetOr(name string, defaultVal string) string {
+	val := Get(name)
+	return lo.If(val != "", val).Else(defaultVal)
+}
+
+func GetWith(val *string, names ...string) { getVal(val, names...) }
+
+func getVal(val *string, names ...string) {
 	for _, name := range names {
 		env, ok := Lookup(name)
 		env = trim(env)
@@ -57,49 +58,52 @@ func GetVal(val *string, names ...string) {
 	}
 }
 
-func GetBoolVal(val *bool, names ...string) {
-	dt := Get(names...)
-	if dt == "" {
-		return
+func GetBool(names ...string) bool {
+	var val string
+	getVal(&val, names...)
+	if val == "" {
+		return false
 	}
 
-	v, err := strconv.ParseBool(dt)
+	v, err := strconv.ParseBool(val)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to bool, keys=%q value=%s err=%v", names, dt, err))
-		return
+		slog.Error(fmt.Sprintf("env: failed to parse string to bool, keys=%q value=%s err=%v", names, val, err))
+		return false
 	}
 
-	*val = v
+	return v
 }
 
-func GetIntVal(val *int, names ...string) {
-	dt := Get(names...)
-	if dt == "" {
-		return
+func GetInt(names ...string) int {
+	var val string
+	getVal(&val, names...)
+	if val == "" {
+		return -1
 	}
 
-	v, err := strconv.Atoi(dt)
+	v, err := strconv.Atoi(val)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to int, keys=%q value=%s err=%v", names, dt, err))
-		return
+		slog.Error(fmt.Sprintf("env: failed to parse string to int, keys=%q value=%s err=%v", names, val, err))
+		return -1
 	}
 
-	*val = v
+	return v
 }
 
-func GetFloatVal(val *float64, names ...string) {
-	dt := Get(names...)
-	if dt == "" {
-		return
+func GetFloat(names ...string) float64 {
+	var val string
+	getVal(&val, names...)
+	if val == "" {
+		return -1
 	}
 
-	v, err := strconv.ParseFloat(dt, 64)
+	v, err := strconv.ParseFloat(val, 64)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to float, keys=%q value=%s err=%v", names, dt, err))
-		return
+		slog.Error(fmt.Sprintf("env: failed to parse string to float, keys=%q value=%s err=%v", names, val, err))
+		return -1
 	}
 
-	*val = v
+	return v
 }
 
 func Lookup(key string) (string, bool) { return os.LookupEnv(keyHandler(key)) }
@@ -111,6 +115,8 @@ func Delete(key string) result.Error {
 	})
 }
 
+func MustDelete(key string) { Delete(key).Must() }
+
 func Expand(value string) result.Result[string] {
 	return result.Wrap(envsubst.String(value)).Log(func(e *zerolog.Event) {
 		e.Str("value", value)

migrates/entmigrates/migrate.go

@@ -58,7 +58,7 @@ type GoMigrate struct {
 
 // New returns a new GoMigrate.
 func New(db *entsql.Driver, cfg *Config, migrations []*Migration, tables []*schema.Table) *GoMigrate {
-	cfg = config.MergeR(generic.Ptr(DefaultConfig), cfg).Unwrap()
+	cfg = config.MergeR(generic.Ptr(DefaultConfig), cfg).Must()
 
 	orm := assert.Must1(gorm.Open(dp.New(dp.Config{
 		DriverName:           db.Dialect(),

running/runtime.go

@@ -24,10 +24,6 @@ var (
 
 	Env = "debug"
 
-	// IsDebug
-	// Deprecated: use Debug
-	IsDebug = true
-
 	// InstanceID service id
 	InstanceID = xid.New().String()
 
@@ -66,13 +62,16 @@ var (
 	enableDebug = monster.Bool("debug", false, "enable debug")
 )
 
-func Debug() bool {
-	return IsDebug || enableDebug.Get()
-}
+func Debug() bool { return enableDebug.Get() }
 
 func init() {
-	env.GetBoolVal(&IsDebug, "enable_debug", "debug", "dev_mode")
-	env.GetVal(&Env, "env", "run_mode", "run_env")
+	if env.GetBool("enable_debug", "debug", "dev_mode") {
+		assert.Exit(enableDebug.Set(true))
+	}
+
+	if e := env.Get("env", "run_mode", "run_env"); e != "" {
+		Env = e
+	}
 
 	id, err := machineid.ID()
 	if err == nil {