zones: introduce Machine.PublicAddresses()

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

cmd/jpictl/config.go

@@ -0,0 +1,12 @@
+package main
+
+// Config describes the repository
+type Config struct {
+	Base   string
+	Domain string
+}
+
+var cfg = &Config{
+	Base:   "./m",
+	Domain: "m.jpi.cloud",
+}

cmd/jpictl/dump.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"bytes"
+	"os"
+
+	"github.com/burntSushi/toml"
+	"github.com/spf13/cobra"
+
+	"git.jpi.io/amery/jpictl/pkg/zones"
+)
+
+// Command
+var dumpCmd = &cobra.Command{
+	Use:   "dump",
+	Short: "generates a toml representation of the config",
+	RunE: func(_ *cobra.Command, _ []string) error {
+		var buf bytes.Buffer
+
+		m, err := zones.New(cfg.Base, cfg.Domain)
+		if err != nil {
+			return err
+		}
+
+		enc := toml.NewEncoder(&buf)
+		if err = enc.Encode(m); err != nil {
+			return err
+		}
+
+		if _, err = buf.WriteTo(os.Stdout); err != nil {
+			return err
+		}
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(dumpCmd)
+}

cmd/jpictl/env.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-
-	"git.jpi.io/amery/jpictl/pkg/zones"
-)
-
-// Command
-var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "generates environment variables for shell scripts",
-	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := zones.New("./m")
-		if err != nil {
-			return err
-		}
-
-		return m.WriteEnv(os.Stdout)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(envCmd)
-}

go.mod

@@ -3,8 +3,10 @@ module git.jpi.io/amery/jpictl
 go 1.19
 
 require (
+	darvaza.org/resolver v0.5.2
 	darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
 	darvaza.org/slog v0.5.2
+	github.com/burntSushi/toml v0.3.1
 	github.com/mgechev/revive v1.3.2
 	github.com/spf13/cobra v1.7.0
 )
@@ -20,16 +22,18 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // 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.12.0 // indirect
 	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/tools v0.11.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
 )

go.sum

@@ -1,5 +1,7 @@
 darvaza.org/core v0.9.5 h1:sS5pZFwicaxJIQixEiqkMr9GknVHYL+EbKDMkR/4jDM=
 darvaza.org/core v0.9.5/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
+darvaza.org/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=
+darvaza.org/resolver v0.5.2/go.mod h1:fFvsVPEFeMzUIWlLG47Go/6uJYtRLb9R8HIgYg3uaxE=
 darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf h1:ya5ZQicBb/GWll3rlqra8No7oJXks7y1m/cJGYBypv4=
 darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf/go.mod h1:by+bPsMa7Rxc/ZYG1qBunrtKocv/DkrPBmyFlmq/j2Q=
 darvaza.org/slog v0.5.2 h1:8TG1WyHjOyh2vW6t3pjzZVaWzpko5MIIpeI7LWqHFvs=
@@ -10,6 +12,8 @@ darvaza.org/slog/handlers/zerolog v0.4.4 h1:OR1ASvH1fBCq3t85t4OU6oJPPuqMB1tsDoSp
 darvaza.org/slog/handlers/zerolog v0.4.4/go.mod h1:t60TeEbFcMLo74CkXC2S0rKlnwF4ixZyBR4fqIJV1GE=
 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.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0=
 github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -32,12 +36,14 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 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-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+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.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U=
 github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0=
+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=
@@ -66,8 +72,10 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 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=
@@ -76,8 +84,8 @@ golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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=

pkg/zones/env.go

@@ -1,9 +0,0 @@
-// Package zones abstracts the cluster zones
-package zones
-
-import "io"
-
-// WriteEnv generates environment variables for shell scripts
-func (*Zones) WriteEnv(io.Writer) error {
-	return nil
-}

pkg/zones/machine.go

