Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 amery
|
7dd04d84f4 | ||
|
amery
|
385f85ff91 | ||
|
amery
|
986db350b4 | ||
|
amery
|
99ae34e98c | ||
|
amery
|
76b40e63c7 | ||
|
amery
|
5d82de5535 | ||
|
amery
|
c33d0dab16 | ||
|
amery
|
dd585b0fa2 | ||
|
amery
|
172752ab90 | ||
|
amery
|
4e2693b12c | ||
|
amery
|
eba0340e32 | ||
|
amery
|
1a47985bd7 | ||
|
amery
|
f5ea72740c | ||
|
amery
|
357c85dc1a | ||
|
amery
|
00aec477a4 | ||
|
amery
|
e0d8592dc1 | ||
|
amery
|
c397ca29ac | ||
|
amery
|
066788b9be | ||
|
amery
|
4402555f04 | ||
|
amery
|
6e7f24f491 | ||
|
amery
|
54b302c6d5 | ||
|
amery
|
f62a47003d | ||
|
amery
|
5abaed9047 | ||
|
amery
|
c702d649e0 | ||
|
amery
|
e9f9d474dc | ||
|
amery
|
e2941cf2c0 | ||
|
amery
|
ea755113a8 | ||
|
amery
|
1c199ed923 | ||
|
amery
|
5dc5c95aa1 | ||
|
amery
|
a0cc698a39 | ||
|
amery
|
70008e0ead | ||
|
amery
|
ec2b30c1e7 |
Vendored
+6
@@ -1,9 +1,15 @@
|
||||
{
|
||||
"cSpell.words": [
|
||||
"asciigoat",
|
||||
"ceph",
|
||||
"cyclomatic",
|
||||
"darvaza",
|
||||
"gofrs",
|
||||
"jpictl",
|
||||
"libdns",
|
||||
"Lookuper",
|
||||
"publicsuffix",
|
||||
"Wrapf",
|
||||
"zerolog"
|
||||
]
|
||||
}
|
||||
|
||||
+38
-1
@@ -1,11 +1,25 @@
|
||||
package main
|
||||
|
||||
import "git.jpi.io/amery/jpictl/pkg/cluster"
|
||||
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"
|
||||
)
|
||||
|
||||
// Config describes the repository
|
||||
type Config struct {
|
||||
Base string
|
||||
Domain string
|
||||
|
||||
ConfigFile string
|
||||
}
|
||||
|
||||
var cfg = &Config{
|
||||
@@ -14,9 +28,32 @@ var cfg = &Config{
|
||||
}
|
||||
|
||||
// LoadZones loads all zones and machines in the config directory
|
||||
// or file
|
||||
func (cfg *Config) LoadZones(resolve bool) (*cluster.Cluster, error) {
|
||||
// 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 init() {
|
||||
rootCmd.PersistentFlags().
|
||||
StringVarP(&cfg.ConfigFile, "config-file", "f",
|
||||
DefaultConfigFile, "config file (JSON or YAML)")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"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, p.ID, true, 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
|
||||
}
|
||||
|
||||
// Command
|
||||
var dnsCmd = &cobra.Command{
|
||||
Use: "dns",
|
||||
}
|
||||
|
||||
var dnsWriteCmd = &cobra.Command{
|
||||
Use: "write",
|
||||
Short: "dns write generates public DNS records",
|
||||
PreRun: setVerbosity,
|
||||
RunE: func(_ *cobra.Command, _ []string) error {
|
||||
m, err := cfg.LoadZones(true)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mgr, err := newDNSManager(m, nil)
|
||||
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(_ *cobra.Command, _ []string) error {
|
||||
cred, err := dns.DefaultDNSProvider()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m, err := cfg.LoadZones(true)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mgr, err := newDNSManager(m, cred)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), DNSSyncTimeout)
|
||||
defer cancel()
|
||||
|
||||
return mgr.Sync(ctx)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(dnsCmd)
|
||||
|
||||
dnsCmd.AddCommand(dnsWriteCmd)
|
||||
dnsCmd.AddCommand(dnsSyncCmd)
|
||||
}
|
||||
+1
-1
@@ -37,5 +37,5 @@ func setVerbosity(_ *cobra.Command, _ []string) {
|
||||
if desired > 6 {
|
||||
desired = 6
|
||||
}
|
||||
log = log.WithLevel(slog.LogLevel(desired))
|
||||
log = zerolog.New(nil, slog.LogLevel(desired))
|
||||
}
|
||||
|
||||
@@ -4,16 +4,19 @@ go 1.19
|
||||
|
||||
require (
|
||||
asciigoat.org/ini v0.2.5
|
||||
darvaza.org/core v0.9.8
|
||||
darvaza.org/core v0.10.0
|
||||
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/gofrs/uuid/v5 v5.0.0
|
||||
github.com/hack-pad/hackpadfs v0.2.1
|
||||
github.com/mgechev/revive v1.3.3
|
||||
github.com/libdns/cloudflare v0.1.0
|
||||
github.com/libdns/libdns v0.2.1
|
||||
github.com/mgechev/revive v1.3.4
|
||||
github.com/spf13/cobra v1.7.0
|
||||
golang.org/x/crypto v0.12.0
|
||||
golang.org/x/crypto v0.14.0
|
||||
golang.org/x/net v0.17.0
|
||||
gopkg.in/gcfg.v1 v1.2.3
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
@@ -27,21 +30,23 @@ require (
|
||||
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.19 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // 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/miekg/dns v1.1.56 // 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/rogpeppe/go-internal v1.10.1-0.20230524175051-ec119421bb97 // indirect
|
||||
github.com/rs/zerolog v1.31.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.12.0 // indirect
|
||||
golang.org/x/mod v0.13.0 // indirect
|
||||
golang.org/x/sys v0.13.0 // indirect
|
||||
golang.org/x/text v0.13.0 // indirect
|
||||
golang.org/x/tools v0.12.0 // indirect
|
||||
golang.org/x/tools v0.14.0 // indirect
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||
)
|
||||
|
||||
@@ -2,8 +2,8 @@ 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/core v0.9.8 h1:luLxgfUc2pzuusYPo/Z/dC/qr9XZPKpSQw8/kS7zNUM=
|
||||
darvaza.org/core v0.9.8/go.mod h1:Dbme64naxeshQfxcVJX9ZT7AiGyIY8kldfuELVtf8mw=
|
||||
darvaza.org/core v0.10.0 h1:/nQOSWnMgWW8ZJmv3AEdTgIK+Pg4lkPd+VNejL84q3M=
|
||||
darvaza.org/core v0.10.0/go.mod h1:72iWMVoXjMHjsPSlctDzA7yKzwXsj5dO+se6F9B3ERs=
|
||||
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=
|
||||
@@ -22,6 +22,7 @@ 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.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
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=
|
||||
@@ -36,26 +37,38 @@ github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMI
|
||||
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/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
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.0 h1:93WkJaGaiXCe353LHEP36kAWCUw0YjFqwhkBkU2/iic=
|
||||
github.com/libdns/cloudflare v0.1.0/go.mod h1:a44IP6J1YH6nvcNl1PverfJviADgXUnsozR3a7vBKN8=
|
||||
github.com/libdns/libdns v0.2.0/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
|
||||
github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=
|
||||
github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
|
||||
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/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/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc=
|
||||
github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw=
|
||||
github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE=
|
||||
github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY=
|
||||
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/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
@@ -63,9 +76,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
|
||||
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/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rogpeppe/go-internal v1.10.1-0.20230524175051-ec119421bb97 h1:3RPlVWzZ/PDqmVuf/FKHARG5EMid/tl7cv54Sw/QRVY=
|
||||
github.com/rogpeppe/go-internal v1.10.1-0.20230524175051-ec119421bb97/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
||||
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
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/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
|
||||
github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
|
||||
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
|
||||
@@ -78,26 +94,26 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
||||
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/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
|
||||
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
|
||||
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
||||
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
|
||||
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.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
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=
|
||||
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
|
||||
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
|
||||
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=
|
||||
|
||||
@@ -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.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
|
||||
return core.Wrap(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.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
|
||||
return core.Wrap(fs.ErrInvalid, "duplicate field %q", field.Key)
|
||||
}
|
||||
|
||||
err := cfg.FSID.UnmarshalText([]byte(field.Value))
|
||||
|
||||
@@ -71,7 +71,7 @@ func newCephScanTODO(cfg *ceph.Config) *cephScanTODO {
|
||||
return todo
|
||||
}
|
||||
|
||||
func (m *Cluster) scanCephMonitors(_ *ScanOptions) error {
|
||||
func (m *Cluster) scanCephMonitors(opts *ScanOptions) error {
|
||||
cfg, err := m.GetCephConfig()
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
@@ -94,6 +94,10 @@ func (m *Cluster) scanCephMonitors(_ *ScanOptions) error {
|
||||
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()
|
||||
|
||||
@@ -27,7 +27,8 @@ type Cluster struct {
|
||||
Domain string `json:"domain,omitempty" yaml:"domain,omitempty"`
|
||||
|
||||
CephFSID uuid.UUID `json:"ceph_fsid,omitempty" yaml:"ceph_fsid,omitempty"`
|
||||
Zones []*Zone `json:"zones,omitempty" yaml:"zones,omitempty"`
|
||||
Regions []Region `json:",omitempty" yaml:",omitempty"`
|
||||
Zones []*Zone `json:",omitempty" yaml:",omitempty"`
|
||||
}
|
||||
|
||||
// revive:enable:line-length-limit
|
||||
|
||||
@@ -33,7 +33,11 @@ func (m *Cluster) openWriter(name string, flags int, args ...any) (io.WriteClose
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return f.(io.WriteCloser), nil
|
||||
if f, ok := f.(io.WriteCloser); ok {
|
||||
return f, nil
|
||||
}
|
||||
|
||||
panic("unreachable")
|
||||
}
|
||||
|
||||
// ReadFile reads a file from the cluster's config directory
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
package cluster
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
func (m *Cluster) init(opts *ScanOptions) error {
|
||||
for _, fn := range []func(*ScanOptions) error{
|
||||
m.initZones,
|
||||
m.scanZoneIDs,
|
||||
m.scanSort,
|
||||
m.scanGateways,
|
||||
m.initCephMonitors,
|
||||
m.initRegions,
|
||||
} {
|
||||
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 int
|
||||
|
||||
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 = z.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
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
|
||||
"darvaza.org/resolver"
|
||||
"darvaza.org/slog"
|
||||
"github.com/hack-pad/hackpadfs/os"
|
||||
)
|
||||
|
||||
// A ScanOption pre-configures the Zones before scanning
|
||||
@@ -101,7 +100,7 @@ func NewFromDirectory(dir, domain string, opts ...ScanOption) (*Cluster, error)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sub, err := os.NewFS().Sub(fullPath[1:])
|
||||
sub, err := DirFS(dir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
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, _ := RingOneAddress(p.zone.ID, p.ID)
|
||||
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.ID == p.zone.ID {
|
||||
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, _ = RingZeroAddress(p.zone.ID, p.ID)
|
||||
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()
|
||||
}
|
||||
@@ -34,7 +34,11 @@ func (m *Machine) openWriter(name string, flags int, args ...any) (io.WriteClose
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return f.(io.WriteCloser), nil
|
||||
if f, ok := f.(io.WriteCloser); ok {
|
||||
return f, nil
|
||||
}
|
||||
|
||||
panic("unreachable")
|
||||
}
|
||||
|
||||
// RemoveFile deletes a file from the machine's config directory
|
||||
|
||||
@@ -28,7 +28,7 @@ func (m *Machine) GetWireguardKeys(ring int) (wireguard.KeyPair, error) {
|
||||
out.PrivateKey, err = wireguard.PrivateKeyFromBase64(string(data))
|
||||
if err != nil {
|
||||
// bad key
|
||||
err = core.Wrapf(err, "wg%v.key", ring)
|
||||
err = core.Wrap(err, "wg%v.key", ring)
|
||||
return out, err
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ func (m *Machine) GetWireguardKeys(ring int) (wireguard.KeyPair, error) {
|
||||
out.PublicKey, err = wireguard.PublicKeyFromBase64(string(data))
|
||||
if err != nil {
|
||||
// bad key
|
||||
err = core.Wrapf(err, "wg%v.pub", ring)
|
||||
err = core.Wrap(err, "wg%v.pub", ring)
|
||||
return out, err
|
||||
}
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
|
||||
}
|
||||
|
||||
if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
|
||||
return core.Wrapf(err, "%s: invalid address", addr)
|
||||
return core.Wrap(err, "%s: invalid address", addr)
|
||||
}
|
||||
|
||||
if err := m.applyWireguardInterfaceConfig(ring, wg.Interface); err != nil {
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
package cluster
|
||||
|
||||
var (
|
||||
_ MachineIterator = (*Region)(nil)
|
||||
_ ZoneIterator = (*Region)(nil)
|
||||
)
|
||||
|
||||
// Region represents a group of zones geographically related
|
||||
type Region struct {
|
||||
m *Cluster
|
||||
zones []*Zone
|
||||
|
||||
Name string
|
||||
Regions []string `json:",omitempty" yaml:",omitempty"`
|
||||
}
|
||||
|
||||
// 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 {
|
||||
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 {
|
||||
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.syncRegions(name, zones...)
|
||||
}
|
||||
|
||||
// and combine zones to produce larger regions
|
||||
for i := range m.Regions {
|
||||
r := &m.Regions[i]
|
||||
m.finishRegion(r)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Cluster) syncRegions(name string, zones ...*Zone) {
|
||||
for _, r := range m.Regions {
|
||||
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) finishRegion(r *Region) {
|
||||
if r.m != nil {
|
||||
// ready
|
||||
return
|
||||
}
|
||||
|
||||
r.m = m
|
||||
sub := []string{}
|
||||
for _, name := range r.Regions {
|
||||
r2, ok := m.getRegion(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
|
||||
}
|
||||
|
||||
func (m *Cluster) getRegion(name string) (*Region, bool) {
|
||||
for i := range m.Regions {
|
||||
r := &m.Regions[i]
|
||||
|
||||
if name == r.Name {
|
||||
m.finishRegion(r)
|
||||
return r, true
|
||||
}
|
||||
}
|
||||
|
||||
return nil, false
|
||||
}
|
||||
@@ -5,6 +5,7 @@ func (m *Cluster) SyncAll() error {
|
||||
for _, fn := range []func() error{
|
||||
m.SyncAllWireguard,
|
||||
m.SyncAllCeph,
|
||||
m.WriteHosts,
|
||||
} {
|
||||
if err := fn(); err != nil {
|
||||
return err
|
||||
|
||||
@@ -19,8 +19,9 @@ type Zone struct {
|
||||
zones *Cluster
|
||||
logger `json:"-" yaml:"-"`
|
||||
|
||||
ID int
|
||||
Name string
|
||||
ID int
|
||||
Name string
|
||||
Regions []string `json:",omitempty" yaml:",omitempty"`
|
||||
|
||||
Machines
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
// 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)
|
||||
}
|
||||
@@ -0,0 +1,173 @@
|
||||
package dns
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io/fs"
|
||||
"net/netip"
|
||||
"strings"
|
||||
|
||||
"darvaza.org/core"
|
||||
"darvaza.org/slog"
|
||||
"git.jpi.io/amery/jpictl/pkg/cluster"
|
||||
"golang.org/x/net/publicsuffix"
|
||||
)
|
||||
|
||||
// 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 errors.New("domain not specified")
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
package dns
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/netip"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"darvaza.org/core"
|
||||
"github.com/libdns/libdns"
|
||||
)
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
// 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]
|
||||
|
||||
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
|
||||
}
|
||||
})
|
||||
return regions
|
||||
}
|
||||
|
||||
// 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 SortRegions(regions)
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
+347
@@ -0,0 +1,347 @@
|
||||
package dns
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/netip"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"darvaza.org/core"
|
||||
"darvaza.org/slog"
|
||||
"github.com/libdns/libdns"
|
||||
)
|
||||
|
||||
// SyncAddrRecord is similar to AddrRecord but include libdns.Record details
|
||||
// fetched from the Provider
|
||||
type SyncAddrRecord struct {
|
||||
Name string
|
||||
Addrs []SyncAddr
|
||||
}
|
||||
|
||||
// SyncAddr extends netip.Addr with ID and TTL fetched from the Provider
|
||||
type SyncAddr struct {
|
||||
ID string
|
||||
Addr netip.Addr
|
||||
TTL time.Duration
|
||||
}
|
||||
|
||||
// Export assembles a libdns.Record
|
||||
func (rec *SyncAddr) Export(name string) libdns.Record {
|
||||
return libdns.Record{
|
||||
ID: rec.ID,
|
||||
Name: name,
|
||||
Type: core.IIf(rec.Addr.Is6(), "AAAA", "A"),
|
||||
TTL: time.Second,
|
||||
Value: rec.Addr.String(),
|
||||
}
|
||||
}
|
||||
|
||||
// SortSyncAddrSlice sorts a slice of [SyncAddr] by its address
|
||||
func SortSyncAddrSlice(s []SyncAddr) []SyncAddr {
|
||||
sort.Slice(s, func(i, j int) bool {
|
||||
a1 := s[i].Addr
|
||||
a2 := s[j].Addr
|
||||
return a1.Less(a2)
|
||||
})
|
||||
return s
|
||||
}
|
||||
|
||||
// GetRecords pulls all the address records on DNS for our domain
|
||||
func (mgr *Manager) GetRecords(ctx context.Context) ([]SyncAddrRecord, error) {
|
||||
if mgr.p == nil {
|
||||
return nil, errors.New("dns provider not specified")
|
||||
}
|
||||
|
||||
recs, err := mgr.p.GetRecords(ctx, mgr.domain)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return mgr.filteredRecords(recs)
|
||||
}
|
||||
|
||||
// AsSyncAddr converts a A or AAAA [libdns.Record] into a [SyncAddr]
|
||||
func (mgr *Manager) AsSyncAddr(rr libdns.Record) (SyncAddr, bool, error) {
|
||||
var out SyncAddr
|
||||
var addr netip.Addr
|
||||
|
||||
// skip non-address types
|
||||
if rr.Type != "A" && rr.Type != "AAAA" {
|
||||
return out, false, nil
|
||||
}
|
||||
|
||||
// skip entries not containing our suffix
|
||||
if mgr.suffix != "" {
|
||||
if !strings.HasSuffix(rr.Name, mgr.suffix) {
|
||||
return out, false, nil
|
||||
}
|
||||
}
|
||||
|
||||
err := addr.UnmarshalText([]byte(rr.Value))
|
||||
if err != nil {
|
||||
// invalid address on A or AAAA record
|
||||
return out, false, err
|
||||
}
|
||||
|
||||
out = SyncAddr{
|
||||
ID: rr.ID,
|
||||
TTL: rr.TTL,
|
||||
Addr: addr,
|
||||
}
|
||||
|
||||
return out, true, nil
|
||||
}
|
||||
|
||||
func (mgr *Manager) filteredRecords(recs []libdns.Record) ([]SyncAddrRecord, error) {
|
||||
// filter and convert
|
||||
cache := make(map[string][]SyncAddr)
|
||||
for _, rr := range recs {
|
||||
addr, ok, err := mgr.AsSyncAddr(rr)
|
||||
switch {
|
||||
case err != nil:
|
||||
// skip invalid addresses
|
||||
mgr.l.Error().
|
||||
WithField("subsystem", "dns").
|
||||
WithField(slog.ErrorFieldName, err).
|
||||
WithField("name", rr.Name).
|
||||
WithField("type", rr.Type).
|
||||
WithField("addr", rr.Value).
|
||||
Print()
|
||||
case ok:
|
||||
// store
|
||||
cache[rr.Name] = append(cache[rr.Name], addr)
|
||||
}
|
||||
}
|
||||
|
||||
// prepare records
|
||||
out := make([]SyncAddrRecord, len(cache))
|
||||
names := make([]string, 0, len(cache))
|
||||
for name := range cache {
|
||||
names = append(names, name)
|
||||
}
|
||||
sort.Strings(names)
|
||||
|
||||
for i, name := range names {
|
||||
addrs := cache[name]
|
||||
|
||||
out[i] = SyncAddrRecord{
|
||||
Name: name,
|
||||
Addrs: SortSyncAddrSlice(addrs),
|
||||
}
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Sync updates all the address records on DNS for our domain
|
||||
func (mgr *Manager) Sync(ctx context.Context) error {
|
||||
current, err := mgr.GetRecords(ctx)
|
||||
if err != nil {
|
||||
return core.Wrap(err, "GetRecords")
|
||||
}
|
||||
|
||||
goal := mgr.genAllAddrRecords()
|
||||
for _, p := range makeSyncMap(current, goal) {
|
||||
err := mgr.doSync(ctx, p.Name, p.Before, p.After)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mgr *Manager) doSync(ctx context.Context, name string,
|
||||
before []SyncAddr, after []netip.Addr) error {
|
||||
//
|
||||
var err error
|
||||
|
||||
for _, a := range after {
|
||||
before, err = mgr.doSyncUpdateOrInsert(ctx, name, a, before)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
for _, b := range before {
|
||||
err = mgr.doSyncRemove(ctx, name, b)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mgr *Manager) doSyncUpdateOrInsert(ctx context.Context, name string,
|
||||
addr netip.Addr, addrs []SyncAddr) ([]SyncAddr, error) {
|
||||
//
|
||||
var err error
|
||||
|
||||
i, ok := findSyncAddrSorted(addr, addrs)
|
||||
if ok {
|
||||
rec := addrs[i]
|
||||
|
||||
addrs = append(addrs[:i], addrs[i+1:]...)
|
||||
err = mgr.doSyncUpdate(ctx, name, addr, rec)
|
||||
} else {
|
||||
err = mgr.doSyncInsert(ctx, name, addr)
|
||||
}
|
||||
|
||||
return addrs, err
|
||||
}
|
||||
|
||||
func (mgr *Manager) doSyncUpdate(ctx context.Context, name string,
|
||||
addr netip.Addr, rec SyncAddr) error {
|
||||
//
|
||||
var log slog.Logger
|
||||
var msg string
|
||||
var err error
|
||||
|
||||
if rec.TTL != time.Second {
|
||||
// amend TTL
|
||||
|
||||
// TODO: batch updates
|
||||
_, err = mgr.p.SetRecords(ctx, mgr.domain, []libdns.Record{
|
||||
rec.Export(name),
|
||||
})
|
||||
|
||||
if err == nil {
|
||||
log = mgr.l.Info()
|
||||
msg = "Updated"
|
||||
} else {
|
||||
log = mgr.l.Error().
|
||||
WithField(slog.ErrorFieldName, err)
|
||||
msg = "Failed"
|
||||
}
|
||||
} else {
|
||||
log = mgr.l.Info()
|
||||
msg = "OK"
|
||||
}
|
||||
|
||||
log.
|
||||
WithField("subsystem", "dns").
|
||||
WithField("name", name).
|
||||
WithField("addr", addr).
|
||||
Print(msg)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (mgr *Manager) doSyncInsert(ctx context.Context, name string,
|
||||
addr netip.Addr) error {
|
||||
//
|
||||
var log slog.Logger
|
||||
var msg string
|
||||
|
||||
rec := libdns.Record{
|
||||
Name: name,
|
||||
Type: core.IIf(addr.Is6(), "AAAA", "A"),
|
||||
TTL: time.Second,
|
||||
Value: addr.String(),
|
||||
}
|
||||
|
||||
_, err := mgr.p.AppendRecords(ctx, mgr.domain, []libdns.Record{
|
||||
rec,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log = mgr.l.Error().
|
||||
WithField(slog.ErrorFieldName, err)
|
||||
msg = "Failed to Add"
|
||||
} else {
|
||||
log = mgr.l.Info()
|
||||
msg = "Added"
|
||||
}
|
||||
|
||||
log.
|
||||
WithField("subsystem", "dns").
|
||||
WithField("name", name).
|
||||
WithField("addr", addr).
|
||||
Print(msg)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mgr *Manager) doSyncRemove(ctx context.Context, name string,
|
||||
rec SyncAddr) error {
|
||||
//
|
||||
var log slog.Logger
|
||||
var msg string
|
||||
|
||||
// TODO: batch deletes
|
||||
_, err := mgr.p.DeleteRecords(ctx, mgr.domain, []libdns.Record{
|
||||
rec.Export(name),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log = mgr.l.Error().
|
||||
WithField(slog.ErrorFieldName, err)
|
||||
msg = "Failed to Delete"
|
||||
} else {
|
||||
log = mgr.l.Warn()
|
||||
msg = "Deleted"
|
||||
}
|
||||
|
||||
log.
|
||||
WithField("subsystem", "dns").
|
||||
WithField("name", name).
|
||||
WithField("addr", rec.Addr).
|
||||
Print(msg)
|
||||
return err
|
||||
}
|
||||
|
||||
func findSyncAddrSorted(target netip.Addr, addrs []SyncAddr) (int, bool) {
|
||||
for i, a := range addrs {
|
||||
switch target.Compare(a.Addr) {
|
||||
case 0:
|
||||
// match
|
||||
return i, true
|
||||
case -1:
|
||||
// miss
|
||||
return -1, false
|
||||
default:
|
||||
// next
|
||||
}
|
||||
}
|
||||
|
||||
return -1, false
|
||||
}
|
||||
|
||||
type syncMapEntry struct {
|
||||
Name string
|
||||
Before []SyncAddr
|
||||
After []netip.Addr
|
||||
}
|
||||
|
||||
func makeSyncMap(current []SyncAddrRecord,
|
||||
goal []AddrRecord) map[string]syncMapEntry {
|
||||
//
|
||||
data := make(map[string]syncMapEntry)
|
||||
|
||||
for _, cur := range current {
|
||||
me, ok := data[cur.Name]
|
||||
if !ok {
|
||||
me = syncMapEntry{
|
||||
Name: cur.Name,
|
||||
}
|
||||
}
|
||||
|
||||
me.Before = append(me.Before, cur.Addrs...)
|
||||
data[cur.Name] = me
|
||||
}
|
||||
|
||||
for _, rr := range goal {
|
||||
me, ok := data[rr.Name]
|
||||
if !ok {
|
||||
me = syncMapEntry{
|
||||
Name: rr.Name,
|
||||
}
|
||||
}
|
||||
me.After = append(me.After, rr.Addr...)
|
||||
data[rr.Name] = me
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package dns
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/netip"
|
||||
)
|
||||
|
||||
// WriteTo writes the DNS data for the cluster
|
||||
func (mgr *Manager) WriteTo(w io.Writer) (int64, error) {
|
||||
var buf bytes.Buffer
|
||||
|
||||
cache := make(map[string][]netip.Addr)
|
||||
|
||||
// zones
|
||||
for _, z := range mgr.zones {
|
||||
mgr.writeZoneHosts(&buf, z)
|
||||
|
||||
// zone alias
|
||||
addrs := mgr.genZoneAddresses(z)
|
||||
zoneName := z.Name
|
||||
|
||||
rr := AddrRecord{
|
||||
Name: mgr.fqdn(zoneName + mgr.suffix),
|
||||
Addr: addrs,
|
||||
}
|
||||
_, _ = rr.WriteTo(&buf)
|
||||
|
||||
// and cache for regions
|
||||
cache[zoneName] = addrs
|
||||
}
|
||||
|
||||
// regions, sorted
|
||||
for _, name := range mgr.genRegionsSorted() {
|
||||
addrs := mgr.genRegionAddressesCached(name, cache)
|
||||
|
||||
mgr.writeRegionAddresses(&buf, name, addrs)
|
||||
}
|
||||
|
||||
return buf.WriteTo(w)
|
||||
}
|
||||
|
||||
func (mgr *Manager) writeZoneHosts(w io.Writer, z *Zone) {
|
||||
_, _ = fmt.Fprintf(w, ";\n; %s\n;\n", z.Name)
|
||||
|
||||
for _, rr := range mgr.genZoneHostRecords(z) {
|
||||
rr.Name = mgr.fqdn(rr.Name)
|
||||
_, _ = rr.WriteTo(w)
|
||||
}
|
||||
}
|
||||
|
||||
func (mgr *Manager) writeRegionAddresses(w io.Writer, name string, addrs []netip.Addr) {
|
||||
_, _ = fmt.Fprintf(w, "; %s\n", name)
|
||||
|
||||
rr := AddrRecord{
|
||||
Name: mgr.fqdn(name + mgr.suffix),
|
||||
Addr: addrs,
|
||||
}
|
||||
|
||||
_, _ = rr.WriteTo(w)
|
||||
}
|
||||
@@ -151,7 +151,7 @@ func (v *intermediateConfig) Export() (*Config, error) {
|
||||
for i := 0; i < peers; i++ {
|
||||
p, err := v.ExportPeer(i)
|
||||
if err != nil {
|
||||
err = core.Wrapf(err, "Peer[%v]:", i)
|
||||
err = core.Wrap(err, "Peer[%v]:", i)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user