v0.28.0 option schema in struct tags, schema replacing plugin factory metadata, tui prep

internal/flow/heartbeat.go

@@ -3,7 +3,6 @@ package flow
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"strconv"
 	"sync/atomic"
 	"time"
@@ -12,17 +11,10 @@ import (
 	"github.com/lixenwraith/logwisp/internal/core"
 	"github.com/lixenwraith/logwisp/internal/format"
 
-	lconfig "github.com/lixenwraith/config"
 	"github.com/lixenwraith/log"
 	"github.com/lixenwraith/log/formatter"
 )
 
-const (
-	MinHeartbeatIntervalMS     = 100
-	DefaultHeartbeatIntervalMS = 1000
-	DefaultHeartbeatFormat     = "txt"
-)
-
 // HeartbeatGenerator produces periodic heartbeat events
 type HeartbeatGenerator struct {
 	config    *config.HeartbeatConfig
@@ -38,21 +30,8 @@ func NewHeartbeatGenerator(cfg *config.HeartbeatConfig, formatter format.Formatt
 		return nil, nil
 	}
 
-	// Validate
-	if cfg.IntervalMS == 0 {
-		cfg.IntervalMS = DefaultHeartbeatIntervalMS
-	} else if cfg.IntervalMS < MinHeartbeatIntervalMS {
-		return nil, fmt.Errorf("interval_ms: must be >= %d, got %d", MinHeartbeatIntervalMS, cfg.IntervalMS)
-	}
-
-	validateFormat := lconfig.OneOf("txt", "json", "raw", "")
-	if err := validateFormat(cfg.Format); err != nil {
-		return nil, fmt.Errorf("format: %w", err)
-	}
-
-	// Defaults
-	if cfg.Format == "" {
-		cfg.Format = DefaultHeartbeatFormat
+	if err := config.Settle(cfg); err != nil {
+		return nil, err
 	}
 
 	hg := &HeartbeatGenerator{

internal/flow/ratelimiter.go

@@ -1,15 +1,12 @@
 package flow
 
 import (
-	"fmt"
-	"strings"
 	"sync/atomic"
 
 	"github.com/lixenwraith/logwisp/internal/config"
 	"github.com/lixenwraith/logwisp/internal/core"
 	"github.com/lixenwraith/logwisp/internal/tokenbucket"
 
-	lconfig "github.com/lixenwraith/config"
 	"github.com/lixenwraith/log"
 )
 
@@ -27,36 +24,19 @@ type RateLimiter struct {
 
 // NewRateLimiter creates a new pipeline-level rate limiter from configuration
 func NewRateLimiter(cfg config.RateLimitConfig, logger *log.Logger) (*RateLimiter, error) {
-	// Rate <= 0 means disabled
-	if cfg.Rate <= 0 {
-		return nil, nil // No rate limit
+	if err := config.Settle(&cfg); err != nil {
+		return nil, err
 	}
-
-	// Validate
-	if err := lconfig.NonNegative(cfg.Rate); err != nil {
-		return nil, fmt.Errorf("rate: %w", err)
+	if cfg.Rate == 0 {
+		return nil, nil // off
 	}
-	if err := lconfig.NonNegative(cfg.Burst); err != nil {
-		return nil, fmt.Errorf("burst: %w", err)
-	}
-	if err := lconfig.NonNegative(cfg.MaxEntrySizeBytes); err != nil {
-		return nil, fmt.Errorf("max_entry_size_bytes: %w", err)
-	}
-
-	// Defaults
 	burst := cfg.Burst
-	if burst <= 0 {
+	if burst == 0 {
 		burst = cfg.Rate
 	}
-
-	var policy config.RateLimitPolicy
-	switch strings.ToLower(cfg.Policy) {
-	case "drop":
+	policy := config.PolicyPass
+	if cfg.Policy == "drop" {
 		policy = config.PolicyDrop
-	case "pass", "":
-		policy = config.PolicyPass
-	default:
-		return nil, fmt.Errorf("policy: must be one of [drop, pass], got %s", cfg.Policy)
 	}
 
 	l := &RateLimiter{