platform

cmd/cart/main.go

@@ -21,6 +21,7 @@ import (
 	"git.k6n.net/mats/go-cart-actor/pkg/telemetry"
 	"git.k6n.net/mats/go-cart-actor/pkg/voucher"
 	"git.k6n.net/mats/go-redis-inventory/pkg/inventory"
+	"git.k6n.net/mats/platform/config"
 	"git.k6n.net/mats/slask-finder/pkg/messaging"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
@@ -52,7 +53,6 @@ var amqpUrl = os.Getenv("AMQP_URL")
 var redisAddress = os.Getenv("REDIS_ADDRESS")
 var redisPassword = os.Getenv("REDIS_PASSWORD")
 
-// getEnv returns the value of the environment variable named by key, or def if unset/empty.
 // normalizeListenAddr accepts either a bare port ("8080") or a full listen
 // address (":8080", "0.0.0.0:8080") and returns a value usable by http.Server.Addr.
 func normalizeListenAddr(v string) string {
@@ -62,14 +62,6 @@ func normalizeListenAddr(v string) string {
 	return ":" + v
 }
 
-// getEnv returns the value of the environment variable named by key, or def if unset/empty.
-func getEnv(key, def string) string {
-	if v := os.Getenv(key); v != "" {
-		return v
-	}
-	return def
-}
-
 // loadUCPCartSigner loads the UCP ECDSA signing key from the path specified in
 // the UCP_SIGNING_KEY_PATH environment variable. Returns nil if unset or unreadable.
 func loadUCPCartSigner() *ucp.SigningConfig {
@@ -129,7 +121,7 @@ func main() {
 	// cartPort is the bare HTTP port. It drives both the local listener and the
 	// port used to proxy to peer pods, so a cluster must run all pods on the
 	// same CART_PORT.
-	cartPort := getEnv("CART_PORT", "8080")
+	cartPort := config.EnvString("CART_PORT", "8080")
 	if i := strings.LastIndex(cartPort, ":"); i >= 0 {
 		cartPort = cartPort[i+1:]
 	}
@@ -226,7 +218,7 @@ func main() {
 		}),
 	)
 
-	diskStorage := actor.NewDiskStorage[cart.CartGrain](getEnv("CART_DIR", "data"), reg)
+	diskStorage := actor.NewDiskStorage[cart.CartGrain](config.EnvString("CART_DIR", "data"), reg)
 	poolConfig := actor.GrainPoolConfig[cart.CartGrain]{
 		MutationRegistry: reg,
 		Storage:          diskStorage,
@@ -415,7 +407,7 @@ func main() {
 	mux.HandleFunc("/openapi.json", ServeEmbeddedOpenAPI)
 
 	httpAddr := normalizeListenAddr(cartPort)
-	debugAddr := normalizeListenAddr(getEnv("CART_DEBUG_PORT", "8081"))
+	debugAddr := normalizeListenAddr(config.EnvString("CART_DEBUG_PORT", "8081"))
 
 	srv := &http.Server{
 		Addr:        httpAddr,

cmd/cart/product-fetcher.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 
 	messages "git.k6n.net/mats/go-cart-actor/proto/cart"
+	"git.k6n.net/mats/platform/config"
 )
 
 // consumedKeys are product-document keys that are mapped to typed AddItem
@@ -24,7 +25,7 @@ var consumedKeys = []string{
 // PRODUCT_BASE_URL (the country argument is currently unused but kept for when
 // per-market routing returns).
 func getBaseUrl(country string) string {
-	return getEnv("PRODUCT_BASE_URL", "http://localhost:8082")
+	return config.EnvString("PRODUCT_BASE_URL", "http://localhost:8082")
 }
 
 // ProductItem is the flat product document served by GET /api/get/{sku}.