From 99ae34e98cda38c564fda48f88c82f035d3c7386 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 23 Oct 2023 20:50:41 +0000 Subject: [PATCH] chore: update darvaza.org/core to v0.10.0 Signed-off-by: Alejandro Mery --- cmd/jpictl/config.go | 2 +- go.mod | 12 ++++++------ go.sum | 26 +++++++++++++------------- pkg/ceph/config_parser.go | 4 ++-- pkg/cluster/machine_rings.go | 6 +++--- pkg/wireguard/config.go | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cmd/jpictl/config.go b/cmd/jpictl/config.go index 3f71211..35c91a7 100644 --- a/cmd/jpictl/config.go +++ b/cmd/jpictl/config.go @@ -42,7 +42,7 @@ func (cfg *Config) LoadZones(resolve bool) (*cluster.Cluster, error) { return zones, nil case !os.IsNotExist(err) || cfg.ConfigFile != DefaultConfigFile: // file was bad - return nil, core.Wrapf(err, "NewFromConfig(%q)", cfg.ConfigFile) + return nil, core.Wrap(err, "NewFromConfig(%q)", cfg.ConfigFile) } // default file doesn't exist. scan instead. diff --git a/go.mod b/go.mod index f6f6f05..453fde1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ 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 @@ -13,10 +13,10 @@ require ( github.com/hack-pad/hackpadfs v0.2.1 github.com/libdns/cloudflare v0.1.0 github.com/libdns/libdns v0.2.1 - github.com/mgechev/revive v1.3.3 + github.com/mgechev/revive v1.3.4 github.com/spf13/cobra v1.7.0 - golang.org/x/crypto v0.12.0 - golang.org/x/net v0.14.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 ) @@ -42,8 +42,8 @@ require ( 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/sys v0.12.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.13.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 3cc377a..29624e1 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -53,8 +53,8 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ 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/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.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= @@ -83,24 +83,24 @@ 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/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.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/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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.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= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= 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/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= diff --git a/pkg/ceph/config_parser.go b/pkg/ceph/config_parser.go index 9428e27..dd3c054 100644 --- a/pkg/ceph/config_parser.go +++ b/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.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)) diff --git a/pkg/cluster/machine_rings.go b/pkg/cluster/machine_rings.go index cffcd4f..f6135d6 100644 --- a/pkg/cluster/machine_rings.go +++ b/pkg/cluster/machine_rings.go @@ -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 { diff --git a/pkg/wireguard/config.go b/pkg/wireguard/config.go index a036b4b..ccdb531 100644 --- a/pkg/wireguard/config.go +++ b/pkg/wireguard/config.go @@ -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 }