zones: introduce (private) logger interface

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

.env

@@ -1,51 +0,0 @@
-export CLOUDFLARE_DNS_API_TOKEN=wFpklBgp0Z1A4yDs5zNhlTKne3W2Si8GLwkl10Oz
-
-if [ -n "$JPICTL" ]; then
-	:
-elif JPICTL=$(which jpictl); then
-	echo 2 >&2
-elif [ -d ./cmd/jpictl ]; then
-	JPICTL="go run ./cmd/jpictl/"
-	if [ -d "$(go env GOBIN)" ]; then
-		echo 3a >&2
-	elif [ -d "$(go env GOPATH)" ]; then
-		export GOBIN="$(go env GOPATH)/bin"
-		echo 3b >&2
-	elif WS=$(x --root); then
-		export GOBIN="$WS/bin"
-		unset -v WS
-		echo 3c >&2
-	else
-		echo 3d >&2
-	fi
-elif [ -d "${WS:-}" -a -x "${WS:+$WS/bin/jpictl}" ]; then
-	JPICTL="$WS/bin/jpictl"
-	export PATH="$WS/bin:$PATH"
-	echo "4a" >&2
-else
-	for WS in \
-		"$(x --root)" \
-		"$HOME/projects/apptly" \
-		; do
-		if [ -x "$WS/bin/jpictl" ]; then
-			JPICTL="$WS/bin/jpictl"
-			export PATH="$WS/bin:$PATH"
-			echo "4b: '$WS'" >&2
-			break
-		fi
-	done
-	unset -v WS
-
-	[ -n "$JPICTL" ] || echo "4c" >&2
-fi
-
-if [ -n "$JPICTL" ]; then
-	echo "JPICTL='$JPICTL'" >&2
-
-	export JPICTL
-	jpictl() {
-		$JPICTL "$@"
-	}
-else
-	echo "JPICTL="
-fi

.gitignore

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

.vscode/launch.json

@@ -1,38 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "write",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "cmd/jpictl",
-            "args": [ "write" ],
-            "cwd": "${workspaceFolder}"
-        },
-        {
-            "name": "dump",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "cmd/jpictl",
-            "args": [ "dump", "-vvvv" ],
-            "cwd": "${workspaceFolder}"
-        },
-        {
-            "name": "env",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "cmd/jpictl",
-            "args": [ "env", "-vvvv" ],
-            "cwd": "${workspaceFolder}"
-        }
-    ]
-}
-
-    ]
-}

.vscode/settings.json

@@ -1,15 +1,9 @@
 {
     "cSpell.words": [
-        "asciigoat",
         "ceph",
-        "cyclomatic",
         "darvaza",
         "gofrs",
         "jpictl",
-        "libdns",
-        "Lookuper",
-        "publicsuffix",
-        "Wrapf",
         "zerolog"
     ]
 }

Makefile

@@ -6,20 +6,19 @@ GOFMT ?= gofmt
 GOFMT_FLAGS = -w -l -s
 GOGENERATE_FLAGS = -v
 
+GOPATH ?= $(shell $(GO) env GOPATH)
+GOBIN ?= $(GOPATH)/bin
+
 TOOLSDIR := $(CURDIR)/pkg/tools
-TMPDIR ?= $(CURDIR)/.tmp
-OUTDIR ?= $(TMPDIR)
-
-GOLANGCI_LINT_VERSION ?= v1.59.1
-REVIVE_VERSION ?= v1.3.7
-
-GOLANGCI_LINT_URL ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
-GOLANGCI_LINT ?= $(GO) run $(GOLANGCI_LINT_URL)
+TMPDIR ?= .tmp
 
+REVIVE ?= $(GOBIN)/revive
 REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
 REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
-REVIVE_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
-REVIVE ?= $(GO) run $(REVIVE_URL)
+REVIVE_INSTALL_URL ?= github.com/mgechev/revive
+
+GO_INSTALL_URLS = \
+	$(REVIVE_INSTALL_URL) \
 
 V = 0
 Q = $(if $(filter 1,$V),,@)
@@ -30,12 +29,11 @@ GO_BUILD_CMD = $(GO_BUILD) -o "$(OUTDIR)"
 
 all: get generate tidy build
 
-clean: ; $(info $(M) cleaning…)
-	rm -rf $(TMPDIR)
-
-install: ; $(info $(M) cleaning…)
+install:
 	$Q $(GO) install -v ./cmd/...
 
+clean: ; $(info $(M) cleaning…)
+	rm -rf $(TMPDIR)
 
 $(TMPDIR)/index: $(TOOLSDIR)/gen_index.sh Makefile FORCE ; $(info $(M) generating index…)
 	$Q mkdir -p $(@D)
@@ -56,3 +54,6 @@ tidy: fmt
 
 generate: ; $(info $(M) running go:generate…)
 	$Q git grep -l '^//go:generate' | sort -uV | xargs -r -n1 $(GO) generate $(GOGENERATE_FLAGS)
+
+$(REVIVE):
+	$Q $(GO) install -v $(REVIVE_INSTALL_URL)

cloud.yaml

@@ -1,144 +0,0 @@
-dir: m
-name: m
-domain: jpi.cloud
-ceph_fsid: 28180b9b-6d5d-4be0-bb5b-e4b04bf03804
-regions:
-  - name: de
-  - name: eu
-    id: 1
-    cluster: ""
-    regions:
-      - de
-      - nl
-  - name: nl
-  - name: uk
-    id: 2
-    cluster: ""
-  - name: us
-    id: 3
-    cluster: ""
-  - name: europe
-    regions:
-      - eu
-      - uk
-  - name: global
-    regions:
-      - europe
-      - us
-zones:
-  - id: 1
-    name: ssd-lon
-    regions:
-      - uk
-    machines:
-      - id: 3
-        public:
-          - 63.250.53.5
-          - 2602:ff16:7:0:1:66:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=
-              publickey: aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=
-              publickey: untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-      - id: 7
-        ceph_monitor: true
-        public:
-          - 107.155.122.3
-          - 2602:ff16:7:0:1:6d:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=
-              publickey: XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-  - id: 2
-    name: ssd-ams
-    regions:
-      - nl
-    machines:
-      - id: 3
-        public:
-          - 89.233.107.128
-          - 2602:ff16:9:0:1:1a7:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=
-              publickey: y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=
-              publickey: 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-      - id: 4
-        ceph_monitor: true
-        public:
-          - 89.233.107.251
-          - 2602:ff16:9:0:1:130:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=
-              publickey: QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-      - id: 5
-        inactive: true
-        public:
-          - 89.233.107.107
-          - 2602:ff16:9:0:1:74:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=
-              publickey: HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-  - id: 3
-    name: htz-fsn
-    regions:
-      - de
-    machines:
-      - id: 1
-        ceph_monitor: true
-        public:
-          - 157.90.209.125
-          - 2a01:4f8:252:168f::2
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=
-              publickey: K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=
-              publickey: qWmYfgeRAQ563gWLdeYs65XjGJTSE+W8WTbpLZ0e1CQ=
-  - id: 4
-    name: ssd-nyc
-    regions:
-      - us
-    machines:
-      - id: 3
-        inactive: true
-        ceph_monitor: true
-        public:
-          - 208.87.134.41
-          - 2602:ff16:3:0:1:4fa:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=
-              publickey: 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=
-              publickey: av8ni/9ZUyozabzqTjIy1sOnSJuQ9p63Tu9ECVmHB2I=

cmd/jpictl/config.go

@@ -1,82 +1,22 @@
 package main
 
-import (
-	"os"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
-)
-
-const (
-	// DefaultConfigFile is read if -f/--config-file isn't specified.
-	// If it doesn't exist, m/ will be scanned
-	DefaultConfigFile = "cloud.yaml"
-
-	// DefaultClusterDir is the directory we will scan and write
-	// unless something else is indicated
-	DefaultClusterDir = "m"
-
-	// DefaultDomain indicates the domain to use unless
-	// something else is specified
-	DefaultDomain = "jpi.cloud"
-)
+import "git.jpi.io/amery/jpictl/pkg/zones"
 
 // Config describes the repository
 type Config struct {
 	Base   string
 	Domain string
-
-	ConfigFile string
 }
 
-var forceScan bool
-
 var cfg = &Config{
-	Base:   DefaultClusterDir,
-	Domain: DefaultDomain,
+	Base:   "./m",
+	Domain: "m.jpi.cloud",
 }
 
 // LoadZones loads all zones and machines in the config directory
