pkg/ceph: [WIP]

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/ceph/config_parser.go

@@ -11,17 +11,13 @@ import (
 	"darvaza.org/core"
 )
 
-var sectionMap = map[string]func(*Config, *basic.Section) error{
-	"global": loadGlobalConfSection,
-}
-
 func loadConfSection(out *Config, src *basic.Section) error {
-	h, ok := sectionMap[src.Key]
-	if !ok {
+	switch src.Key {
+	case "global":
+		return loadGlobalConfSection(out, src)
+	default:
 		return core.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
 	}
-
-	return h(out, src)
 }
 
 func loadGlobalConfSection(out *Config, src *basic.Section) error {
@@ -73,19 +69,6 @@ func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
 		entries, _ := parser.SplitCommaArray(field.Value)
 		cfg.Monitors = append(cfg.Monitors, entries...)
 		return nil
-	case "cluster_network":
-		if !core.IsZero(cfg.ClusterNetwork) {
-			err := core.Wrap(fs.ErrInvalid, "fields before the first section")
-			return err
-		}
-
-		err := cfg.ClusterNetwork.UnmarshalText([]byte(field.Value))
-		switch {
-		case err != nil:
-			return core.Wrap(err, field.Key)
-		default:
-			return nil
-		}
 	}
 	return nil
 }

pkg/wireguard/config.go

@@ -78,7 +78,7 @@ type PeerConfig struct {
 	Name       string
 	PublicKey  PublicKey
 	Endpoint   EndpointAddress
-	AllowedIPs []netip.Prefix
+	AllowedIPs []netip.Prefix `ini:",comma"`
 }
 
 // EndpointAddress is a host:port pair to reach the Peer

pkg/wireguard/config_parser.go

@@ -8,20 +8,15 @@ import (
 	"darvaza.org/core"
 )
 
-type sectionHandler func(*Config, *basic.Section) error
-
-var sectionMap = map[string]func(*Config, *basic.Section) error{
-	"Interface": loadInterfaceConfSection,
-	"Peer":      loadPeerConfSection,
-}
-
 func loadConfSection(out *Config, src *basic.Section) error {
-	h, ok := sectionMap[src.Key]
-	if !ok {
+	switch src.Key {
+	case "Interface":
+		return loadInterfaceConfSection(out, src)
+	case "Peer":
+		return loadPeerConfSection(out, src)
+	default:
 		return core.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
 	}
-
-	return h(out, src)
 }
 
 func loadInterfaceConfSection(out *Config, src *basic.Section) error {