@@ -0,0 +1,58 @@
+package zones
+
+import (
+	"net/netip"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+// A Machine is a machine on a Zone
+type Machine struct {
+	mu sync.Mutex
+
+	zone *Zone
+	id   int
+	Name string
+
+	PublicAddresses []netip.Addr
+}
+
+func (m *Machine) String() string {
+	return m.Name
+}
+
+// ID return the index within the [Zone] associated to this [Machine]
+func (m *Machine) ID() int {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.id == 0 {
+		zoneName := m.zone.Name
+
+		s := m.Name[len(zoneName)+1:]
+
+		id, err := strconv.ParseInt(s, 10, 8)
+		if err != nil {
+			panic(err)
+		}
+
+		m.id = int(id)
+	}
+
+	return m.id
+}
+
+// FullName returns the Name of the machine including domain name
+func (m *Machine) FullName() string {
+	if domain := m.zone.zones.domain; domain != "" {
+		var s = []string{
+			m.Name,
+			domain,
+		}
+
+		return strings.Join(s, ".")
+	}
+
+	return m.Name
+}

pkg/zones/machine_scan.go

@@ -0,0 +1,26 @@
+package zones
+
+import (
+	"context"
+	"net/netip"
+	"time"
+)
+
+func (m *Machine) lookupNetIP() ([]netip.Addr, error) {
+	timeout := 2 * time.Second
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+
+	defer cancel()
+
+	return m.zone.zones.resolver.LookupNetIP(ctx, "ip", m.FullName())
+}
+
+func (m *Machine) updatePublicAddresses() error {
+	addrs, err := m.lookupNetIP()
+	if err != nil {
+		return err
+	}
+
+	m.PublicAddresses = addrs
+	return nil
+}

pkg/zones/machines.go

@@ -1,7 +0,0 @@
-package zones
-
-// A Machine is a machine on a Zone
-type Machine struct {
-	zone *Zone
-	name string
-}

pkg/zones/scan.go

@@ -2,12 +2,9 @@ package zones
 
 import (
 	"io/fs"
-	"log"
 )
 
 func (m *Zones) scan() error {
-	var zones []Zone
-
 	// each directory is a zone
 	entries, err := fs.ReadDir(m.dir, ".")
 	if err != nil {
@@ -16,14 +13,43 @@ func (m *Zones) scan() error {
 
 	for _, e := range entries {
 		if e.IsDir() {
-			z := Zone{
+			z := &Zone{
 				zones: m,
-				name:  e.Name(),
+				Name:  e.Name(),
 			}
 
-			log.Print(z)
+			if err := z.scan(); err != nil {
-			zones = append(zones, z)
+				return err
+			}
+
+			m.Zones = append(m.Zones, z)
 		}
 	}
+
+	return nil
+}
+
+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 {
+		if e.IsDir() {
+			m := &Machine{
+				zone: z,
+				Name: e.Name(),
+			}
+
+			if err := m.updatePublicAddresses(); err != nil {
+				return err
+			}
+
+			z.Machines = append(z.Machines, m)
+		}
+	}
+
 	return nil
 }

pkg/zones/zones.go

@@ -1,29 +1,42 @@
+// Package zones contains information about the cluster
 package zones
 
 import (
 	"io/fs"
 	"os"
+
+	"darvaza.org/resolver"
 )
 
 // Zone represents one zone in a cluster
 type Zone struct {
 	zones *Zones
 
-	id   int
+	ID   int
-	name string
+	Name string
+
+	Machines []*Machine `toml:"machines"`
+}
+
+func (z *Zone) String() string {
+	return z.Name
 }
 
 // Zones represents all zones in a cluster
 type Zones struct {
-	dir fs.FS
+	dir      fs.FS
+	resolver resolver.Resolver
+	domain   string
 
-	zones []Zone
+	Zones []*Zone `toml:"zones"`
 }
 
 // NewFS builds a [Zones] tree using the given directory
-func NewFS(dir fs.FS) (*Zones, error) {
+func NewFS(dir fs.FS, domain string) (*Zones, error) {
 	z := &Zones{
-		dir: dir,
+		dir:      dir,
+		resolver: resolver.SystemResolver(true),
+		domain:   domain,
 	}
 
 	if err := z.scan(); err != nil {
@@ -34,6 +47,6 @@ func NewFS(dir fs.FS) (*Zones, error) {
 }
 
 // New builds a [Zones] tree using the given directory
-func New(dir string) (*Zones, error) {
+func New(dir, domain string) (*Zones, error) {
-	return NewFS(os.DirFS(dir))
+	return NewFS(os.DirFS(dir), domain)
 }