-// or file
-func (cfg *Config) LoadZones(resolve bool) (*cluster.Cluster, error) {
-	var zones *cluster.Cluster
-	var err error
-
-	if !forceScan {
-		// try config file first
-		zones, err = cluster.NewFromConfig(cfg.ConfigFile,
-			cluster.ResolvePublicAddresses(resolve),
-			cluster.WithLogger(log),
-		)
-
-		switch {
-		case err == nil:
-			// file was good
-			return zones, nil
-		case !os.IsNotExist(err) || cfg.ConfigFile != DefaultConfigFile:
-			// file was bad
-			return nil, core.Wrap(err, "NewFromConfig(%q)", cfg.ConfigFile)
-		}
-	}
-
-	// default file doesn't exist. scan instead.
-	return cluster.NewFromDirectory(cfg.Base, cfg.Domain,
-		cluster.ResolvePublicAddresses(resolve),
-		cluster.WithLogger(log),
+func (cfg *Config) LoadZones(resolve bool) (*zones.Zones, error) {
+	return zones.New(cfg.Base, cfg.Domain,
+		zones.ResolvePublicAddresses(resolve),
+		zones.WithLogger(log),
 	)
 }
-
-func init() {
-	flags := rootCmd.PersistentFlags()
-
-	flags.StringVarP(&cfg.Base, "scan-dir", "d",
-		DefaultClusterDir, "directory to scan for cluster data")
-	flags.StringVarP(&cfg.Domain, "domain", "D",
-		DefaultDomain, "domain to use for scanned data")
-	flags.StringVarP(&cfg.ConfigFile, "config-file", "f",
-		DefaultConfigFile, "config file (JSON or YAML)")
-
-	flags.BoolVarP(&forceScan, "force-scan", "S",
-		false, "ignore config file and scan the directory instead")
-}

cmd/jpictl/dns.go

@@ -1,193 +0,0 @@
-package main
-
-import (
-	"context"
-	"net/netip"
-	"os"
-	"time"
-
-	"darvaza.org/core"
-	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
-	"git.jpi.io/amery/jpictl/pkg/dns"
-)
-
-const (
-	// DNSSyncTimeout specifies how long are we willing to wait for a DNS
-	// synchronization
-	DNSSyncTimeout = 10 * time.Second
-)
-
-func newDNSManager(m *cluster.Cluster, provider dns.Provider) (*dns.Manager, error) {
-	domain := m.Domain
-	if m.Name != "" {
-		domain = m.Name + "." + domain
-	}
-
-	mgr, err := dns.NewManager(dns.WithDomain(domain), dns.WithLogger(log))
-	if err != nil {
-		return nil, err
-	}
-
-	if provider != nil {
-		// set provider only  if specified
-		err = dns.WithProvider(provider)(mgr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err := populateDNSManager(mgr, m); err != nil {
-		return nil, err
-	}
-
-	return mgr, nil
-}
-
-func populateDNSManager(mgr *dns.Manager, m *cluster.Cluster) error {
-	var err error
-
-	ctx := context.TODO()
-
-	m.ForEachZone(func(z *cluster.Zone) bool {
-		z.ForEachMachine(func(p *cluster.Machine) bool {
-			err = mgr.AddHost(ctx, z.Name, int(p.ID), p.IsActive(), p.PublicAddresses...)
-			return err != nil
-		})
-
-		return err != nil
-	})
-	if err != nil {
-		return err
-	}
-
-	m.ForEachRegion(func(r *cluster.Region) bool {
-		r.ForEachZone(func(z *cluster.Zone) bool {
-			err = mgr.AddRegion(ctx, r.Name, z.Name)
-			return err != nil
-		})
-
-		return err != nil
-	})
-
-	return err
-}
-
-// revive:disable:flag-parameter
-func newDNSManagerCommand(_ *cobra.Command,
-	resolve bool, withCredentials bool) (*dns.Manager, error) {
-	// revive:enable:flag-parameter
-	var cred dns.Provider
-
-	if withCredentials {
-		var err error
-
-		cred, err = dns.DefaultDNSProvider()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	m, err := cfg.LoadZones(resolve)
-	if err != nil {
-		return nil, err
-	}
-
-	return newDNSManager(m, cred)
-}
-
-// Command
-var dnsCmd = &cobra.Command{
-	Use: "dns",
-}
-
-var dnsWriteCmd = &cobra.Command{
-	Use:    "write",
-	Short:  "dns write generates public DNS records",
-	PreRun: setVerbosity,
-	RunE: func(cmd *cobra.Command, _ []string) error {
-		mgr, err := newDNSManagerCommand(cmd, true, false)
-		if err != nil {
-			return err
-		}
-
-		_, err = mgr.WriteTo(os.Stdout)
-		return err
-	},
-}
-
-var dnsSyncCmd = &cobra.Command{
-	Use:    "sync",
-	Short:  "dns sync updates public DNS records",
-	PreRun: setVerbosity,
-	RunE: func(cmd *cobra.Command, _ []string) error {
-		mgr, err := newDNSManagerCommand(cmd, true, true)
-		if err != nil {
-			return err
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), DNSSyncTimeout)
-		defer cancel()
-
-		return mgr.Sync(ctx)
-	},
-}
-
-var dnsShowCmd = &cobra.Command{
-	Use:    "show [<name>...]",
-	Short:  "dns show lists entries on DNS for our domain",
-	PreRun: setVerbosity,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		mgr, err := newDNSManagerCommand(cmd, true, true)
-		if err != nil {
-			return err
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), DNSSyncTimeout)
-		defer cancel()
-
-		return mgr.Show(ctx, args...)
-	},
-}
-
-var dnsAddCmd = &cobra.Command{
-	Use:    "add <name> <address..>",
-	Short:  "dns add registers a new machine on the public DNS",
-	Args:   cobra.MinimumNArgs(2),
-	PreRun: setVerbosity,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		var addrs []netip.Addr
-
-		for _, s := range args[1:] {
-			addr, err := core.ParseAddr(s)
-			switch {
-			case err != nil:
-				return core.Wrap(err, s)
-			case !addr.IsValid(), addr.IsUnspecified(), addr.IsPrivate(), addr.IsMulticast():
-				return core.Wrap(core.ErrInvalid, s)
-			default:
-				addrs = append(addrs, addr)
-			}
-		}
-
-		mgr, err := newDNSManagerCommand(cmd, true, true)
-		if err != nil {
-			return err
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), DNSSyncTimeout)
-		defer cancel()
-
-		return mgr.Add(ctx, args[0], addrs...)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(dnsCmd)
-
-	dnsCmd.AddCommand(dnsWriteCmd)
-	dnsCmd.AddCommand(dnsSyncCmd)
-	dnsCmd.AddCommand(dnsShowCmd)
-	dnsCmd.AddCommand(dnsAddCmd)
-}

cmd/jpictl/dump.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/burntSushi/toml"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 )
@@ -19,8 +20,8 @@ type Encoder interface {
 type Encoding int
 
 const (
-	// UndefinedEncoding implies the default encoding
-	UndefinedEncoding Encoding = iota
+	// TOMLEncoding represents TOML encoding
+	TOMLEncoding Encoding = iota
 	// JSONEncoding represents JSON encoding
 	JSONEncoding
 	// YAMLEncoding represents YAML encoding
@@ -41,13 +42,18 @@ func NewYAMLEncoder(w io.Writer) Encoder {
 	return enc
 }
 
+// NewTOMLEncoder returns a TOML [Encoder] to work on the given [io.Writer]
+func NewTOMLEncoder(w io.Writer) Encoder {
+	enc := toml.NewEncoder(w)
+	return enc
+}
+
 const encoding = YAMLEncoding
 
 // Command
 var dumpCmd = &cobra.Command{
-	Use:    "dump",
-	Short:  "generates a text representation of the config",
-	PreRun: setVerbosity,
+	Use:   "dump",
+	Short: "generates a text representation of the config",
 	RunE: func(_ *cobra.Command, _ []string) error {
 		var buf bytes.Buffer
 		var enc Encoder
@@ -60,8 +66,10 @@ var dumpCmd = &cobra.Command{
 		switch encoding {
 		case JSONEncoding:
 			enc = NewJSONEncoder(&buf)
-		default:
+		case YAMLEncoding:
 			enc = NewYAMLEncoder(&buf)
+		default:
+			enc = NewTOMLEncoder(&buf)
 		}
 
 		if err = enc.Encode(m); err != nil {

cmd/jpictl/env.go

@@ -8,9 +8,8 @@ import (
 
 // Command
 var envCmd = &cobra.Command{
-	Use:    "env",
-	Short:  "generates environment variables for shell scripts",
-	PreRun: setVerbosity,
+	Use:   "env",
+	Short: "generates environment variables for shell scripts",
 	RunE: func(_ *cobra.Command, _ []string) error {
 		m, err := cfg.LoadZones(false)
 		if err != nil {

cmd/jpictl/gateway.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
+	"git.jpi.io/amery/jpictl/pkg/zones"
 	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
 )
 
 // Command
@@ -19,9 +19,8 @@ var gatewayCmd = &cobra.Command{
 
 // gateway set
 var gatewaySetCmd = &cobra.Command{
-	Use:    "set",
-	Short:  "gateway set sets machines as gateways",
-	PreRun: setVerbosity,
+	Use:   "set",
+	Short: "gateway set sets machines as gateways",
 	RunE: func(_ *cobra.Command, args []string) error {
 		m, err := cfg.LoadZones(false)
 		if err != nil {
@@ -38,12 +37,12 @@ var gatewaySetCmd = &cobra.Command{
 	},
 }
 
-func gatewaySet(zi cluster.ZoneIterator, gw string) error {
+func gatewaySet(zi zones.ZoneIterator, gw string) error {
 	var err error
-	zi.ForEachZone(func(z *cluster.Zone) bool {
+	zi.ForEachZone(func(z *zones.Zone) bool {
 		for _, m := range z.Machines {
 			if m.Name == gw {
-				_ = z.SetGateway(m.ID, true)
+				z.SetGateway(m.ID, true)
 				return true
 			}
 		}
@@ -74,13 +73,13 @@ var gatewayUnsetCmd = &cobra.Command{
 	},
 }
 
-func gatewayUnset(zi cluster.ZoneIterator, ngw string) error {
+func gatewayUnset(zi zones.ZoneIterator, ngw string) error {
 	var err error
-	zi.ForEachZone(func(z *cluster.Zone) bool {
+	zi.ForEachZone(func(z *zones.Zone) bool {
 		for _, m := range z.Machines {
 			if m.Name == ngw && m.IsGateway() {
-				_ = z.SetGateway(m.ID, false)
-				_ = m.RemoveWireguardConfig(0)
+				z.SetGateway(m.ID, false)
+				m.RemoveWireguardConfig(0)
 				return true
 			}
 		}
@@ -115,10 +114,10 @@ var gatewayListCmd = &cobra.Command{
 	},
 }
 
-func gatewayListAll(zi cluster.ZoneIterator) error {
+func gatewayListAll(zi zones.ZoneIterator) error {
 	var b bytes.Buffer
 	var err error
-	zi.ForEachZone(func(z *cluster.Zone) bool {
+	zi.ForEachZone(func(z *zones.Zone) bool {
 		b.WriteString(z.Name + ":")
 		var sIDs []string
 		ids, num := z.GatewayIDs()
@@ -127,7 +126,7 @@ func gatewayListAll(zi cluster.ZoneIterator) error {
 			return false
 		}
 		for _, i := range ids {
-			sIDs = append(sIDs, i.String())
+			sIDs = append(sIDs, strconv.Itoa(i))
 		}
 		b.WriteString(strings.Join(sIDs, ", "))
 		b.WriteString("\n")
@@ -137,10 +136,10 @@ func gatewayListAll(zi cluster.ZoneIterator) error {
 	return err
 }
 
-func gatewayList(zi cluster.ZoneIterator, m string) error {
+func gatewayList(zi zones.ZoneIterator, m string) error {
 	var b bytes.Buffer
 	var err error
-	zi.ForEachZone(func(z *cluster.Zone) bool {
+	zi.ForEachZone(func(z *zones.Zone) bool {
 		if z.Name == m {
 			b.WriteString(z.Name + ":")
 			ids, num := z.GatewayIDs()

cmd/jpictl/list.go

@@ -1,200 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io"
-	"net/netip"
-	"os"
-
-	"darvaza.org/core"
-	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
-	"git.jpi.io/amery/jpictl/pkg/rings"
-	"git.jpi.io/amery/jpictl/pkg/tools"
-)
-
-type inventory struct {
-	r []*cluster.Region
-	z [][]*cluster.Zone
-}
-
-func (g *inventory) renderRingZero(out *tools.LazyBuffer) error {
-	ring0 := netip.PrefixFrom(rings.UnsafeRingZeroAddress(0, 0, 0), rings.RingZeroBits)
-	from, to, _ := rings.PrefixToRange(ring0)
-
-	_ = out.Printf("; wg%v\n", 0)
-	_ = out.Printf("%s\t%s-%s\n", ring0, from, to)
-
-	if err := g.renderRingZeroRegions(out); err != nil {
-		return err
-	}
-
-	return g.renderRingZeroZones(out)
-}
-
-func (g *inventory) renderRingZeroRegions(out *tools.LazyBuffer) error {
-	for _, r := range g.r {
-		if err := g.renderRingZeroRegion(out, r); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (*inventory) renderRingZeroRegion(out *tools.LazyBuffer, r *cluster.Region) error {
-	addr := rings.UnsafeRingZeroAddress(r.ID, 0, 0)
-	ring0r := netip.PrefixFrom(addr, rings.RingZeroBits+4)
-	from, to, _ := rings.PrefixToRange(ring0r)
-
-	_ = out.Printf("%s\t%s-%s\t# %s\n", ring0r, from, to, r.Name)
-	return nil
-}
-
-func (g *inventory) renderRingZeroZones(out *tools.LazyBuffer) error {
-	for i, r := range g.r {
-		for _, z := range g.z[i] {
-			if err := g.renderRingZeroZone(out, r, z); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-func (*inventory) renderRingZeroZone(out *tools.LazyBuffer, r *cluster.Region, z *cluster.Zone) error {
-	addr := rings.UnsafeRingZeroAddress(r.ID, z.ID, 0)
-	ring0rz := netip.PrefixFrom(addr, rings.RingZeroBits+4+4)
-	from, to, _ := rings.PrefixToRange(ring0rz)
-
-	_ = out.Printf("; wg%v: %s (%s)\n", 0, z.Name, r.Name)
-	_ = out.Printf("%s\t%s-%s\t%s\n", ring0rz, from, to, z.Name)
-
-	z.ForEachMachine(func(m *cluster.Machine) bool {
-		if m.IsGateway() {
-			addr, _ := m.RingZeroAddress()
-			cidr := netip.PrefixFrom(addr, 32)
-			_ = out.Printf("%s\t\t%s-%v\n", cidr, m.Name, 0)
-		}
-
-		return false
-	})
-
-	return nil
-}
-
-func (g *inventory) renderRingOne(out *tools.LazyBuffer) error {
-	for i, r := range g.r {
-		for _, z := range g.z[i] {
-			if err := g.renderRingOneZone(out, r, z); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (*inventory) renderRingOneZone(out *tools.LazyBuffer, r *cluster.Region, z *cluster.Zone) error {
-	ring1, err := rings.RingOnePrefix(r.ID, z.ID)
-	if err != nil {
-		return err
-	}
-
-	from, to, _ := rings.PrefixToRange(ring1)
-
-	_ = out.Printf("; wg%v: %s (%s)\n", 1, z.Name, r.Name)
-	_ = out.Printf("%s\t%s-%s\t%s\n", ring1, from, to, z.Name)
-
-	z.ForEachMachine(func(m *cluster.Machine) bool {
-		addr := m.RingOneAddress()
-		cidr := netip.PrefixFrom(addr, 32)
-		_ = out.Printf("%s\t\t%s-%v\n", cidr, m.Name, 1)
-		return false
-	})
-	return nil
-}
-
-func (g *inventory) Marshal() ([]byte, error) {
-	var buf tools.LazyBuffer
-
-	if err := g.renderRingZero(&buf); err != nil {
-		return nil, err
-	}
-
-	if err := g.renderRingOne(&buf); err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-func (g *inventory) WriteTo(out io.Writer) (int64, error) {
-	b, err := g.Marshal()
-	if err != nil {
-		return 0, err
-	}
-
-	buf := bytes.NewBuffer(b)
-	return buf.WriteTo(out)
-}
-
-func genInventory(m *cluster.Cluster) (*inventory, error) {
-	g := new(inventory)
-
-	g.populateRegions(m)
-	g.populateZones()
-
-	return g, nil
-}
-
-func (g *inventory) populateRegions(m *cluster.Cluster) {
-	m.ForEachRegion(func(r *cluster.Region) bool {
-		if r.IsPrimary() {
-			g.r = append(g.r, r)
-		}
-		return false
-	})
-
-	core.SliceSortFn(g.r, func(a, b *cluster.Region) bool {
-		return a.ID < b.ID
-	})
-}
-
-func (g *inventory) populateZones() {
-	g.z = make([][]*cluster.Zone, len(g.r))
-	for i, r := range g.r {
-		r.ForEachZone(func(z *cluster.Zone) bool {
-			g.z[i] = append(g.z[i], z)
-			return false
-		})
-
-		core.SliceSortFn(g.z[i], func(a, b *cluster.Zone) bool {
-			return a.ID < b.ID
-		})
-	}
-}
-
-// Command
-var listCmd = &cobra.Command{
-	Use:    "list",
-	Short:  "list shows the IP/CIDR inventory",
-	PreRun: setVerbosity,
-	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := cfg.LoadZones(false)
-		if err != nil {
-			return err
-		}
-
-		out, err := genInventory(m)
-		if err != nil {
-			return err
-		}
-
-		_, err = out.WriteTo(os.Stdout)
-		return err
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(listCmd)
-}

cmd/jpictl/log.go

@@ -5,10 +5,12 @@ import (
 
 	"darvaza.org/sidecar/pkg/logger/zerolog"
 	"darvaza.org/slog"
-	"github.com/spf13/cobra"
 )
 
-var log = zerolog.New(nil, slog.Error)
+// TODO: make log level configurable via flags
+var (
+	log = zerolog.New(nil, slog.Debug)
+)
 
 // fatal is a convenience wrapper for slog.Logger.Fatal().Print()
 func fatal(err error, msg string, args ...any) {
@@ -23,20 +25,3 @@ func fatal(err error, msg string, args ...any) {
 
 	panic("unreachable")
 }
-
-var verbosity int
-
-// setVerbosity replaces the global logger using the
-// verbosity level specified via -v flags
-func setVerbosity(_ *cobra.Command, _ []string) {
-	desired := int8(slog.Error) + int8(verbosity)
-	if desired > 6 {
-		desired = 6
-	}
-	log = zerolog.New(nil, slog.LogLevel(desired))
-}
-
-func init() {
-	rootCmd.PersistentFlags().CountVarP(&verbosity, "verbosity", "v",
-		"increase the verbosity level to Warn, Info or Debug")
-}

cmd/jpictl/main.go

@@ -2,8 +2,6 @@
 package main
 
 import (
-	_ "embed"
-
 	"github.com/spf13/cobra"
 )
 
@@ -12,13 +10,10 @@ const (
 	CmdName = "jpictl"
 )
 
-var (
-	rootCmd = &cobra.Command{
-		Use:     CmdName,
-		Short:   "control tool for jpi.cloud",
-		Version: version,
-	}
-)
+var rootCmd = &cobra.Command{
+	Use:   CmdName,
+	Short: "control tool for jpi.cloud",
+}
 
 func main() {
 	if err := rootCmd.Execute(); err != nil {

cmd/jpictl/version.go

@@ -1,31 +0,0 @@
-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)
-}

cmd/jpictl/write.go

@@ -6,9 +6,8 @@ import (
 
 // Command
 var writeCmd = &cobra.Command{
-	Use:    "write",
-	Short:  "rewrites all config files",
-	PreRun: setVerbosity,
+	Use:   "write",
+	Short: "rewrites all config files",
 	RunE: func(_ *cobra.Command, _ []string) error {
 		m, err := cfg.LoadZones(false)
 		if err != nil {

go.mod

@@ -1,43 +1,48 @@
 module git.jpi.io/amery/jpictl
 
-go 1.21
+go 1.19
 
 require (
-	asciigoat.org/core v0.3.9 // indirect
 	asciigoat.org/ini v0.2.5
-	darvaza.org/cache/x/simplelru v0.1.8 // indirect
-	darvaza.org/core v0.14.2
-	darvaza.org/resolver v0.9.2
-	darvaza.org/sidecar v0.4.0
-	darvaza.org/slog v0.5.7
-	darvaza.org/slog/handlers/discard v0.4.11
-	darvaza.org/slog/handlers/filter v0.4.9 // indirect
-	darvaza.org/slog/handlers/zerolog v0.4.9 // indirect
-)
-
-require (
-	github.com/gofrs/uuid/v5 v5.2.0
+	darvaza.org/core v0.9.8
+	darvaza.org/resolver v0.5.4
+	darvaza.org/sidecar v0.0.2
+	darvaza.org/slog v0.5.3
+	darvaza.org/slog/handlers/discard v0.4.5
+	github.com/burntSushi/toml v0.3.1
+	github.com/gofrs/uuid/v5 v5.0.0
 	github.com/hack-pad/hackpadfs v0.2.1
-	github.com/libdns/cloudflare v0.1.1
-	github.com/libdns/libdns v0.2.2
-	github.com/spf13/cobra v1.8.0
-	golang.org/x/crypto v0.25.0
-	golang.org/x/net v0.27.0
+	github.com/mgechev/revive v1.3.3
+	github.com/spf13/cobra v1.7.0
+	golang.org/x/crypto v0.12.0
+	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	asciigoat.org/core v0.3.9 // indirect
+	darvaza.org/slog/handlers/filter v0.4.5 // indirect
+	darvaza.org/slog/handlers/zerolog v0.4.5 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/chavacava/garif v0.1.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/miekg/dns v1.1.59 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
+	github.com/miekg/dns v1.1.55 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rs/zerolog v1.30.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -2,80 +2,108 @@ 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.14.2 h1:6p0iznuGfVGbBp+CnkZTw1b76j6Q/j4ffDztZXrrlK8=
-darvaza.org/core v0.14.2/go.mod h1:C+B0GRNLB+/asGfxjQ9XZERdk7xaFxzt5xTIBPiNm2M=
-darvaza.org/resolver v0.9.2 h1:sUX6LZ1eN5TzJW7L4m7HM+BvwBeWl8dYYDGVSe+AIhk=
-darvaza.org/resolver v0.9.2/go.mod h1:XWqPhrxoOKNzRuSozOwmE1M6QVqQL28jEdxylnIO8Nw=
-darvaza.org/sidecar v0.4.0 h1:wHghxzLsiT82WDBBUf34aTqtOvRBg4UbxVIJgKNXRVA=
-darvaza.org/sidecar v0.4.0/go.mod h1:fUzjcFM4rN3bSEl4BKvok3MLpZWEhEa9+0/egmtpfMY=
-darvaza.org/slog v0.5.7 h1:JWC0OqvzR435AidIRDp4T9kdWTURWkUjzP4R78Koq1Q=
-darvaza.org/slog v0.5.7/go.mod h1:12L03t+KYhsZ9IbfF+8if5w9Y91af2par+bSzeBVqIQ=
-darvaza.org/slog/handlers/discard v0.4.11 h1:wr34OnDoRaMV1eGgW7yUaupQxjkTnuHrJmYRPj64RHM=
-darvaza.org/slog/handlers/discard v0.4.11/go.mod h1:ynxyLmZzZ5mP4ACLhQs4MEuDyhkIzjz6DfBHUjhnIK4=
-darvaza.org/slog/handlers/filter v0.4.9 h1:xD8OBwlJytpiwTSDDZqUuNSOsJuaManXQiOj9WEStr8=
-darvaza.org/slog/handlers/filter v0.4.9/go.mod h1:t+sjcf1c46kAdf1TRiQmop91xlkteZrC4WDXoVwHgP8=
-darvaza.org/slog/handlers/zerolog v0.4.9 h1:08FjRnwRGtJsLLBnbgxVorb/bkgm5QEM/LXD2cxeCbM=
-darvaza.org/slog/handlers/zerolog v0.4.9/go.mod h1:PZYfx6eOxQfD+cXJQp52iwKgcD30QVYHoXxOCojAOdw=
+darvaza.org/core v0.9.8 h1:luLxgfUc2pzuusYPo/Z/dC/qr9XZPKpSQw8/kS7zNUM=
+darvaza.org/core v0.9.8/go.mod h1:Dbme64naxeshQfxcVJX9ZT7AiGyIY8kldfuELVtf8mw=
+darvaza.org/resolver v0.5.4 h1:dlSBNV14yYsp7Kg7ipwYOMNsLbrpeXa8Z0HBTa0Ryxs=
+darvaza.org/resolver v0.5.4/go.mod h1:vHMkQUmHjaetFqG2ZLZJiQHsXEMGoTOFGm+NXwfndhE=
+darvaza.org/sidecar v0.0.2 h1:4H8FUxc43kkLjxdShN1CoxLTcoHQsZjDVwm7kt6eIK0=
+darvaza.org/sidecar v0.0.2/go.mod h1:yFC3Qt3j+uS7n9CMpLxwrA68z+FNJhENoenBc9zBJJo=
+darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0=
+darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0=
+darvaza.org/slog/handlers/discard v0.4.5 h1:RRykOItNolHyiUav57lG/GFBL33rcljoa0nWTpY+T0g=
+darvaza.org/slog/handlers/discard v0.4.5/go.mod h1:HYHfISQjMqcPbPoPZ92ib/u7s9JcXvF6OaygpPFwdF8=
+darvaza.org/slog/handlers/filter v0.4.5 h1:CX1bMzldd67e3y3s3Sh4jK8Lyo0WMvTGBB2lD315jhc=
+darvaza.org/slog/handlers/filter v0.4.5/go.mod h1:OuH9rHYg9CIErTJCZliMnFexBfP/HJ9PZ1V1VwSCZ1g=
+darvaza.org/slog/handlers/zerolog v0.4.5 h1:W4cgGORx4wImr+RL96CWSQGTdkZzKX6YHXPSYJvdoB4=
+darvaza.org/slog/handlers/zerolog v0.4.5/go.mod h1:mCoh/mIl8Nsa6Yu1Um7d7cos6RuEJzgaTXaX5LDRUao=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/burntSushi/toml v0.3.1 h1:Hu1cOEC2qtKULZJCzym5tyA35bZr3HREuolgiAzMlhY=
+github.com/burntSushi/toml v0.3.1/go.mod h1:sGTquCpRYr9McuHdv0m6YKIhx8DJGJa4t04/Y9pfSio=
+github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
+github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
+github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
-github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
+github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMIxMw=
 github.com/hack-pad/hackpadfs v0.2.1/go.mod h1:khQBuCEwGXWakkmq8ZiFUvUZz84ZkJ2KNwKvChs4OrU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/libdns/cloudflare v0.1.1 h1:FVPfWwP8zZCqj268LZjmkDleXlHPlFU9KC4OJ3yn054=
-github.com/libdns/cloudflare v0.1.1/go.mod h1:9VK91idpOjg6v7/WbjkEW49bSCxj00ALesIFDhJ8PBU=
-github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s=
-github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
+github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
+github.com/mgechev/revive v1.3.3 h1:GUWzV3g185agbHN4ZdaQvR6zrLVYTUSA2ktvIinivK0=
+github.com/mgechev/revive v1.3.3/go.mod h1:NhpOtVtDbjYNDj697eDUBTobijCDHQKar4HDKc0TuTo=
+github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
+github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
+github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
+gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

jpictl.code-workspace

@@ -1,14 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "../../../bitbucket.org/jpi/m.jpi.cloud"
-		},
-		{
-			"path": "../../../darvaza.org/core"
-		}
-	],
-	"settings": {}
-}

m/ceph.conf

@@ -1,8 +0,0 @@
-[global]
-fsid = 28180b9b-6d5d-4be0-bb5b-e4b04bf03804
-mon_initial_members = ssd-lon-7, ssd-ams-4, htz-fsn-1, ssd-nyc-3
-mon_host = 10.2.16.7, 10.1.32.4, 10.1.48.1, 10.3.64.3
-cluster_network = 10.0.0.0/8
-
-; don't rewrite labels on startup
-osd_class_update_on_start = false

m/eu/regions

@@ -1,2 +0,0 @@
-de
-nl

m/europe/regions

@@ -1,2 +0,0 @@
-eu
-uk

m/global/regions

@@ -1,2 +0,0 @@
-europe
-us

m/htz-fsn/htz-fsn-1/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s ceph k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/htz-fsn/htz-fsn-1/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: htz-fsn-1-0
-Address = 10.0.19.1
-PrivateKey = AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.2.16.0/20, 10.0.33.3/32
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.1.32.0/20, 10.0.18.3/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.3.64.0/20, 10.0.52.3/32

m/htz-fsn/htz-fsn-1/wg0.key

@@ -1 +0,0 @@
-AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=

m/htz-fsn/htz-fsn-1/wg0.pub

@@ -1 +0,0 @@
-K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=

m/htz-fsn/htz-fsn-1/wg1.conf

@@ -1,5 +0,0 @@
-[Interface]
-# Name: htz-fsn-1-1
-Address = 10.1.48.1
-PrivateKey = 2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=
-ListenPort = 51810

m/htz-fsn/htz-fsn-1/wg1.key

@@ -1 +0,0 @@
-2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=

m/htz-fsn/htz-fsn-1/wg1.pub

@@ -1 +0,0 @@
-qWmYfgeRAQ563gWLdeYs65XjGJTSE+W8WTbpLZ0e1CQ=

m/htz-fsn/regions

@@ -1 +0,0 @@
-de

m/ssd-ams/regions

@@ -1 +0,0 @@
-nl

m/ssd-ams/ssd-ams-3/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-ams-3-0
-Address = 10.0.18.3
-PrivateKey = oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.2.16.0/20, 10.0.33.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.1.48.0/20, 10.0.19.1/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.3.64.0/20, 10.0.52.3/32

m/ssd-ams/ssd-ams-3/wg0.key

@@ -1 +0,0 @@
-oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=

m/ssd-ams/ssd-ams-3/wg0.pub

@@ -1 +0,0 @@
-y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=

m/ssd-ams/ssd-ams-3/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-3-1
-Address = 10.1.32.3
-PrivateKey = 6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-4-1
-PublicKey = QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-Endpoint = ssd-ams-4.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.4/32
-
-[Peer]
-# Name: ssd-ams-5-1
-PublicKey = HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-Endpoint = ssd-ams-5.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.5/32

m/ssd-ams/ssd-ams-3/wg1.key

@@ -1 +0,0 @@
-6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=

m/ssd-ams/ssd-ams-3/wg1.pub

@@ -1 +0,0 @@
-9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=

m/ssd-ams/ssd-ams-4/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-4/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-4-1
-Address = 10.1.32.4
-PrivateKey = SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-3-1
-PublicKey = 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-Endpoint = ssd-ams-3.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.3/32, 10.2.16.0/20, 10.1.48.0/20, 10.3.64.0/20, 10.0.33.3/32, 10.0.18.3/32, 10.0.19.1/32, 10.0.52.3/32
-
-[Peer]
-# Name: ssd-ams-5-1
-PublicKey = HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-Endpoint = ssd-ams-5.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.5/32

m/ssd-ams/ssd-ams-4/wg1.key

@@ -1 +0,0 @@
-SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=

m/ssd-ams/ssd-ams-4/wg1.pub

@@ -1 +0,0 @@
-QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=

m/ssd-ams/ssd-ams-5/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-5/region

@@ -1 +0,0 @@
-none

m/ssd-ams/ssd-ams-5/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-5-1
-Address = 10.1.32.5
-PrivateKey = mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-3-1
-PublicKey = 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-Endpoint = ssd-ams-3.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.3/32, 10.2.16.0/20, 10.1.48.0/20, 10.3.64.0/20, 10.0.33.3/32, 10.0.18.3/32, 10.0.19.1/32, 10.0.52.3/32
-
-[Peer]
-# Name: ssd-ams-4-1
-PublicKey = QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-Endpoint = ssd-ams-4.m.jpi.cloud:51810
-AllowedIPs = 10.1.32.4/32

m/ssd-ams/ssd-ams-5/wg1.key

@@ -1 +0,0 @@
-mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=

m/ssd-ams/ssd-ams-5/wg1.pub

@@ -1 +0,0 @@
-HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=

m/ssd-lon/regions

@@ -1 +0,0 @@
-uk

m/ssd-lon/ssd-lon-3/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-3-0
-Address = 10.0.33.3
-PrivateKey = WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.1.32.0/20, 10.0.18.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.1.48.0/20, 10.0.19.1/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.3.64.0/20, 10.0.52.3/32

m/ssd-lon/ssd-lon-3/wg0.key

@@ -1 +0,0 @@
-WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=

m/ssd-lon/ssd-lon-3/wg0.pub

@@ -1 +0,0 @@
-aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=

m/ssd-lon/ssd-lon-3/wg1.conf

@@ -1,11 +0,0 @@
-[Interface]
-# Name: ssd-lon-3-1
-Address = 10.2.16.3
-PrivateKey = 2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-7-1
-PublicKey = XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-Endpoint = ssd-lon-7.m.jpi.cloud:51810
-AllowedIPs = 10.2.16.7/32

m/ssd-lon/ssd-lon-3/wg1.key

@@ -1 +0,0 @@
-2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=

m/ssd-lon/ssd-lon-3/wg1.pub

@@ -1 +0,0 @@
-untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=

m/ssd-lon/ssd-lon-7/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-7/wg1.conf

@@ -1,11 +0,0 @@
-[Interface]
-# Name: ssd-lon-7-1
-Address = 10.2.16.7
-PrivateKey = iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-3-1
-PublicKey = untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-Endpoint = ssd-lon-3.m.jpi.cloud:51810
-AllowedIPs = 10.2.16.3/32, 10.1.32.0/20, 10.1.48.0/20, 10.3.64.0/20, 10.0.33.3/32, 10.0.18.3/32, 10.0.19.1/32, 10.0.52.3/32

m/ssd-lon/ssd-lon-7/wg1.key

@@ -1 +0,0 @@
-iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=

m/ssd-lon/ssd-lon-7/wg1.pub

@@ -1 +0,0 @@
-XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=

m/ssd-nyc/regions

@@ -1 +0,0 @@
-us

m/ssd-nyc/ssd-nyc-3/hosts

@@ -1,22 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.2.16.3  ssd-lon-3
-10.2.16.7  ssd-lon-7 ssd-lon-ceph ssd-lon-k3s
-10.1.32.3  ssd-ams-3
-10.1.32.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.1.32.5  ssd-ams-5
-10.1.48.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.3.64.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s ceph k3s
-
-10.0.33.3  ssd-lon-3-0
-10.0.18.3  ssd-ams-3-0
-10.0.19.1  htz-fsn-1-0
-10.0.52.3  ssd-nyc-3-0

m/ssd-nyc/ssd-nyc-3/region

@@ -1 +0,0 @@
-none

m/ssd-nyc/ssd-nyc-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-nyc-3-0
-Address = 10.0.52.3
-PrivateKey = YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.2.16.0/20, 10.0.33.3/32
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.1.32.0/20, 10.0.18.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.1.48.0/20, 10.0.19.1/32

m/ssd-nyc/ssd-nyc-3/wg0.key

@@ -1 +0,0 @@
-YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=

m/ssd-nyc/ssd-nyc-3/wg0.pub

@@ -1 +0,0 @@
-1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=

m/ssd-nyc/ssd-nyc-3/wg1.conf

@@ -1,5 +0,0 @@
-[Interface]
-# Name: ssd-nyc-3-1
-Address = 10.3.64.3
-PrivateKey = APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=
-ListenPort = 51810

m/ssd-nyc/ssd-nyc-3/wg1.key

@@ -1 +0,0 @@
-APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=

m/ssd-nyc/ssd-nyc-3/wg1.pub

@@ -1 +0,0 @@
-av8ni/9ZUyozabzqTjIy1sOnSJuQ9p63Tu9ECVmHB2I=

pkg/ceph/config.go

@@ -39,9 +39,6 @@ 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

@@ -17,7 +17,7 @@ var sectionMap = map[string]func(*Config, *basic.Section) error{
 func loadConfSection(out *Config, src *basic.Section) error {
 	h, ok := sectionMap[src.Key]
 	if !ok {
-		return core.Wrap(fs.ErrInvalid, "unknown section %q", src.Key)
+		return core.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
 	}
 
 	return h(out, src)
@@ -48,7 +48,7 @@ func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
 	switch field.Key {
 	case "fsid":
 		if !core.IsZero(cfg.FSID) {
-			return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
 		}
 
 		err := cfg.FSID.UnmarshalText([]byte(field.Value))

pkg/cluster/addr.go

@@ -1,43 +0,0 @@
-package cluster
-
-import (
-	"net/netip"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-// RingOnePrefix returns the ring 1 subnet of this [Zone].
-func (z *Zone) RingOnePrefix() netip.Prefix {
-	subnet, err := rings.RingOnePrefix(z.RegionID(), z.ID)
-	if err != nil {
-		panic(err)
-	}
-	return subnet
-}
-
-// RingOnePrefix returns the ring 1 subnet this [Machine] belongs
-// to.
-func (m *Machine) RingOnePrefix() netip.Prefix {
-	return m.zone.RingOnePrefix()
-}
-
-// RingZeroAddress returns the ring 0 address of the [Machine]
-// if it can act as gateway.
-func (m *Machine) RingZeroAddress() (netip.Addr, bool) {
-	addr, err := rings.RingZeroAddress(m.Region(), m.Zone(), m.ID)
-	if err != nil {
-		return netip.Addr{}, false
-	}
-
-	return addr, true
-}
-
-// RingOneAddress returns the ring 1 address of the [Machine]
-func (m *Machine) RingOneAddress() netip.Addr {
-	addr, err := rings.RingOneAddress(m.Region(), m.Zone(), m.ID)
-	if err != nil {
-		panic(err)
-	}
-
-	return addr
-}

pkg/cluster/ceph_scan.go

@@ -1,104 +0,0 @@
-package cluster
-
-import (
-	"os"
-
-	"darvaza.org/slog"
-
-	"git.jpi.io/amery/jpictl/pkg/ceph"
-)
-
-type cephScanTODO struct {
-	names map[string]bool
-	addrs map[string]bool
-}
-
-func (todo *cephScanTODO) checkMachine(p *Machine) bool {
-	// on ceph all addresses are ring1
-	addr := p.RingOneAddress().String()
-
-	if _, found := todo.names[p.Name]; found {
-		// found on the TODO by name
-		todo.names[p.Name] = true
-		todo.addrs[addr] = true
-		return true
-	}
-
-	if _, found := todo.addrs[addr]; found {
-		// found on the TODO by address
-		todo.names[p.Name] = true
-		todo.addrs[addr] = true
-		return true
-	}
-
-	return false
-}
-
-func (todo *cephScanTODO) LogMissing(log slog.Logger) {
-	for name, found := range todo.names {
-		if !found {
-			log.Warn().
-				WithField("subsystem", "ceph").
-				WithField("monitor", name).
-				Print("unknown monitor")
-		}
-	}
-
-	for addr, found := range todo.addrs {
-		if !found {
-			log.Warn().
-				WithField("subsystem", "ceph").
-				WithField("monitor", addr).
-				Print("unknown monitor")
-		}
-	}
-}
-
-func newCephScanTODO(cfg *ceph.Config) *cephScanTODO {
-	todo := &cephScanTODO{
-		names: make(map[string]bool),
-		addrs: make(map[string]bool),
-	}
-
-	for _, name := range cfg.Global.Monitors {
-		todo.names[name] = false
-	}
-
-	for _, addr := range cfg.Global.MonitorsAddr {
-		todo.addrs[addr.String()] = false
-	}
-
-	return todo
-}
-
-func (m *Cluster) scanCephMonitors(opts *ScanOptions) error {
-	cfg, err := m.GetCephConfig()
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	if cfg != nil {
-		// store FSID
-		m.CephFSID = cfg.Global.FSID
-
-		// flag monitors based on config
-		todo := newCephScanTODO(cfg)
-		m.ForEachMachine(func(p *Machine) bool {
-			p.CephMonitor = todo.checkMachine(p)
-			return false
-		})
-
-		todo.LogMissing(m.log)
-	}
-
-	return m.initCephMonitors(opts)
-}
-
-func (m *Cluster) initCephMonitors(_ *ScanOptions) error {
-	// make sure every zone has one
-	m.ForEachZone(func(z *Zone) bool {
-		_ = z.GetCephMonitors()
-		return false
-	})
-	return nil
-}

pkg/cluster/cluster.go

@@ -1,78 +0,0 @@
-// Package cluster contains information about the cluster
-package cluster
-
-import (
-	"io/fs"
-
-	"darvaza.org/resolver"
-	"darvaza.org/slog"
-	"github.com/gofrs/uuid/v5"
-)
-
-var (
-	_ MachineIterator = (*Cluster)(nil)
-	_ ZoneIterator    = (*Cluster)(nil)
-)
-
-// revive:disable:line-length-limit
-
-// Cluster represents all zones in a cluster
-type Cluster struct {
-	dir      fs.FS
-	log      slog.Logger
-	resolver resolver.Resolver
-
-	BaseDir string `json:"dir,omitempty"    yaml:"dir,omitempty"`
-	Name    string `json:"name,omitempty"   yaml:"name,omitempty"`
-	Domain  string `json:"domain,omitempty" yaml:"domain,omitempty"`
-
-	CephFSID uuid.UUID `json:"ceph_fsid,omitempty" yaml:"ceph_fsid,omitempty"`
-	Regions  []Region  `json:",omitempty"          yaml:",omitempty"`
-	Zones    []*Zone   `json:",omitempty"          yaml:",omitempty"`
-}
-
-// revive:enable:line-length-limit
-
-// ForEachMachine calls a function for each Machine in the cluster
-// until instructed to terminate the loop
-func (m *Cluster) ForEachMachine(fn func(*Machine) bool) {
-	m.ForEachZone(func(z *Zone) bool {
-		var term bool
-
-		z.ForEachMachine(func(p *Machine) bool {
-			term = fn(p)
-			return term
-		})
-
-		return term
-	})
-}
-
-// ForEachZone calls a function for each Zone in the cluster
-// until instructed to terminate the loop
-func (m *Cluster) ForEachZone(fn func(*Zone) bool) {
-	for _, p := range m.Zones {
-		if fn(p) {
-			// terminate
-			return
-		}
-	}
-}
-
-// GetMachineByName looks for a machine with the specified
-// name on any zone
-func (m *Cluster) GetMachineByName(name string) (*Machine, bool) {
-	var out *Machine
-
-	if name != "" {
-		m.ForEachMachine(func(p *Machine) bool {
-			if p.Name == name {
-				out = p
-			}
-
-			return out != nil
-		})
-	}
-
-	return out, out != nil
-}

pkg/cluster/cluster_file.go

@@ -1,115 +0,0 @@
-package cluster
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	fs "github.com/hack-pad/hackpadfs"
-)
-
-// OpenFile opens a file on the cluster's config directory with the specified flags
-func (m *Cluster) OpenFile(name string, flags int, args ...any) (fs.File, error) {
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	return fs.OpenFile(m.dir, name, flags, 0644)
-}
-
-// CreateTruncFile creates or truncates a file on the cluster's config directory
-func (m *Cluster) CreateTruncFile(name string, args ...any) (io.WriteCloser, error) {
-	return m.openWriter(name, os.O_CREATE|os.O_TRUNC, args...)
-}
-
-// CreateFile creates a file on the cluster's config directory
-func (m *Cluster) CreateFile(name string, args ...any) (io.WriteCloser, error) {
-	return m.openWriter(name, os.O_CREATE, args...)
-}
-
-func (m *Cluster) openWriter(name string, flags int, args ...any) (io.WriteCloser, error) {
-	f, err := m.OpenFile(name, os.O_WRONLY|flags, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	if f, ok := f.(io.WriteCloser); ok {
-		return f, nil
-	}
-
-	panic("unreachable")
-}
-
-// RemoveFile deletes a file from the cluster's config directory
-func (m *Cluster) RemoveFile(name string, args ...any) error {
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	err := fs.Remove(m.dir, name)
-	switch {
-	case os.IsNotExist(err):
-		return nil
-	default:
-		return err
-	}
-}
-
-// ReadFile reads a file from the cluster's config directory
-func (m *Cluster) ReadFile(name string, args ...any) ([]byte, error) {
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	return fs.ReadFile(m.dir, name)
-}
-
-// ReadLines reads a file from the cluster's config directory,
-// split by lines, trimmed, and accepting `#` to comment lines out.
-func (m *Cluster) ReadLines(name string, args ...any) ([]string, error) {
-	var out []string
-
-	data, err := m.ReadFile(name, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	sc := bufio.NewScanner(bytes.NewReader(data))
-	for sc.Scan() {
-		s := strings.TrimSpace(sc.Text())
-		switch {
-		case s == "", strings.HasPrefix(s, "#"):
-			// ignore
-		default:
-			// accepted
-			out = append(out, s)
-		}
-	}
-
-	return out, nil
-}
-
-// WriteStringFile writes the given content to a file on the machine's config directory
-func (m *Cluster) WriteStringFile(value string, name string, args ...any) error {
-	f, err := m.CreateTruncFile(name, args...)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	buf := bytes.NewBufferString(value)
-	_, err = buf.WriteTo(f)
-	return err
-}
-
-// MkdirAll creates directories relative to the cluster's config directory
-func (m *Cluster) MkdirAll(name string, args ...any) error {
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	return fs.MkdirAll(m.dir, name, 0755)
-}

pkg/cluster/cluster_fs.go

@@ -1,25 +0,0 @@
-package cluster
-
-import (
-	"io/fs"
-	"path/filepath"
-
-	"github.com/hack-pad/hackpadfs/os"
-)
-
-// DirFS returns a file system (an [fs.FS]) for the tree
-// of files rooted at the directory dir.
-func DirFS(dir string) (fs.FS, error) {
-	dir = filepath.Clean(dir)
-	fullPath, err := filepath.Abs(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	sub, err := os.NewFS().Sub(fullPath[1:])
-	if err != nil {
-		return nil, err
-	}
-
-	return sub, nil
-}

pkg/cluster/cluster_import.go

@@ -1,141 +0,0 @@
-package cluster
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"gopkg.in/yaml.v3"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-func (m *Cluster) init(opts *ScanOptions) error {
-	for _, fn := range []func(*ScanOptions) error{
-		m.initZones,
-		m.initRegions,
-		m.scanZoneIDs,
-		m.scanSort,
-		m.scanGateways,
-		m.initCephMonitors,
-	} {
-		if err := fn(opts); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Cluster) initZones(opts *ScanOptions) error {
-	var err error
-
-	sub, err := DirFS(m.BaseDir)
-	if err != nil {
-		return err
-	}
-
-	m.dir = sub
-
-	m.ForEachZone(func(z *Zone) bool {
-		err = m.initZone(z, opts)
-		return err != nil
-	})
-
-	return err
-}
-
-func (m *Cluster) initZone(z *Zone, _ *ScanOptions) error {
-	var hasMissing bool
-	var lastMachineID rings.NodeID
-
-	z.zones = m
-	z.logger = m
-
-	z.ForEachMachine(func(p *Machine) bool {
-		p.zone = z
-		p.logger = z
-
-		switch {
-		case p.ID == 0:
-			hasMissing = true
-		case p.ID > lastMachineID:
-			lastMachineID = p.ID
-		}
-
-		return false
-	})
-
-	if hasMissing {
-		next := lastMachineID + 1
-
-		z.ForEachMachine(func(p *Machine) bool {
-			if p.ID == 0 {
-				p.ID, next = next, next+1
-			}
-
-			return false
-		})
-	}
-
-	z.ForEachMachine(func(p *Machine) bool {
-		p.Name = fmt.Sprintf("%s-%v", z.Name, p.ID)
-		return false
-	})
-
-	return nil
-}
-
-func decodeConfigData(data []byte) (out *Cluster, err error) {
-	// try JSON first
-	out = new(Cluster)
-	err = json.Unmarshal(data, out)
-	if err == nil {
-		// good json
-		return out, nil
-	} else if _, ok := err.(*json.SyntaxError); !ok {
-		// bad json
-		return nil, err
-	}
-
-	out = new(Cluster)
-	err = yaml.Unmarshal(data, out)
-	if err != nil {
-		// bad yaml too
-		return nil, err
-	}
-
-	// good yaml
-	return out, nil
-}
-
-// NewFromConfig loads the cluster data from the given file
-func NewFromConfig(filename string, opts ...ScanOption) (*Cluster, error) {
-	var scanOptions ScanOptions
-
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	m, err := decodeConfigData(data)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, opt := range opts {
-		if err = opt(m, &scanOptions); err != nil {
-			return nil, err
-		}
-	}
-
-	if err = m.setScanDefaults(&scanOptions); err != nil {
-		return nil, err
-	}
-
-	if err := m.init(&scanOptions); err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}

pkg/cluster/cluster_scan.go

@@ -1,317 +0,0 @@
-package cluster
-
-import (
-	"io/fs"
-	"path"
-	"sort"
-	"strings"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-const (
-	// ZoneRegionsFileName indicates the file containing
-	// region names as references
-	ZoneRegionsFileName = "regions"
-
-	// RegionClusterTokenFileName contains the kubernetes
-	// token of the cluster this region represents
-	RegionClusterTokenFileName = "k8s_token"
-)
-
-func (m *Cluster) scan(opts *ScanOptions) error {
-	for _, fn := range []func(*ScanOptions) error{
-		m.scanDirectory,
-		m.scanMachines,
-		m.initRegions,
-		m.scanZoneIDs,
-		m.scanSort,
-		m.scanGateways,
-		m.scanCephMonitors,
-	} {
-		if err := fn(opts); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Cluster) scanDirectory(opts *ScanOptions) error {
-	// each directory is a zone
-	entries, err := fs.ReadDir(m.dir, ".")
-	if err != nil {
-		return err
-	}
-
-	for _, e := range entries {
-		if e.IsDir() {
-			ok, err := m.scanSubdirectory(opts, e.Name())
-			switch {
-			case err != nil:
-				return core.Wrap(err, e.Name())
-			case !ok:
-				m.warn(nil).
-					WithField("zone", e.Name()).
-					Print("empty")
-			}
-		}
-	}
-
-	return nil
-}
-
-func (m *Cluster) scanSubdirectory(_ *ScanOptions, name string) (bool, error) {
-	z, err := m.newZone(name)
-	switch {
-	case err != nil:
-		// somewhere went wrong scanning the subdirectory
-		return false, err
-	case z.Machines.Len() > 0:
-		// zones have machines and the regions they belong
-		m.Zones = append(m.Zones, z)
-		return true, nil
-	case len(z.Regions) > 0:
-		// regions have no machines but can include
-		// other regions
-		m.appendRegionRegions(name, z.Regions...)
-		return true, nil
-	default:
-		// empty
-		return false, nil
-	}
-}
-
-func (m *Cluster) newZone(name string) (*Zone, error) {
-	z := &Zone{
-		zones:  m,
-		logger: m,
-		Name:   name,
-	}
-
-	z.debug().
-		WithField("zone", z.Name).
-		Print("found")
-
-	if err := z.scan(); err != nil {
-		return nil, err
-	}
-	return z, nil
-}
-
-func (m *Cluster) scanMachines(opts *ScanOptions) error {
-	var err error
-	m.ForEachMachine(func(p *Machine) bool {
-		err = p.scan(opts)
-		return err != nil
-	})
-	m.ForEachMachine(func(p *Machine) bool {
-		err = p.scanWrapUp(opts)
-		return err != nil
-	})
-	return err
-}
-
-func (m *Cluster) scanZoneIDs(_ *ScanOptions) error {
-	var hasMissing bool
-	var lastZoneID rings.ZoneID
-
-	m.ForEachZone(func(z *Zone) bool {
-		switch {
-		case z.ID == 0:
-			hasMissing = true
-		case z.ID > lastZoneID:
-			lastZoneID = z.ID
-		}
-
-		return false
-	})
-
-	if hasMissing {
-		next := lastZoneID + 1
-
-		m.ForEachZone(func(z *Zone) bool {
-			if z.ID == 0 {
-				z.ID, next = next, next+1
-			}
-
-			return false
-		})
-	}
-
-	return nil
-}
-
-func (m *Cluster) scanSort(_ *ScanOptions) error {
-	sort.SliceStable(m.Zones, func(i, j int) bool {
-		id1 := m.Zones[i].ID
-		id2 := m.Zones[j].ID
-		return id1 < id2
-	})
-
-	m.ForEachZone(func(z *Zone) bool {
-		sort.Sort(z)
-		return false
-	})
-
-	m.ForEachMachine(func(p *Machine) bool {
-		sort.SliceStable(p.Rings, func(i, j int) bool {
-			ri1 := p.Rings[i]
-			ri2 := p.Rings[j]
-
-			return ri1.Ring < ri2.Ring
-		})
-
-		return false
-	})
-
-	return nil
-}
-
-func (m *Cluster) scanGateways(_ *ScanOptions) error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		_, _, err = z.GetGateway()
-		return err != nil
-	})
-	return err
-}
-
-func (z *Zone) scan() error {
-	// each directory is a machine
-	entries, err := fs.ReadDir(z.zones.dir, z.Name)
-	if err != nil {
-		return err
-	}
-
-	for _, e := range entries {
-		name := e.Name()
-
-		switch {
-		case name == ZoneRegionsFileName:
-			err = z.loadRegions()
-		case name == RegionClusterTokenFileName:
-			err = z.loadClusterToken()
-		case e.IsDir():
-			err = z.scanSubdirectory(name)
-		default:
-			z.warn(nil).
-				WithField("zone", z.Name).
-				WithField("filename", name).
-				Print("unknown")
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (z *Zone) loadRegions() error {
-	filename := path.Join(z.Name, ZoneRegionsFileName)
-	regions, err := z.zones.ReadLines(filename)
-
-	if err == nil {
-		// parsed
-		err = z.appendRegions(regions...)
-		if err != nil {
-			err = core.Wrap(err, filename)
-		}
-	}
-
-	return err
-}
-
-func (z *Zone) loadClusterToken() error {
-	var token string
-
-	filename := path.Join(z.Name, RegionClusterTokenFileName)
-	lines, err := z.zones.ReadLines(filename)
-	if err != nil {
-		return err
-	}
-
-	// first non-empty line
-	for _, s := range lines {
-		s = strings.TrimSpace(s)
-		if s != "" {
-			token = s
-			break
-		}
-	}
-
-	err = z.zones.setRegionClusterToken(z.Name, token)
-	if err != nil {
-		err = core.Wrap(err, filename)
-	}
-
-	return err
-}
-
-func (z *Zone) scanSubdirectory(name string) error {
-	m := &Machine{
-		zone:   z,
-		logger: z,
-		Name:   name,
-	}
-
-	m.debug().
-		WithField("node", m.Name).
-		WithField("zone", z.Name).
-		Print("found")
-
-	if err := m.init(); err != nil {
-		m.error(err).
-			WithField("node", m.Name).
-			WithField("zone", z.Name).
-			Print()
-
-		return err
-	}
-
-	z.Machines = append(z.Machines, m)
-	return nil
-}
-
-// GetGateway returns the first gateway found, if none
-// files will be created to enable the first [Machine] to
-// be one
-func (z *Zone) GetGateway() (*Machine, bool, error) {
-	var first *Machine
-	var gateway *Machine
-
-	z.zones.ForEachMachine(func(p *Machine) bool {
-		switch {
-		case p.IsGateway():
-			// found
-			gateway = p
-		case first == nil:
-			// remember
-			first = p
-		default:
-			// keep looking
-		}
-
-		return gateway != nil
-	})
-
-	switch {
-	case gateway != nil:
-		// found one
-		return gateway, false, nil
-	case first != nil:
-		// make one
-		if err := first.SetGateway(true); err != nil {
-			return first, false, err
-		}
-		return first, true, nil
-	default:
-		// Zone without nodes?
-		panic("unreachable")
-	}
-}

pkg/cluster/defaults.go

@@ -1,17 +0,0 @@
-package cluster
-
-import (
-	"darvaza.org/resolver"
-	"darvaza.org/slog"
-	"darvaza.org/slog/handlers/discard"
-)
-
-// DefaultLogger returns a logger that doesn't log anything
-func DefaultLogger() slog.Logger {
-	return discard.New()
-}
-
-// DefaultLookuper returns a [resolver.Lookuper] using Cloudflare's 1.1.1.1
-func DefaultLookuper() resolver.Lookuper {
-	return resolver.NewCloudflareLookuper()
-}

pkg/cluster/env.go

@@ -1,258 +0,0 @@
-package cluster
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-// Env is a shell environment factory for this cluster
-type Env struct {
-	ZoneIterator
-	RegionIterator
-
-	cephFSID string
-	export   bool
-}
-
-// Env returns a shell environment factory
-func (m *Cluster) Env(export bool) (*Env, error) {
-	fsid, err := m.GetCephFSID()
-	if err != nil {
-		return nil, err
-	}
-
-	env := &Env{
-		ZoneIterator:   m,
-		RegionIterator: m,
-		cephFSID:       fsid.String(),
-		export:         export,
-	}
-
-	return env, nil
-}
-
-// Zones returns the list of Zone IDs of a region,
-// or from all if none is specified.
-func (m *Env) Zones(r *Region) []rings.ZoneID {
-	var zones []rings.ZoneID
-
-	iter := core.IIf[ZoneIterator](r != nil, r, m)
-
-	iter.ForEachZone(func(z *Zone) bool {
-		zones = append(zones, z.ID)
-		return false
-	})
-
-	core.SliceSortOrdered(zones)
-	return zones
-}
-
-// RegionsNames returns a sorted list of primary regions names
-func (m *Env) RegionsNames() []string {
-	var regions []string
-
-	m.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
-			regions = append(regions, r.Name)
-		}
-
-		return false
-	})
-
-	core.SliceSortOrdered(regions)
-	return regions
-}
-
-// Regions returns a sorted list of primary regions IDs
-func (m *Env) Regions() (regions []rings.RegionID) {
-	m.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
-			regions = append(regions, r.ID)
-		}
-
-		return false
-	})
-
-	core.SliceSortOrdered(regions)
-	return regions
-}
-
-// WriteTo generates environment variables for shell scripts
-func (m *Env) WriteTo(w io.Writer) (int64, error) {
-	var buf bytes.Buffer
-
-	if m.cephFSID != "" {
-		m.writeEnvVar(&buf, m.cephFSID, "FSID")
-	}
-
-	regions := m.getRegions()
-	ids := core.SliceMap(regions, func(_ []rings.RegionID, r *Region) (out []rings.RegionID) {
-		return append(out, r.ID)
-	})
-	names := core.SliceMap(regions, func(_ []string, r *Region) (out []string) {
-		return append(out, r.Name)
-	})
-
-	m.writeEnvVar(&buf, genEnvInts(ids), "REGIONS")
-	m.writeEnvVar(&buf, genEnvStrings(names), "REGIONS_NAMES")
-
-	for _, r := range regions {
-		m.writeEnvRegion(&buf, r)
-	}
-
-	return buf.WriteTo(w)
-}
-
-func (m *Env) getRegions() (out []*Region) {
-	m.ForEachRegion(func(r *Region) bool {
-		if r.IsPrimary() {
-			out = append(out, r)
-		}
-		return false
-	})
-
-	core.SliceSortFn(out, func(a, b *Region) bool {
-		return a.ID < b.ID
-	})
-
-	return out
-}
-func (m *Env) writeEnvRegion(w io.Writer, r *Region) {
-	regionID := r.ID
-
-	// REGION{regionID}_NAME
-	m.writeEnvVar(w, r.Name, "REGION%v_%s", regionID, "NAME")
-
-	// REGION{regionID}_ZONES
-	m.writeEnvVar(w, genEnvInts(m.Zones(r)), "REGION%v_%s", regionID, "ZONES")
-
-	r.ForEachZone(func(z *Zone) bool {
-		m.writeEnvZone(w, r, z)
-		return false
-	})
-}
-
-func (m *Env) writeEnvZone(w io.Writer, r *Region, z *Zone) {
-	zonePrefix := fmt.Sprintf("REGION%v_ZONE%v", r.ID, z.ID)
-	monPrefix := zonePrefix + "_MON"
-
-	// REGION{regionID}_ZONE{zoneID}
-	m.writeEnvVar(w, genEnvZoneNodes(z), zonePrefix)
-
-	// REGION{regionID}_ZONE{zoneID}_NAME
-	m.writeEnvVar(w, z.Name, zonePrefix+"_NAME")
-
-	// REGION{regionID}_ZONE{zoneID}_GW
-	gateways, _ := z.GatewayIDs()
-	m.writeEnvVar(w, genEnvInts(gateways), zonePrefix+"_GW")
-
-	// Ceph
-	monitors := z.GetCephMonitors()
-	// REGION{regionID}_MON{zone_ID}
-	m.writeEnvVar(w, genEnvZoneCephMonNames(monitors), monPrefix)
-	// REGION{regionID}_MON{zone_ID}_IP
-	m.writeEnvVar(w, genEnvZoneCephMonIPs(monitors), monPrefix+"_IP")
-	// REGION{regionID}_MON{zone_ID}_ID
-	m.writeEnvVar(w, genEnvZoneCephMonIDs(monitors), monPrefix+"_ID")
-}
-
-func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
-	var prefix string
-
-	if m.export {
-		prefix = "export "
-	}
-
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	if name != "" {
-		value = strings.TrimSpace(value)
-
-		if value == "" {
-			_, _ = fmt.Fprintf(w, "%s%s=\n", prefix, name)
-		} else {
-			_, _ = fmt.Fprintf(w, "%s%s=%q\n", prefix, name, value)
-		}
-	}
-}
-
-func genEnvInts[T core.Signed](values []T) string {
-	var buf bytes.Buffer
-
-	for _, v := range values {
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune(' ')
-		}
-
-		_, _ = buf.WriteString(fmt.Sprintf("%v", int64(v)))
-	}
-
-	return buf.String()
-}
-
-func genEnvStrings(values []string) string {
-	return strings.Join(values, " ")
-}
-
-func genEnvZoneNodes(z *Zone) string {
-	if n := z.Len(); n > 0 {
-		s := make([]string, 0, n)
-
-		z.ForEachMachine(func(p *Machine) bool {
-			s = append(s, p.Name)
-			return false
-		})
-
-		return genEnvStrings(s)
-	}
-	return ""
-}
-
-func genEnvZoneCephMonNames(m Machines) string {
-	var buf strings.Builder
-	m.ForEachMachine(func(p *Machine) bool {
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune(' ')
-		}
-		_, _ = buf.WriteString(p.Name)
-
-		return false
-	})
-	return buf.String()
-}
-
-func genEnvZoneCephMonIPs(m Machines) string {
-	var buf strings.Builder
-	m.ForEachMachine(func(p *Machine) bool {
-		addr := p.RingOneAddress()
-
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune(' ')
-		}
-		_, _ = buf.WriteString(addr.String())
-
-		return false
-	})
-	return buf.String()
-}
-
-func genEnvZoneCephMonIDs(m Machines) string {
-	var buf strings.Builder
-	m.ForEachMachine(func(p *Machine) bool {
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune(' ')
-		}
-		_, _ = fmt.Fprintf(&buf, "%v", p.ID)
-
-		return false
-	})
-	return buf.String()
-}

pkg/cluster/errors.go

@@ -1,29 +0,0 @@
-package cluster
-
-import (
-	"errors"
-	"io/fs"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-var (
-	// ErrInvalidName indicates the name isn't valid
-	ErrInvalidName = errors.New("invalid name")
-
-	// ErrUnknownNode indicates there is a reference to a node
-	// we don't have on the tree
-	ErrUnknownNode = errors.New("node does not exist")
-
-	// ErrInvalidNode indicates the nodes can't be used for
-	// the intended purpose
-	ErrInvalidNode = errors.New("invalid node")
-)
-
-// ErrInvalidRing returns an error indicating the [rings.RingID]
-// can't be used for the intended purpose
-func ErrInvalidRing(ringID rings.RingID) error {
-	return core.QuietWrap(fs.ErrInvalid, "invalid ring %v", ringID)
-}

pkg/cluster/hosts.go

@@ -1,128 +0,0 @@
-package cluster
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"text/template"
-)
-
-type hostsFile struct {
-	Ring0 []hostsEntry
-	Ring1 []hostsEntry
-}
-
-type hostsEntry struct {
-	Addr  string
-	Names []string
-}
-
-var hostsTemplate = template.Must(template.New("hosts").Funcs(template.FuncMap{
-	"StringsJoin": strings.Join,
-}).Parse(`127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-{{range .Ring1 -}}
-{{.Addr}}  {{StringsJoin .Names " "}}
-{{end}}
-{{range .Ring0 -}}
-{{.Addr}}  {{StringsJoin .Names " "}}
-{{end -}}
-`))
-
-// WriteHosts rewrites all hosts files on the tree
-func (m *Cluster) WriteHosts() error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		err = z.WriteHosts()
-		return err != nil
-	})
-
-	return err
-}
-
-// WriteHosts rewrites all hosts files in the zone
-func (z *Zone) WriteHosts() error {
-	var err error
-
-	s := z.Hosts()
-	z.ForEachMachine(func(p *Machine) bool {
-		err = p.WriteStringFile(s, "hosts")
-		return err != nil
-	})
-
-	return err
-}
-
-// WriteHosts rewrites the hosts file
-func (p *Machine) WriteHosts() error {
-	s := p.zone.Hosts()
-	return p.WriteStringFile(s, "hosts")
-}
-
-func (z *Zone) genHosts(out *hostsFile, p *Machine) {
-	var names []string
-
-	ip := p.RingOneAddress()
-	names = append(names, p.Name)
-
-	if p.CephMonitor {
-		names = append(names, fmt.Sprintf("%s-%s", p.zone.Name, "ceph"))
-		names = append(names, fmt.Sprintf("%s-%s", p.zone.Name, "k3s"))
-
-		if z.Is(p.Region(), p.Zone()) {
-			names = append(names, "ceph")
-			names = append(names, "k3s")
-		}
-	}
-
-	entry := hostsEntry{
-		Addr:  ip.String(),
-		Names: names,
-	}
-
-	out.Ring1 = append(out.Ring1, entry)
-
-	if p.IsGateway() {
-		var s string
-
-		ip, _ = p.RingZeroAddress()
-		s = fmt.Sprintf("%s-%v", p.Name, 0)
-
-		entry = hostsEntry{
-			Addr:  ip.String(),
-			Names: []string{s},
-		}
-
-		out.Ring0 = append(out.Ring0, entry)
-	}
-}
-
-// Hosts renders the /etc/hosts to be used on this zone
-func (z *Zone) Hosts() string {
-	var buf bytes.Buffer
-	var out hostsFile
-
-	z.zones.ForEachZone(func(z2 *Zone) bool {
-		z2.ForEachMachine(func(p *Machine) bool {
-			z.genHosts(&out, p)
-
-			return false
-		})
-		return false
-	})
-
-	if err := hostsTemplate.Execute(&buf, &out); err != nil {
-		panic(err)
-	}
-
-	return buf.String()
-}

pkg/cluster/machine.go

@@ -1,90 +0,0 @@
-package cluster
-
-import (
-	"net/netip"
-	"strings"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-// revive:disable:line-length-limit
-
-// A Machine is a machine on a Zone
-type Machine struct {
-	zone   *Zone
-	logger `json:"-" yaml:"-"`
-
-	ID   rings.NodeID
-	Name string `json:"-" yaml:"-"`
-
-	Inactive        bool         `json:"inactive,omitempty"     yaml:"inactive,omitempty"`
-	CephMonitor     bool         `json:"ceph_monitor,omitempty" yaml:"ceph_monitor,omitempty"`
-	PublicAddresses []netip.Addr `json:"public,omitempty"       yaml:"public,omitempty"`
-	Rings           []*RingInfo  `json:"rings,omitempty"        yaml:"rings,omitempty"`
-}
-
-// revive:enable:line-length-limit
-
-func (m *Machine) String() string {
-	return m.Name
-}
-
-// FullName returns the Name of the machine including domain name
-func (m *Machine) FullName() string {
-	var name []string
-
-	for _, s := range []string{
-		m.Name,
-		m.zone.zones.Name,
-		m.zone.zones.Domain,
-	} {
-		if s != "" {
-			name = append(name, s)
-		}
-	}
-
-	return strings.Join(name, ".")
-}
-
-// IsActive indicates the machine is to be included in regions' DNS entries
-func (m *Machine) IsActive() bool {
-	return !m.Inactive
-}
-
-// IsGateway tells if the Machine is a ring0 gateway
-func (m *Machine) IsGateway() bool {
-	_, ok := m.getRingInfo(rings.RingZeroID)
-	return ok
-}
-
-// SetGateway enables/disables a Machine ring0 integration
-func (m *Machine) SetGateway(enabled bool) error {
-	ri, found := m.getRingInfo(rings.RingZeroID)
-	switch {
-	case !found && !enabled:
-		return nil
-	case !found:
-		var err error
-
-		if ri, err = m.createRingInfo(0, false); err != nil {
-			return err
-		}
-	}
-
-	ri.Enabled = enabled
-	return m.SyncWireguardConfig(rings.RingZeroID)
-}
-
-// Zone indicates the [Zone] this machine belongs to
-func (m *Machine) Zone() rings.ZoneID {
-	return m.zone.ID
-}
-
-// Region indicates the [Region] this machine belongs to
-func (m *Machine) Region() rings.RegionID {
-	return m.zone.RegionID()
-}
-
-func (m *Machine) getPeerByName(name string) (*Machine, bool) {
-	return m.zone.zones.GetMachineByName(name)
-}

pkg/cluster/machine_rings.go

@@ -1,329 +0,0 @@
-package cluster
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-	"git.jpi.io/amery/jpictl/pkg/wireguard"
-)
-
-// GetWireguardKeys reads a wgN.key/wgN.pub files
-func (m *Machine) GetWireguardKeys(ringID rings.RingID) (wireguard.KeyPair, error) {
-	var (
-		data []byte
-		out  wireguard.KeyPair
-	)
-
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		// invalid ring
-		return out, err
-	}
-
-	keyFile, pubFile, _ := ring.Files()
-
-	data, err = m.ReadFile(keyFile)
-	if err != nil {
-		// failed to read
-		return out, err
-	}
-
-	out.PrivateKey, err = wireguard.PrivateKeyFromBase64(string(data))
-	if err != nil {
-		// bad key
-		err = core.Wrap(err, keyFile)
-		return out, err
-	}
-
-	data, err = m.ReadFile(pubFile)
-	switch {
-	case os.IsNotExist(err):
-		// no wgN.pub is fine
-	case err != nil:
-		// failed to read
-		return out, err
-	default:
-		// good read
-		out.PublicKey, err = wireguard.PublicKeyFromBase64(string(data))
-		if err != nil {
-			// bad key
-			err = core.Wrap(err, pubFile)
-			return out, err
-		}
-	}
-
-	err = out.Validate()
-	return out, err
-}
-
-func (m *Machine) tryReadWireguardKeys(ringID rings.RingID) error {
-	kp, err := m.GetWireguardKeys(ringID)
-	switch {
-	case os.IsNotExist(err):
-		// ignore
-		return nil
-	case err != nil:
-		// something went wrong
-		return err
-	default:
-		// import keys
-		ri := &RingInfo{
-			Ring: MustWireguardInterfaceID(ringID),
-			Keys: kp,
-		}
-
-		return m.applyRingInfo(ringID, ri)
-	}
-}
-
-// RemoveWireguardKeys deletes wgN.key and wgN.pub from
-// the machine's config directory
-func (m *Machine) RemoveWireguardKeys(ringID rings.RingID) error {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return err
-	}
-
-	keyFile, pubFile, _ := ring.Files()
-
-	err = m.RemoveFile(pubFile)
-	switch {
-	case os.IsNotExist(err):
-		// ignore
-	case err != nil:
-		return err
-	}
-
-	err = m.RemoveFile(keyFile)
-	if os.IsNotExist(err) {
-		// ignore
-		err = nil
-	}
-
-	return err
-}
-
-// GetWireguardConfig reads a wgN.conf file
-func (m *Machine) GetWireguardConfig(ringID rings.RingID) (*wireguard.Config, error) {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := m.ReadFile(ring.ConfFile())
-	if err != nil {
-		return nil, err
-	}
-
-	r := bytes.NewReader(data)
-	return wireguard.NewConfigFromReader(r)
-}
-
-func (m *Machine) tryApplyWireguardConfig(ring rings.RingID) error {
-	wg, err := m.GetWireguardConfig(ring)
-	switch {
-	case os.IsNotExist(err):
-		return nil
-	case err != nil:
-		return err
-	default:
-		return m.applyWireguardConfig(ring, wg)
-	}
-}
-
-func (m *Machine) applyWireguardConfigNode(ring rings.RingID, wg *wireguard.Config) error {
-	addr := wg.GetAddress()
-	if !core.IsZero(addr) {
-		regionID, zoneID, nodeID, ok := Rings[ring].Decode(addr)
-		if !ok {
-			return fmt.Errorf("%s: invalid address", addr)
-		}
-
-		if err := m.applyZoneNodeID(regionID, zoneID, nodeID); err != nil {
-			return core.Wrap(err, "%s: invalid address", addr)
-		}
-	}
-
-	if err := m.applyWireguardInterfaceConfig(ring, wg.Interface); err != nil {
-		return core.Wrap(err, "interface")
-	}
-
-	return nil
-}
-
-func (m *Machine) applyWireguardConfig(ring rings.RingID, wg *wireguard.Config) error {
-	if err := m.applyWireguardConfigNode(ring, wg); err != nil {
-		return err
-	}
-
-	for _, peer := range wg.Peer {
-		err := m.applyWireguardPeerConfig(ring, peer)
-		switch {
-		case errors.Is(err, ErrUnknownNode):
-			// ignore unknown peers
-			m.warn(nil).
-				WithField("subsystem", "wireguard").
-				WithField("node", m.Name).
-				WithField("peer", peer.Endpoint.Host).
-				WithField("ring", MustWireguardInterfaceID(ring)).
-				Print("ignoring unknown endpoint")
-		case err != nil:
-			return core.Wrap(err, "peer")
-		}
-	}
-
-	return nil
-}
-
-func (m *Machine) getRingInfo(ring rings.RingID) (*RingInfo, bool) {
-	for _, ri := range m.Rings {
-		if ri.RingID() == ring {
-			return ri, ri.Enabled
-		}
-	}
-
-	return nil, false
-}
-
-func (m *Machine) applyRingInfo(ring rings.RingID, new *RingInfo) error {
-	cur, _ := m.getRingInfo(ring)
-	if cur == nil {
-		// first, append
-		m.debug().
-			WithField("node", m.Name).
-			WithField("ring", MustWireguardInterfaceID(ring)).
-			Print("found")
-		m.Rings = append(m.Rings, new)
-		return nil
-	}
-
-	// extra, merge
-	return cur.Merge(new)
-}
-
-func (m *Machine) applyWireguardInterfaceConfig(ring rings.RingID,
-	data wireguard.InterfaceConfig) error {
-	//
-	ri := &RingInfo{
-		Ring:    MustWireguardInterfaceID(ring),
-		Enabled: true,
-		Keys: wireguard.KeyPair{
-			PrivateKey: data.PrivateKey,
-		},
-	}
-
-	return m.applyRingInfo(ring, ri)
-}
-
-func (m *Machine) applyWireguardPeerConfig(ring rings.RingID,
-	pc wireguard.PeerConfig) error {
-	//
-	peer, found := m.getPeerByName(pc.Endpoint.Name())
-	switch {
-	case !found:
-		// unknown
-		return core.Wrap(ErrUnknownNode, pc.Endpoint.Host)
-	case ring == 1 && m.zone != peer.zone:
-		// invalid zone
-		return core.Wrap(ErrInvalidNode, peer.Name)
-	default:
-		// apply RingInfo
-		ri := &RingInfo{
-			Ring:    MustWireguardInterfaceID(ring),
-			Enabled: true,
-			Keys: wireguard.KeyPair{
-				PublicKey: pc.PublicKey,
-			},
-		}
-
-		return peer.applyRingInfo(ring, ri)
-	}
-}
-
-func (m *Machine) applyZoneNodeID(regionID rings.RegionID,
-	zoneID rings.ZoneID, nodeID rings.NodeID) error {
-	//
-	switch {
-	case !regionID.Valid():
-		return fmt.Errorf("invalid %s", "regionID")
-	case !zoneID.Valid():
-		return fmt.Errorf("invalid %s", "zoneID")
-	case !nodeID.Valid():
-		return fmt.Errorf("invalid %s", "nodeID")
-	case m.ID != nodeID:
-		return fmt.Errorf("invalid %s: %v ≠ %v", "nodeID", m.ID, nodeID)
-	case m.zone.ID != 0 && m.zone.ID != zoneID:
-		return fmt.Errorf("invalid %s: %v ≠ %v", "zoneID", m.zone.ID, zoneID)
-	case m.Region() != regionID:
-		return fmt.Errorf("invalid %s: %v ≠ %v", "regionID", m.Region(), regionID)
-	default:
-		if m.zone.ID == 0 {
-			m.zone.ID = zoneID
-		}
-
-		return nil
-	}
-}
-
-func (m *Machine) setRingDefaults(ri *RingInfo) error {
-	if ri.Keys.PrivateKey.IsZero() {
-		m.info().
-			WithField("subsystem", "wireguard").
-			WithField("node", m.Name).
-			WithField("ring", ri.Ring).
-			Print("generating key pair")
-
-		kp, err := wireguard.NewKeyPair()
-		if err != nil {
-			return err
-		}
-		ri.Keys = kp
-	}
-	return nil
-}
-
-// RemoveWireguardConfig deletes wgN.conf from the machine's
-// config directory.
-func (m *Machine) RemoveWireguardConfig(ringID rings.RingID) error {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return err
-	}
-
-	err = m.RemoveFile(ring.ConfFile())
-	if os.IsNotExist(err) {
-		err = nil
-	}
-
-	return err
-}
-
-func (m *Machine) createRingInfo(ringID rings.RingID, enabled bool) (*RingInfo, error) {
-	ring, err := AsWireguardInterfaceID(ringID)
-	if err != nil {
-		return nil, err
-	}
-
-	keys, err := wireguard.NewKeyPair()
-	if err != nil {
-		return nil, err
-	}
-
-	ri := &RingInfo{
-		Ring:    ring,
-		Enabled: enabled,
-		Keys:    keys,
-	}
-
-	err = m.applyRingInfo(ringID, ri)
-	if err != nil {
-		return nil, err
-	}
-
-	return ri, nil
-}

pkg/cluster/machine_scan.go

@@ -1,131 +0,0 @@
-package cluster
-
-import (
-	"context"
-	"net/netip"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"darvaza.org/core"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-// LookupNetIP uses the DNS Resolver to get the public addresses associated
-// to a Machine
-func (m *Machine) LookupNetIP(timeout time.Duration) ([]netip.Addr, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-
-	defer cancel()
-
-	return m.zone.zones.resolver.LookupNetIP(ctx, "ip", m.FullName())
-}
-
-// UpdatePublicAddresses uses the DNS Resolver to set Machine.PublicAddresses
-func (m *Machine) UpdatePublicAddresses() error {
-	addrs, err := m.LookupNetIP(2 * time.Second)
-	if err != nil {
-		return err
-	}
-
-	m.PublicAddresses = addrs
-	return nil
-}
-
-func (m *Machine) init() error {
-	if err := m.setID(); err != nil {
-		return core.Wrap(err, m.Name)
-	}
-
-	for _, ring := range Rings {
-		if err := m.tryReadWireguardKeys(ring.ID); err != nil {
-			return core.Wrap(err, m.Name)
-		}
-	}
-
-	return nil
-}
-
-func (m *Machine) setID() error {
-	zoneName := m.zone.Name
-
-	l := len(zoneName)
-	switch {
-	case len(m.Name) < l+2:
-		return ErrInvalidName
-	case !strings.HasPrefix(m.Name, zoneName):
-		return ErrInvalidName
-	case m.Name[l] != '-':
-		return ErrInvalidName
-	}
-
-	suffix := m.Name[l+1:]
-	id, err := strconv.ParseInt(suffix, 10, 8)
-	if err != nil {
-		return err
-	}
-
-	m.ID = rings.NodeID(id)
-	return nil
-}
-
-// scan is called once we know about all zones and machine names
-func (m *Machine) scan(_ *ScanOptions) error {
-	for _, ring := range Rings {
-		if err := m.tryApplyWireguardConfig(ring.ID); err != nil {
-			m.error(err).
-				WithField("subsystem", "wireguard").
-				WithField("node", m.Name).
-				WithField("ring", MustWireguardInterfaceID(ring.ID)).
-				Print()
-			return err
-		}
-	}
-
-	return m.loadInactive()
-}
-
-func (m *Machine) loadInactive() error {
-	data, err := m.ReadLines("region")
-	switch {
-	case os.IsNotExist(err):
-		// no file
-		return nil
-	case err != nil:
-		// read error
-		return err
-	default:
-		// look for "none"
-		for _, r := range data {
-			switch r {
-			case "none":
-				m.Inactive = true
-			default:
-				m.Inactive = false
-			}
-		}
-		return nil
-	}
-}
-
-// scanWrapUp is called once all machines have been scanned
-func (m *Machine) scanWrapUp(opts *ScanOptions) error {
-	for _, ri := range m.Rings {
-		if err := m.setRingDefaults(ri); err != nil {
-			m.error(err).
-				WithField("subsystem", "wireguard").
-				WithField("node", m.Name).
-				WithField("ring", ri.Ring).
-				Print()
-			return err
-		}
-	}
-
-	if !opts.DontResolvePublicAddresses {
-		return m.UpdatePublicAddresses()
-	}
-
-	return nil
-}

pkg/cluster/machines.go

@@ -1,69 +0,0 @@
-package cluster
-
-import "sort"
-
-var (
-	_ MachineIterator = Machines(nil)
-	_ sort.Interface  = Machines(nil)
-)
-
-// A MachineIterator is a set of Machines we can iterate on
-type MachineIterator interface {
-	ForEachMachine(func(*Machine) bool)
-}
-
-// Machines is a list of Machine objects
-type Machines []*Machine
-
-// ForEachMachine calls a function for each Machine in the list
-// until instructed to terminate the loop
-func (m Machines) ForEachMachine(fn func(*Machine) bool) {
-	for _, p := range m {
-		if fn(p) {
-			return
-		}
-	}
-}
-
-// Len returns the number of machines in the list
-func (m Machines) Len() int {
-	return len(m)
-}
-
-// Less implements sort.Interface to sort the list
-func (m Machines) Less(i, j int) bool {
-	a, b := m[i], m[j]
-	za, zb := a.Zone(), b.Zone()
-
-	switch {
-	case za == zb:
-		return a.ID < b.ID
-	default:
-		return za < zb
-	}
-}
-
-// Swap implements sort.Interface to sort the list
-func (m Machines) Swap(i, j int) {
-	m[i], m[j] = m[j], m[i]
-}
-
-// FilterMachines produces a subset of the machines offered by the given
-// iterator fulfilling a condition
-func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int) {
-	var out []*Machine
-
-	if cond == nil {
-		// unconditional
-		cond = func(*Machine) bool { return true }
-	}
-
-	m.ForEachMachine(func(p *Machine) bool {
-		if cond(p) {
-			out = append(out, p)
-		}
-		return false
-	})
-
-	return out, len(out)
-}

pkg/cluster/regions.go

@@ -1,431 +0,0 @@
-package cluster
-
-import (
-	"bytes"
-	"path/filepath"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-var (
-	_ MachineIterator = (*Region)(nil)
-	_ ZoneIterator    = (*Region)(nil)
-
-	_ RegionIterator = (*Zone)(nil)
-	_ RegionIterator = (*Cluster)(nil)
-)
-
-// A RegionIterator is a set of Regions we can iterate on
-type RegionIterator interface {
-	ForEachRegion(func(*Region) bool)
-}
-
-// Region represents a group of zones geographically related
-type Region struct {
-	m     *Cluster
-	zones []*Zone
-
-	Name    string
-	ID      rings.RegionID `json:",omitempty" yaml:",omitempty"`
-	Cluster *string        `json:",omitempty" yaml:",omitempty"`
-	Regions []string       `json:",omitempty" yaml:",omitempty"`
-}
-
-// IsPrimary indicates the region is primary and corresponds
-// to a kubernetes cluster.
-func (r *Region) IsPrimary() bool {
-	return r != nil && r.Cluster != nil
-}
-
-// ForEachRegion calls a function for each Region of the cluster
-// until instructed to terminate the loop
-func (m *Cluster) ForEachRegion(fn func(r *Region) bool) {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-		if fn(r) {
-			return
-		}
-	}
-}
-
-// ForEachMachine calls a function for each Machine in the region
-// until instructed to terminate the loop
-func (r *Region) ForEachMachine(fn func(*Machine) bool) {
-	r.ForEachZone(func(z *Zone) bool {
-		var term bool
-
-		z.ForEachMachine(func(p *Machine) bool {
-			if p.IsActive() {
-				term = fn(p)
-			}
-			return term
-		})
-
-		return term
-	})
-}
-
-// ForEachZone calls a function for each Zone in the region
-// until instructed to terminate the loop
-func (r *Region) ForEachZone(fn func(*Zone) bool) {
-	for _, p := range r.zones {
-		if fn(p) {
-			// terminate
-			return
-		}
-	}
-}
-
-func (m *Cluster) initRegions(_ *ScanOptions) error {
-	regions := make(map[string][]*Zone)
-
-	// first regions defined by zones
-	m.ForEachZone(func(z *Zone) bool {
-		SortRegions(z.Regions)
-		for _, region := range z.Regions {
-			regions[region] = append(regions[region], z)
-		}
-
-		return false
-	})
-
-	// bind first level regions and their zones
-	for name, zones := range regions {
-		m.setRegionZones(name, zones...)
-	}
-
-	// and combine zones to produce larger regions
-	for i := range m.Regions {
-		r := &m.Regions[i]
-		m.finishRegion(r)
-	}
-
-	m.sortRegions()
-	m.scanRegionID()
-	m.computeZonesRegion()
-	return nil
-}
-
-func (m *Cluster) setRegionZones(name string, zones ...*Zone) {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-
-		if r.Name == name {
-			// found
-			r.m = m
-			r.zones = zones
-			return
-		}
-	}
-
-	// new
-	m.Regions = append(m.Regions, Region{
-		m:     m,
-		zones: zones,
-		Name:  name,
-	})
-}
-
-func (m *Cluster) setRegionClusterToken(name string, token string) error {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-
-		if r.Name == name {
-			// found
-			r.Cluster = &token
-			return nil
-		}
-	}
-
-	// new
-	m.Regions = append(m.Regions, Region{
-		m:       m,
-		Name:    name,
-		Cluster: &token,
-	})
-	return nil
-}
-
-func (m *Cluster) appendRegionRegions(name string, subs ...string) {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-
-		if name == r.Name {
-			// found
-			r.Regions = append(r.Regions, subs...)
-			return
-		}
-	}
-
-	// new
-	m.Regions = append(m.Regions, Region{
-		Name:    name,
-		Regions: subs,
-	})
-}
-
-// ForEachRegion calls a function on all regions this zone belongs to.
-func (z *Zone) ForEachRegion(fn func(*Region) bool) {
-	if fn == nil {
-		return
-	}
-
-	z.zones.ForEachRegion(func(r *Region) bool {
-		var match bool
-
-		r.ForEachZone(func(z2 *Zone) bool {
-			match = (z == z2)
-			return match
-		})
-
-		if match && fn(r) {
-			return true
-		}
-
-		return false
-	})
-}
-
-func (z *Zone) appendRegions(regions ...string) error {
-	for _, s := range regions {
-		// TODO: validate
-		z.debug().
-			WithField("zone", z.Name).
-			WithField("region", s).
-			Print("attached")
-
-		z.Regions = append(z.Regions, s)
-	}
-
-	return nil
-}
-
-func (m *Cluster) finishRegion(r *Region) {
-	if r.m != nil {
-		// ready
-		return
-	}
-
-	r.m = m
-	sub := []string{}
-	for _, name := range r.Regions {
-		r2, ok := m.getFinishRegion(name)
-		if !ok {
-			m.warn(nil).WithField("region", name).Print("unknown region")
-			continue
-		}
-
-		sub = append(sub, r2.Name)
-		r.zones = append(r.zones, r2.zones...)
-	}
-	r.Regions = sub
-}
-
-// revive:disable:cognitive-complexity
-func (m *Cluster) scanRegionID() {
-	// revive:enable:cognitive-complexity
-	var max rings.RegionID
-	var missing bool
-
-	// check IDs
-	ids := make(map[rings.RegionID]bool)
-	fn := func(r *Region) bool {
-		var term bool
-
-		switch {
-		case !r.IsPrimary():
-			// secondary, no ID.
-			r.ID = 0
-		case !r.ID.Valid():
-			// primary without ID
-			missing = true
-		case ids[r.ID]:
-			// duplicate
-			m.error(nil).WithField("region", r.Name).Print("duplicate ID")
-			missing = true
-			r.ID = 0
-		default:
-			ids[r.ID] = true
-
-			if r.ID > max {
-				max = r.ID
-			}
-		}
-
-		return term
-	}
-	m.ForEachRegion(fn)
-
-	if missing {
-		// assign missing IDs
-		fn := func(r *Region) bool {
-			var term bool
-
-			switch {
-			case !r.IsPrimary():
-				// ignore secondary
-			case r.ID.Valid():
-				// already has an ID
-			default:
-				r.ID = max + 1
-				max = r.ID
-			}
-
-			return term
-		}
-
-		m.ForEachRegion(fn)
-	}
-}
-
-func (m *Cluster) computeZonesRegion() {
-	fn := func(r *Region, z *Zone) {
-		if z.region != nil {
-			m.error(nil).
-				WithField("zone", z.Name).
-				WithField("region", []string{
-					z.region.Name,
-					r.Name,
-				}).
-				Print("zone in two regions")
-		} else {
-			z.region = r
-		}
-	}
-
-	m.ForEachRegion(func(r *Region) bool {
-		var term bool
-
-		if r.IsPrimary() {
-			r.ForEachZone(func(z *Zone) bool {
-				fn(r, z)
-				return term
-			})
-		}
-
-		return term
-	})
-}
-
-func (m *Cluster) getRegion(name string) (*Region, bool) {
-	for i := range m.Regions {
-		r := &m.Regions[i]
-		if name == r.Name {
-			return r, true
-		}
-	}
-
-	return nil, false
-}
-
-func (m *Cluster) getFinishRegion(name string) (*Region, bool) {
-	if r, ok := m.getRegion(name); ok {
-		m.finishRegion(r)
-		return r, true
-	}
-
-	return nil, false
-}
-
-// SyncRegions writes to the file system the regions this [Zone]
-// belongs to.
-func (z *Zone) SyncRegions() error {
-	err := z.syncZoneRegions()
-	if err == nil {
-		z.ForEachMachine(func(p *Machine) bool {
-			err = z.syncMachineRegions(p)
-			return err != nil
-		})
-	}
-
-	return err
-}
-
-func (*Zone) syncMachineRegions(p *Machine) error {
-	var err error
-
-	if p.IsActive() {
-		err = p.RemoveFile("region")
-	} else {
-		err = p.WriteStringFile("none\n", "region")
-	}
-
-	if err == nil {
-		err = p.RemoveFile(RegionClusterTokenFileName)
-	}
-
-	return err
-}
-
-func (z *Zone) syncZoneRegions() error {
-	name := filepath.Join(z.Name, ZoneRegionsFileName)
-
-	if len(z.Regions) > 0 {
-		var buf bytes.Buffer
-
-		for _, s := range z.Regions {
-			_, _ = buf.WriteString(s)
-			_, _ = buf.WriteRune('\n')
-		}
-
-		return z.zones.WriteStringFile(buf.String(), name)
-	}
-
-	return z.zones.RemoveFile(name)
-}
-
-// SyncRegions writes to the file system the regions covered
-// by this meta-region
-func (r *Region) SyncRegions() error {
-	if err := r.syncRegionsFile(); err != nil {
-		return err
-	}
-
-	return r.syncClusterFile()
-}
-
-func (r *Region) mkdir() error {
-	return r.m.MkdirAll(r.Name)
-}
-
-func (r *Region) syncRegionsFile() error {
-	var err error
-
-	name := filepath.Join(r.Name, ZoneRegionsFileName)
-
-	if len(r.Regions) == 0 {
-		err = r.m.RemoveFile(name)
-	} else if err = r.mkdir(); err == nil {
-		var buf bytes.Buffer
-
-		for _, s := range r.Regions {
-			_, _ = buf.WriteString(s)
-			_, _ = buf.WriteRune('\n')
-		}
-
-		err = r.m.WriteStringFile(buf.String(), name)
-	}
-
-	return err
-}
-
-func (r *Region) syncClusterFile() error {
-	var err error
-
-	name := filepath.Join(r.Name, RegionClusterTokenFileName)
-
-	if r.Cluster == nil {
-		err = r.m.RemoveFile(name)
-	} else if err = r.mkdir(); err == nil {
-		var buf bytes.Buffer
-
-		_, _ = buf.WriteString(*r.Cluster)
-		if buf.Len() > 0 {
-			_, _ = buf.WriteRune('\n')
-		}
-
-		err = r.m.WriteStringFile(buf.String(), name)
-	}
-
-	return err
-}

pkg/cluster/regions_utils.go

@@ -1,41 +0,0 @@
-package cluster
-
-import "sort"
-
-// SortRegions sorts regions. first by length those 3-character
-// or shorter, and then by length. It's mostly aimed at
-// supporting ISO-3166 order
-func SortRegions(regions []string) []string {
-	sort.Slice(regions, func(i, j int) bool {
-		r1, r2 := regions[i], regions[j]
-		return regionLess(r1, r2)
-	})
-
-	return regions
-}
-
-func regionLess(r1, r2 string) bool {
-	switch {
-	case len(r1) < 4:
-		switch {
-		case len(r1) < len(r2):
-			return true
-		case len(r1) > len(r2):
-			return false
-		default:
-			return r1 < r2
-		}
-	case len(r2) < 4:
-		return false
-	default:
-		return r1 < r2
-	}
-}
-
-func (m *Cluster) sortRegions() {
-	sort.Slice(m.Regions, func(i, j int) bool {
-		r1 := m.Regions[i].Name
-		r2 := m.Regions[j].Name
-		return regionLess(r1, r2)
-	})
-}

pkg/cluster/sync.go

@@ -1,82 +0,0 @@
-package cluster
-
-// SyncAll updates all config files
-func (m *Cluster) SyncAll() error {
-	for _, fn := range []func() error{
-		m.SyncMkdirAll,
-		m.SyncAllWireguard,
-		m.SyncAllCeph,
-		m.SyncAllRegions,
-		m.WriteHosts,
-	} {
-		if err := fn(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// SyncMkdirAll creates the directories needed to store files
-// required to represent the cluster.
-func (m *Cluster) SyncMkdirAll() error {
-	err := m.MkdirAll(".")
-	if err == nil {
-		m.ForEachMachine(func(p *Machine) bool {
-			err = p.MkdirAll(".")
-			return err != nil
-		})
-	}
-
-	return err
-}
-
-// SyncAllWireguard updates all wireguard config files
-func (m *Cluster) SyncAllWireguard() error {
-	var err error
-
-	for _, ring := range Rings {
-		err = m.WriteWireguardKeys(ring.ID)
-		if err != nil {
-			return err
-		}
-
-		err = m.SyncWireguardConfig(ring.ID)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// SyncAllCeph updates the ceph.conf file
-func (m *Cluster) SyncAllCeph() error {
-	cfg, err := m.GenCephConfig()
-	if err != nil {
-		return err
-	}
-
-	return m.WriteCephConfig(cfg)
-}
-
-// SyncAllRegions rewrites all region data
-func (m *Cluster) SyncAllRegions() error {
-	var err error
-
-	m.ForEachZone(func(z *Zone) bool {
-		err := z.SyncRegions()
-		return err != nil
-	})
-
-	if err != nil {
-		return err
-	}
-
-	m.ForEachRegion(func(r *Region) bool {
-		err = r.SyncRegions()
-		return err != nil
-	})
-
-	return err
-}

pkg/cluster/zones.go

@@ -1,107 +0,0 @@
-package cluster
-
-import (
-	"io/fs"
-
-	"git.jpi.io/amery/jpictl/pkg/rings"
-)
-
-var (
-	_ MachineIterator = (*Zone)(nil)
-)
-
-// A ZoneIterator is a set of Zones we can iterate on
-type ZoneIterator interface {
-	ForEachZone(func(*Zone) bool)
-}
-
-// A Zone is a set of machines in close proximity and strong
-// affinity.
-type Zone struct {
-	zones  *Cluster
-	region *Region
-	logger `json:"-" yaml:"-"`
-
-	ID      rings.ZoneID
-	Name    string
-	Regions []string `json:",omitempty" yaml:",omitempty"`
-
-	Machines
-}
-
-func (z *Zone) String() string {
-	return z.Name
-}
-
-// SetGateway configures a machine to be the zone's ring0 gateway
-func (z *Zone) SetGateway(gatewayID rings.NodeID, enabled bool) error {
-	var err error
-	var found bool
-
-	z.ForEachMachine(func(p *Machine) bool {
-		if p.ID == gatewayID {
-			found = true
-			err = p.SetGateway(enabled)
-
-			return true
-		}
-		return false
-	})
-
-	switch {
-	case err != nil:
-		return err
-	case !found:
-		return fs.ErrNotExist
-	default:
-		return nil
-	}
-}
-
-// GatewayIDs returns the list of IDs of machines that act as ring0 gateways
-func (z *Zone) GatewayIDs() ([]rings.NodeID, int) {
-	var out []rings.NodeID
-	z.ForEachMachine(func(p *Machine) bool {
-		if p.IsGateway() {
-			out = append(out, p.ID)
-		}
-		return false
-	})
-
-	return out, len(out)
-}
-
-// RegionID returns the primary [Region] of a [Zone].
-func (z *Zone) RegionID() rings.RegionID {
-	if z != nil && z.region != nil {
-		return z.region.ID
-	}
-	return 0
-}
-
-// Is checks if the given [rings.RegionID] and [rings.ZoneID] match
-// the [Zone].
-func (z *Zone) Is(regionID rings.RegionID, zoneID rings.ZoneID) bool {
-	switch {
-	case z.ID != zoneID:
-		return false
-	case z.RegionID() != regionID:
-		return false
-	default:
-		return true
-	}
-}
-
-// Eq checks if two [Zone]s are the same.
-func (z *Zone) Eq(z2 *Zone) bool {
-	switch {
-	case z == nil, z2 == nil:
-		return false
-	case z.ID != z2.ID:
-		return false
-	case z.RegionID() != z2.RegionID():
-		return false
-	default:
-		return true
-	}
-}

pkg/dns/add.go

@@ -1,69 +0,0 @@
-package dns
-
-import (
-	"context"
-	"net/netip"
-	"os"
-	"time"
-
-	"darvaza.org/core"
-	"github.com/libdns/libdns"
-)
-
-// Add adds a machine to the DNS records
-func (mgr *Manager) Add(ctx context.Context, name string, addrs ...netip.Addr) error {
-	// TODO: validate name
-
-	cur, err := mgr.GetRecords(ctx, name)
-	if err != nil {
-		return core.Wrap(err, "GetRecords")
-	}
-
-	// merge []SyncAddr for name
-	s := mgr.asSyncRecordsMap(cur)[name+mgr.suffix]
-	for _, addr := range addrs {
-		s = AppendSyncAddr(s, addr)
-	}
-
-	return mgr.addSyncAddr(ctx, name, s)
-}
-
-func (mgr *Manager) addSyncAddr(ctx context.Context, name string, s []SyncAddr) error {
-	var recs []libdns.Record
-
-	for _, a := range s {
-		recs = append(recs, libdns.Record{
-			ID:    a.ID,
-			Name:  name + mgr.suffix,
-			Type:  core.IIf(a.Addr.Is6(), "AAAA", "A"),
-			TTL:   time.Second,
-			Value: a.Addr.String(),
-		})
-	}
-
-	SortRecords(recs)
-	err := writeRecords(recs, os.Stdout)
-	if err != nil {
-		return err
-	}
-
-	_, err = mgr.p.SetRecords(ctx, mgr.domain, recs)
-	return err
-}
-
-// AppendSyncAddr appends a [netip.Addr] to a [SyncAddr] slice
-// if the address is new.
-func AppendSyncAddr(s []SyncAddr, addr netip.Addr) []SyncAddr {
-	for _, se := range s {
-		if se.Addr.Compare(addr) == 0 {
-			// found
-			return s
-		}
-	}
-
-	s = append(s, SyncAddr{
-		Addr: addr,
-		TTL:  time.Second,
-	})
-	return s
-}

pkg/dns/dns.go

@@ -1,38 +0,0 @@
-// Package dns manages DNS entries for the cluster
-package dns
-
-import (
-	"fmt"
-	"net/netip"
-)
-
-// Zone represents a set of hosts with high affinity
-type Zone struct {
-	Name string
-
-	Hosts map[int]*Host
-}
-
-func (z *Zone) String() string {
-	if z == nil {
-		return "undetermined"
-	}
-	return z.Name
-}
-
-// Host represents a member of the cluster
-type Host struct {
-	zone *Zone
-
-	ID     int
-	Active bool
-	Addrs  []netip.Addr
-}
-
-func (p *Host) String() string {
-	if p == nil {
-		return "undetermined"
-	}
-
-	return fmt.Sprintf("%s-%v", p.zone, p.ID)
-}

pkg/dns/error.go

@@ -1,12 +0,0 @@
-package dns
-
-import "errors"
-
-var (
-	// ErrNoDNSProvider indicates a [libdns.Provider] wasn't assigned
-	// to the [Manager]
-	ErrNoDNSProvider = errors.New("dns provider not specified")
-
-	// ErrNoDomain indicates a domain wasn't specified
-	ErrNoDomain = errors.New("domain not specified")
-)

pkg/dns/manager.go

@@ -1,230 +0,0 @@
-package dns
-
-import (
-	"context"
-	"io/fs"
-	"net/netip"
-	"strings"
-
-	"darvaza.org/core"
-	"darvaza.org/slog"
-	"github.com/libdns/libdns"
-	"golang.org/x/net/publicsuffix"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
-)
-
-// Manager is a DNS Manager instance
-type Manager struct {
-	domain  string
-	suffix  string
-	zones   map[string]*Zone
-	regions map[string][]string
-
-	p Provider
-	l slog.Logger
-}
-
-// ManagerOption configures a Manager
-type ManagerOption func(*Manager) error
-
-func newErrorManagerOption(err error, hint string) ManagerOption {
-	return func(*Manager) error {
-		return core.Wrap(err, hint)
-	}
-}
-
-// WithProvider attaches a libdns Provider to the Manager
-func WithProvider(p Provider) ManagerOption {
-	var err error
-
-	if p == nil {
-		p, err = DefaultDNSProvider()
-	}
-
-	if err != nil {
-		return newErrorManagerOption(err, "WithProvider")
-	}
-
-	return func(mgr *Manager) error {
-		mgr.p = p
-		return nil
-	}
-}
-
-// WithLogger attaches a logger to the Manager
-func WithLogger(log slog.Logger) ManagerOption {
-	if log == nil {
-		log = cluster.DefaultLogger()
-	}
-
-	return func(mgr *Manager) error {
-		mgr.l = log
-		return nil
-	}
-}
-
-func (mgr *Manager) setDefaults() error {
-	var opts []ManagerOption
-
-	if mgr.l == nil {
-		opts = append(opts, WithLogger(nil))
-	}
-
-	if mgr.domain == "" || mgr.suffix == "" {
-		return ErrNoDomain
-	}
-
-	for _, opt := range opts {
-		if err := opt(mgr); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// WithDomain specifies where the manager operates
-func WithDomain(domain string) ManagerOption {
-	base, err := publicsuffix.EffectiveTLDPlusOne(domain)
-	if err != nil {
-		return newErrorManagerOption(err, "publicsuffix")
-	}
-
-	suffix := strings.TrimSuffix(domain, base)
-	if suffix != "" {
-		suffix = "." + suffix[:len(suffix)-1]
-	}
-
-	return func(mgr *Manager) error {
-		mgr.domain = base
-		mgr.suffix = suffix
-		return nil
-	}
-}
-
-// NewManager creates a DNS manager with the
-func NewManager(opts ...ManagerOption) (*Manager, error) {
-	mgr := &Manager{
-		zones:   make(map[string]*Zone),
-		regions: make(map[string][]string),
-	}
-
-	for _, opt := range opts {
-		if err := opt(mgr); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := mgr.setDefaults(); err != nil {
-		return nil, err
-	}
-	return mgr, nil
-}
-
-// GetRecords pulls all the address records on DNS for our domain,
-// optionally only those matching the given names.
-func (mgr *Manager) GetRecords(ctx context.Context, names ...string) ([]libdns.Record, error) {
-	if mgr.p == nil {
-		return nil, ErrNoDNSProvider
-	}
-
-	recs, err := mgr.p.GetRecords(ctx, mgr.domain)
-	switch {
-	case err != nil:
-		// failed
-		return nil, err
-	case len(recs) == 0:
-		// empty
-		return []libdns.Record{}, nil
-	case mgr.suffix == "" && len(names) == 0:
-		// unfiltered
-		return recs, nil
-	default:
-		// filtered
-		recs = mgr.filterRecords(recs, names...)
-		return recs, nil
-	}
-}
-
-func (mgr *Manager) filterRecords(recs []libdns.Record, names ...string) []libdns.Record {
-	out := make([]libdns.Record, 0, len(recs))
-	for _, rr := range recs {
-		name, ok := mgr.matchSuffix(rr)
-		switch {
-		case !ok:
-			// skip, wrong subdomain
-			continue
-		case len(names) == 0:
-			// unfiltered, take it
-		case !core.SliceContains(names, name):
-			// skip, not one of the requested names
-			continue
-		}
-
-		out = append(out, rr)
-	}
-
-	return out
-}
-
-func (mgr *Manager) matchSuffix(rr libdns.Record) (string, bool) {
-	if mgr.suffix == "" {
-		// no suffix
-		return rr.Name, true
-	}
-
-	// remove suffix
-	return strings.CutSuffix(rr.Name, mgr.suffix)
-}
-
-// AddHost registers a host
-func (mgr *Manager) AddHost(_ context.Context, zone string, id int,
-	active bool, addrs ...netip.Addr) error {
-	//
-	if zone == "" || id <= 0 {
-		return fs.ErrInvalid
-	}
-
-	z, ok := mgr.zones[zone]
-	if !ok {
-		z = &Zone{
-			Name:  zone,
-			Hosts: make(map[int]*Host),
-		}
-
-		mgr.zones[zone] = z
-	}
-
-	p := &Host{
-		zone:   z,
-		ID:     id,
-		Active: active,
-		Addrs:  SortAddrSlice(addrs),
-	}
-	z.Hosts[id] = p
-
-	if log, ok := mgr.l.Debug().WithEnabled(); ok {
-		log.WithField("subsystem", "dns").
-			WithField("zone", zone).
-			WithField("host", p.String()).
-			WithField("active", active).
-			Print()
-	}
-
-	return nil
-}
-
-// AddRegion specifies a new region and the zones it contains
-func (mgr *Manager) AddRegion(_ context.Context, region string, zones ...string) error {
-	mgr.regions[region] = append(mgr.regions[region], zones...)
-
-	if log, ok := mgr.l.Debug().WithEnabled(); ok {
-		for _, zoneName := range zones {
-			log.WithField("subsystem", "dns").
-				WithField("region", region).
-				WithField("zone", zoneName).Print()
-		}
-	}
-
-	return nil
-}

pkg/dns/provider.go

@@ -1,38 +0,0 @@
-package dns
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/libdns/cloudflare"
-	"github.com/libdns/libdns"
-)
-
-const (
-	// CloudflareAPIToken is the environment variable
-	// containing the API Token
-	CloudflareAPIToken = "CLOUDFLARE_DNS_API_TOKEN"
-)
-
-// Provider manages DNS entries
-type Provider interface {
-	libdns.RecordGetter
-	libdns.RecordDeleter
-	libdns.RecordSetter
-	libdns.RecordAppender
-}
-
-// DefaultDNSProvider returns a cloudflare DNS provider
-// using an API Token from env [CloudflareAPIToken]
-func DefaultDNSProvider() (*cloudflare.Provider, error) {
-	s := os.Getenv(CloudflareAPIToken)
-	if s == "" {
-		return nil, fmt.Errorf("%q: %s", CloudflareAPIToken, "not found")
-	}
-
-	p := &cloudflare.Provider{
-		APIToken: s,
-	}
-
-	return p, nil
-}

pkg/dns/record.go

@@ -1,247 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/netip"
-	"sort"
-	"strings"
-	"time"
-
-	"darvaza.org/core"
-	"github.com/libdns/libdns"
-
-	"git.jpi.io/amery/jpictl/pkg/cluster"
-)
-
-func (mgr *Manager) fqdn(name string) string {
-	return fmt.Sprintf("%s.%s.", name, mgr.domain)
-}
-
-// SortAddrSlice sorts a slice of [netip.Addr]
-func SortAddrSlice(s []netip.Addr) []netip.Addr {
-	sort.Slice(s, func(i, j int) bool {
-		return s[i].Less(s[j])
-	})
-	return s
-}
-
-// SortAddrRecords sorts a slice of [AddrRecord]
-// by Name and Address
-func SortAddrRecords(s []AddrRecord) []AddrRecord {
-	sort.Slice(s, func(i, j int) bool {
-		return s[i].Name < s[j].Name
-	})
-
-	for _, p := range s {
-		SortAddrSlice(p.Addr)
-	}
-
-	return s
-}
-
-// SortRecords sorts a slice of [libdns.Record], by Name, Type and Value
-func SortRecords(s []libdns.Record) []libdns.Record {
-	sort.Slice(s, func(i, j int) bool {
-		return lessRecord(s[i], s[j])
-	})
-	return s
-}
-
-func lessRecord(a, b libdns.Record) bool {
-	aName := strings.ToLower(a.Name)
-	bName := strings.ToLower(b.Name)
-
-	switch {
-	case aName < bName:
-		return true
-	case aName > bName:
-		return false
-	}
-
-	aType := strings.ToUpper(a.Type)
-	bType := strings.ToUpper(b.Type)
-
-	switch {
-	case aType < bType:
-		return true
-	case aType > bType:
-		return false
-	case aType == "A", aType == "AAAA":
-		// IP Addresses
-		var aa, ba netip.Addr
-
-		switch {
-		case aa.UnmarshalText([]byte(a.Value)) != nil:
-			// bad address on a
-			return true
-		case ba.UnmarshalText([]byte(b.Value)) != nil:
-			// bad address on b
-			return false
-		default:
-			return aa.Less(ba)
-		}
-	default:
-		// text
-		return a.Value < b.Value
-	}
-}
-
-// AddrRecord represents an A or AAAA record
-type AddrRecord struct {
-	Name string
-	Addr []netip.Addr
-}
-
-// Sort sorts the addresses of the record
-func (rr *AddrRecord) Sort() {
-	SortAddrSlice(rr.Addr)
-}
-
-// Export converts the record into libdns.Record
-func (rr *AddrRecord) Export() []libdns.Record {
-	out := make([]libdns.Record, len(rr.Addr))
-	for i, addr := range rr.Addr {
-		out[i] = libdns.Record{
-			Name:  rr.Name,
-			TTL:   time.Second * 1,
-			Type:  core.IIf(addr.Is6(), "AAAA", "A"),
-			Value: addr.String(),
-		}
-	}
-
-	return out
-}
-
-// WriteTo writes the record in BIND notation
-func (rr *AddrRecord) WriteTo(w io.Writer) (int64, error) {
-	var total int
-	for _, addr := range rr.Addr {
-		n, err := fmt.Fprint(w,
-			rr.Name, "\t",
-			1, "\t",
-			core.IIf(addr.Is6(), "AAAA", "A"), "\t",
-			addr.String(), "\n")
-
-		switch {
-		case err != nil:
-			return 0, err
-		case n > 0:
-			total += n
-		}
-	}
-
-	return int64(total), nil
-}
-
-// String converts the record into BIND entries
-func (rr *AddrRecord) String() string {
-	var buf bytes.Buffer
-	_, _ = rr.WriteTo(&buf)
-	return buf.String()
-}
-
-func (mgr *Manager) genRegionsSorted() []string {
-	regions := make([]string, 0, len(mgr.regions))
-	for name := range mgr.regions {
-		regions = append(regions, name)
-	}
-
-	return cluster.SortRegions(regions)
-}
-
-func (mgr *Manager) genZonesSorted() []string {
-	zones := make([]string, 0, len(mgr.zones))
-	for name := range mgr.zones {
-		zones = append(zones, name)
-	}
-
-	sort.Strings(zones)
-	return zones
-}
-
-func (mgr *Manager) genAllAddrRecords() []AddrRecord {
-	var out []AddrRecord
-
-	cache := make(map[string][]netip.Addr)
-
-	// zones
-	for _, z := range mgr.zones {
-		// hosts
-		s := mgr.genZoneHostRecords(z)
-		out = append(out, s...)
-
-		// zone alias
-		addrs := mgr.genZoneAddresses(z)
-		name := z.Name
-
-		out = append(out, AddrRecord{
-			Name: name + mgr.suffix,
-			Addr: addrs,
-		})
-
-		// and cache for regions
-		cache[name] = addrs
-	}
-
-	for _, name := range mgr.genRegionsSorted() {
-		var addrs []netip.Addr
-
-		for _, z := range mgr.regions[name] {
-			addrs = append(addrs, cache[z]...)
-		}
-
-		rec := AddrRecord{
-			Name: name + mgr.suffix,
-			Addr: addrs,
-		}
-		rec.Sort()
-
-		out = append(out, rec)
-	}
-
-	SortAddrRecords(out)
-	return out
-}
-
-func (*Manager) genZoneAddresses(z *Zone) []netip.Addr {
-	var out []netip.Addr
-
-	for _, p := range z.Hosts {
-		if p.Active {
-			out = append(out, p.Addrs...)
-		}
-	}
-
-	SortAddrSlice(out)
-	return out
-}
-
-func (mgr *Manager) genZoneHostRecords(z *Zone) []AddrRecord {
-	out := make([]AddrRecord, 0, len(z.Hosts))
-
-	for _, p := range z.Hosts {
-		rec := AddrRecord{
-			Name: p.String() + mgr.suffix,
-			Addr: p.Addrs,
-		}
-		out = append(out, rec)
-	}
-
-	SortAddrRecords(out)
-	return out
-}
-
-func (mgr *Manager) genRegionAddressesCached(name string,
-	zones map[string][]netip.Addr) []netip.Addr {
-	//
-	var addrs []netip.Addr
-
-	for _, zoneName := range mgr.regions[name] {
-		addrs = append(addrs, zones[zoneName]...)
-	}
-
-	SortAddrSlice(addrs)
-	return addrs
-}

pkg/dns/show.go

@@ -1,58 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"time"
-
-	"darvaza.org/core"
-	"github.com/libdns/libdns"
-)
-
-// Show shows current DNS entries
-func (mgr *Manager) Show(ctx context.Context, names ...string) error {
-	recs, err := mgr.GetRecords(ctx, names...)
-	if err != nil {
-		return core.Wrap(err, "GetRecords")
-	}
-
-	SortRecords(recs)
-	return writeRecords(recs, os.Stdout)
-}
-
-func writeRecords(recs []libdns.Record, w io.Writer) error {
-	var buf bytes.Buffer
-
-	for _, rr := range recs {
-		_ = fmtRecord(&buf, rr)
-		_, _ = buf.WriteRune('\n')
-	}
-	_, _ = fmt.Fprintf(&buf, "; %v records\n", len(recs))
-
-	_, err := buf.WriteTo(w)
-	return err
-}
-
-func fmtRecord(w io.Writer, rr libdns.Record) error {
-	ttl := int(rr.TTL / time.Second)
-	if ttl < 1 {
-		ttl = 1
-	}
-
-	_, err := fmt.Fprintf(w, "%s\t%v\tIN\t%s\t%s",
-		rr.Name,
-		ttl,
-		rr.Type,
-		rr.Value)
-
-	if err == nil {
-		if rr.ID != "" {
-			_, err = fmt.Fprintf(w, "\t; %s", rr.ID)
-		}
-	}
-
-	return err
-}