Merge pull request 'wireguard: switch from gcfg to asciigoat.org/ini/basic' (#8) from pr-amery-wireguard-ini into main

Reviewed-on: #8

.gitignore

@@ -1 +1,2 @@
 .tmp
+.version

cmd/jpictl/main.go

@@ -2,6 +2,8 @@
 package main
 
 import (
+	_ "embed"
+
 	"github.com/spf13/cobra"
 )
 
@@ -12,8 +14,9 @@ const (
 
 var (
 	rootCmd = &cobra.Command{
-		Use:   CmdName,
+		Use:     CmdName,
-		Short: "control tool for jpi.cloud",
+		Short:   "control tool for jpi.cloud",
+		Version: version,
 	}
 )
 

cmd/jpictl/version.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	_ "embed"
+
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+//go:generate sh -c "git describe | tr -d '\r\n' > .version"
+//go:embed .version
+var version string
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Returns jpictl's version",
+	Args:  cobra.NoArgs,
+	Run: func(_ *cobra.Command, _ []string) {
+		_, _ = fmt.Fprintf(os.Stdout, "%s\n", version)
+	},
+}
+
+func init() {
+	if version == "" {
+		version = "undetermined"
+	}
+
+	rootCmd.AddCommand(versionCmd)
+}

go.mod

@@ -2,8 +2,6 @@ module git.jpi.io/amery/jpictl
 
 go 1.19
 
-replace asciigoat.org/ini => ../../../asciigoat.org/ini
-
 require (
 	asciigoat.org/ini v0.2.5
 	darvaza.org/core v0.12.0

go.sum

@@ -1,5 +1,7 @@
 asciigoat.org/core v0.3.9 h1:hgDDz4ecm3ZvehX++m8A/IzAt+B5oDPiRtxatzfUHPQ=
 asciigoat.org/core v0.3.9/go.mod h1:CAaHwyw8MpAq4a1MYtN2dxJrsK+hmIdW50OndaQZYPI=
+asciigoat.org/ini v0.2.5 h1:4gRIp9rU+XQt8+HMqZO5R7GavMv9Yl2+N+je6djDIAE=
+asciigoat.org/ini v0.2.5/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
 darvaza.org/cache/x/simplelru v0.1.8 h1:rvFucut4wKYbsYc994yR3P0M08NqlsvZxr5G4QK82tw=
 darvaza.org/cache/x/simplelru v0.1.8/go.mod h1:Mv1isOJTcXYK+aK0AvUe+/3KpRTXDsYga6rdTS/upNs=
 darvaza.org/core v0.12.0 h1:LLtYh9RZJSd0sgPTDocofCc4H5jbutSUQgPbKt+8gcI=

pkg/ceph/config.go

@@ -39,6 +39,9 @@ func writeGlobalToBuffer(w *bytes.Buffer, c *GlobalConfig) {
 	_, _ = fmt.Fprintf(w, "%s = %s\n", "mon_initial_members", strings.Join(c.Monitors, ", "))
 	_, _ = fmt.Fprintf(w, "%s = %s\n", "mon_host", joinAddrs(c.MonitorsAddr, ", "))
 	_, _ = fmt.Fprintf(w, "%s = %s\n", "cluster_network", c.ClusterNetwork.String())
+
+	_, _ = fmt.Fprintf(w, "\n; %s\n", "don't rewrite labels on startup")
+	_, _ = fmt.Fprintf(w, "%s = %s\n", "osd_class_update_on_start", "false")
 }
 
 func joinAddrs(addrs []netip.Addr, sep string) string {

pkg/ceph/config_parser.go

@@ -2,9 +2,10 @@ package ceph
 
 import (
 	"io/fs"
-	"log"
+	"net/netip"
 
 	"asciigoat.org/ini/basic"
+	"asciigoat.org/ini/parser"
 
 	"darvaza.org/core"
 )
@@ -35,26 +36,60 @@ func loadGlobalConfSection(out *Config, src *basic.Section) error {
 	return nil
 }
 
+// revive:disable:cyclomatic
+// revive:disable:cognitive-complexity
+
 func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
-	log.Printf("%s[%q] = %q", "global", field.Key, field.Value)
+	// revive:enable:cyclomatic
+	// revive:enable:cognitive-complexity
 
-	key, value := field.Key, field.Value
+	// TODO: refactor when asciigoat's ini parser learns to do reflection
 
-	switch key {
+	switch field.Key {
 	case "fsid":
-		return configFieldHandler(&cfg.FSID, key, value)
+		if !core.IsZero(cfg.FSID) {
-	case "mon_host":
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
-		return configFieldHandler(&cfg.MonitorsAddr, key, value)
+		}
-	case "mon_initial_members":
-		return configFieldHandler(&cfg.Monitors, key, value)
-	case "cluster_network":
-		return configFieldHandler(&cfg.ClusterNetwork, key, value)
-	default:
-		return core.Wrap(fs.ErrNotExist, "field %q unknown", key)
-	}
-}
 
-func configFieldHandler(vi any, key, value string) error
+		err := cfg.FSID.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "mon_host":
+		entries, _ := parser.SplitCommaArray(field.Value)
+		for _, s := range entries {
+			var addr netip.Addr
+
+			if err := addr.UnmarshalText([]byte(s)); err != nil {
+				return core.Wrap(err, field.Key)
+			}
+
+			cfg.MonitorsAddr = append(cfg.MonitorsAddr, addr)
+		}
+		return nil
+	case "mon_initial_members":
+		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
+}
 
 func newConfigFromDocument(doc *basic.Document) (*Config, error) {
 	var out Config

pkg/wireguard/config.go

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

pkg/wireguard/config_parser.go

@@ -2,7 +2,7 @@ package wireguard
 
 import (
 	"io/fs"
-	"log"
+	"strconv"
 
 	"asciigoat.org/ini/basic"
 	"darvaza.org/core"
@@ -50,42 +50,106 @@ func loadPeerConfSection(out *Config, src *basic.Section) error {
 	return nil
 }
 
-func configFieldHandler(vi any, key, value string) error
+// revive:disable:cyclomatic
+// revive:disable:cognitive-complexity
 
 func loadInterfaceConfField(cfg *InterfaceConfig, field basic.Field) error {
-	log.Printf("%s[%q] = %q", "Interface", field.Key, field.Value)
+	// revive:enable:cyclomatic
+	// revive:enable:cognitive-complexity
 
-	key, value := field.Key, field.Value
+	// TODO: refactor when asciigoat's ini parser learns to do reflection
-
+	switch field.Key {
-	switch key {
 	case "Address":
-		return configFieldHandler(&cfg.Address, key, value)
+		if !core.IsZero(cfg.Address) {
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.Address.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
 	case "PrivateKey":
-		return configFieldHandler(&cfg.PrivateKey, key, value)
+		if !core.IsZero(cfg.PrivateKey) {
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.PrivateKey.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
 	case "ListenPort":
-		return configFieldHandler(&cfg.ListenPort, key, value)
+		if cfg.ListenPort > 0 {
-	default:
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
-		return core.Wrap(fs.ErrInvalid, "unknown field %q", key)
+		}
-	}
-}
 
-func loadPeerConfField(cfg *PeerConfig, field basic.Field) error {
+		u64, err := strconv.ParseUint(field.Value, 10, 16)
-	log.Printf("%s[%q] = %q", "Peer", field.Key, field.Value)
+		switch {
-
+		case err != nil:
-	key, value := field.Key, field.Value
+			return core.Wrap(err, field.Key)
-
+		case u64 == 0:
-	switch key {
+			return core.Wrap(fs.ErrInvalid, "invalid %q value", field.Key)
-	case "PublicKey":
+		default:
-		return configFieldHandler(&cfg.PublicKey, key, value)
+			cfg.ListenPort = uint16(u64)
-	case "Endpoint":
+			return nil
-		return configFieldHandler(&cfg.Endpoint, key, value)
+		}
-	case "AllowedIPs":
-		return configFieldHandler(&cfg.AllowedIPs, key, value)
 	default:
 		return core.Wrap(fs.ErrInvalid, "unknown field %q", field.Key)
 	}
 }
 
+// revive:disable:cyclomatic
+// revive:disable:cognitive-complexity
+
+func loadPeerConfField(cfg *PeerConfig, field basic.Field) error {
+	// revive:enable:cyclomatic
+	// revive:enable:cognitive-complexity
+
+	switch field.Key {
+	case "PublicKey":
+		if !core.IsZero(cfg.PublicKey) {
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.PublicKey.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "Endpoint":
+		if cfg.Endpoint.String() != "" {
+			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.Endpoint.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "AllowedIPs":
+		s, err := parseAllowedIPs(field.Value)
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		case len(s) > 0:
+			cfg.AllowedIPs = append(cfg.AllowedIPs, s...)
+			return nil
+		}
+	default:
+		return core.Wrap(fs.ErrInvalid, "unknown field %q", field.Key)
+	}
+	return nil
+}
+
 func newConfigFromDocument(doc *basic.Document) (*Config, error) {
 	var out Config