platform

cmd/order/main.go

@@ -27,6 +27,7 @@ import (
 	ordermcp "git.k6n.net/mats/go-cart-actor/pkg/order/mcp"
 	"git.k6n.net/mats/go-cart-actor/pkg/outbox"
 	messages "git.k6n.net/mats/go-cart-actor/proto/order"
+	"git.k6n.net/mats/platform/config"
 
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
@@ -49,9 +50,9 @@ type server struct {
 }
 
 func main() {
-	addr := envOr("ORDER_ADDR", ":8092") // :8090 cart, :8091 redirector
-	dataDir := envOr("ORDER_DATA", "data/orders")
-	flowsDir := envOr("ORDER_FLOWS", "data/order-flows")
+	addr := config.EnvString("ORDER_ADDR", ":8092") // :8090 cart, :8091 redirector
+	dataDir := config.EnvString("ORDER_DATA", "data/orders")
+	flowsDir := config.EnvString("ORDER_FLOWS", "data/order-flows")
 	if err := os.MkdirAll(dataDir, 0o755); err != nil {
 		log.Fatalf("create data dir: %v", err)
 	}
@@ -154,7 +155,7 @@ func main() {
 	mux.HandleFunc("GET /api/orders/{id}", s.handleGet)
 	mux.HandleFunc("GET /api/orders/{id}/events", s.handleEvents)
 
-		// Post-purchase lifecycle (the grain already supports these transitions).
+	// Post-purchase lifecycle (the grain already supports these transitions).
 	mux.HandleFunc("POST /api/orders/{id}/fulfillments", s.handleFulfill)
 	mux.HandleFunc("POST /api/orders/{id}/complete", s.handleComplete)
 	mux.HandleFunc("POST /api/orders/{id}/cancel", s.handleCancel)
@@ -462,9 +463,9 @@ func selectTaxProvider() order.TaxProvider {
 	case "static":
 		return order.NewStaticTaxProvider()
 	case "nordic":
-		return order.NewNordicTaxProvider(envOr("TAX_DEFAULT_COUNTRY", "SE"))
+		return order.NewNordicTaxProvider(config.EnvString("TAX_DEFAULT_COUNTRY", "SE"))
 	default:
-		return order.NewNordicTaxProvider(envOr("TAX_DEFAULT_COUNTRY", "SE"))
+		return order.NewNordicTaxProvider(config.EnvString("TAX_DEFAULT_COUNTRY", "SE"))
 	}
 }
 
@@ -505,13 +506,6 @@ func loadUCPOrderSigner() *ucp.SigningConfig {
 	return cfg
 }
 
-func envOr(key, def string) string {
-	if v := os.Getenv(key); v != "" {
-		return v
-	}
-	return def
-}
-
 func writeJSON(w http.ResponseWriter, status int, v any) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status)