build-sys: use local asciigoat.org/ini

Signed-off-by: Alejandro Mery <amery@jpi.io>
vscode: add special words to the dictionary
2023-09-05 11:29:09 +00:00 · 2023-09-05 11:29:09 +00:00 · 2023-09-05 11:28:35 +00:00 · 2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:22 +00:00
5 changed files with 7 additions and 27 deletions
@@ -5,7 +5,6 @@
        "cyclomatic",
        "darvaza",
        "jpictl",
-        "Wrapf",
-        "zerolog"
+        "Wrapf"
    ]
 }
@@ -7,7 +7,7 @@ replace asciigoat.org/ini => ../../../asciigoat.org/ini
 require (
 	asciigoat.org/ini v0.2.4
 	darvaza.org/core v0.9.8
-	darvaza.org/resolver v0.5.4
+	darvaza.org/resolver v0.5.2
 	darvaza.org/sidecar v0.0.2
 	darvaza.org/slog v0.5.3
 	github.com/burntSushi/toml v0.3.1
@@ -41,7 +41,7 @@ require (
 	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/sys v0.11.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.12.0 // 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=
 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/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=
+darvaza.org/resolver v0.5.2/go.mod h1:fFvsVPEFeMzUIWlLG47Go/6uJYtRLb9R8HIgYg3uaxE=
 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=
@@ -88,8 +88,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 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.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.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=
@@ -4,21 +4,9 @@ import (
 	"bytes"
 	"sort"

-	"darvaza.org/core"
-	"github.com/gofrs/uuid/v5"
-
 	"git.jpi.io/amery/jpictl/pkg/ceph"
 )

-// GetCephFSID returns our Ceph's FSID
-func (m *Zones) GetCephFSID() (uuid.UUID, error) {
-	if core.IsZero(m.CephFSID) {
-		// TODO: generate one
-		return uuid.Nil, nil
-	}
-	return m.CephFSID, nil
-}
-
 // GetCephConfig reads the ceph.conf file
 func (m *Zones) GetCephConfig() (*ceph.Config, error) {
 	data, err := m.ReadFile("ceph.conf")
@@ -6,7 +6,6 @@ import (
 	"sort"

 	"darvaza.org/resolver"
-	"github.com/gofrs/uuid/v5"
 )

 var (
@@ -136,21 +135,15 @@ func (z *Zone) GatewayIDs() ([]int, int) {
 	return out, len(out)
 }

-// revive:disable:line-length-limit
-
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
 	resolver resolver.Resolver
 	domain   string

-	CephFSID uuid.UUID `toml:"ceph_fsid,omitempty" json:"ceph_fsid,omitempty" yaml:"ceph_fsid,omitempty"`
-
 	Zones []*Zone `toml:"zones"`
 }

-// revive:enable:line-length-limit
-
 // ForEachMachine calls a function for each Machine in the cluster
 // until instructed to terminate the loop
 func (m *Zones) ForEachMachine(fn func(*Machine) bool) {
Author	SHA1	Message	Date
amery	1150fbb7ef	build-sys: use local asciigoat.org/ini Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:29:09 +00:00
amery	35a50659bd	vscode: add special words to the dictionary Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:29:09 +00:00
amery	3a1b36070a	Merge branch 'pr-amery-wireguard-ini' into next-amery Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:28:35 +00:00
amery	b0fcf963d6	env: set ceph monitors variables they indicate the ceph monitors on the specified zone * MON{zoneID}_NAME * MON{zoneID}_ID * MON{zoneID}_IP Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	54effed139	zones: extend scan to ensure every zone has a ceph monitor Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	89b32177b2	zones: set Machine.CephMonitor if its referenced as monitor on ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	a9399c8abf	zones: introduce Zone.GetCephMonitors() returning the local ceph monitors and setting one if there is none. non-gateway nodes are preferred when setting a monitor automatically Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	8f36f98da9	zones: introduce Machine.CephMonitor field Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:11 +00:00
amery	e0e2def833	zones: introduce Zones.GetCephConfig() accessor for m/ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 20:29:48 +00:00
amery	bfcd9f26be	ceph: add NewConfigFromReader() and initial ceph.conf parser Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 20:29:23 +00:00
amery	0d8e15c32e	wireguard: switch from gcfg to asciigoat.org/ini/basic Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 19:28:19 +00:00
amery	ecff053a7b	wireguard: implement EndpointAddress.UnmarshalText Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 16:04:13 +00:00
amery	ebfe47a31a	wireguard: implement UnmarshalText for PrivateKey and PublicKey Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 16:01:16 +00:00