build-sys: use local asciigoat.org/ini

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

.vscode/settings.json

@@ -1,8 +1,12 @@
 {
     "cSpell.words": [
+        "asciigoat",
         "ceph",
+        "cyclomatic",
         "darvaza",
+        "gofrs",
         "jpictl",
+        "Wrapf",
         "zerolog"
     ]
 }

cmd/jpictl/env.go

@@ -16,7 +16,11 @@ var envCmd = &cobra.Command{
 			return err
 		}
 
-		_, err = m.Env(*envExport).WriteTo(os.Stdout)
+		env, err := m.Env(*envExport)
+		if err != nil {
+			return err
+		}
+		_, err = env.WriteTo(os.Stdout)
 		return err
 	},
 }

go.mod

@@ -2,6 +2,8 @@ module git.jpi.io/amery/jpictl
 
 go 1.19
 
+replace asciigoat.org/ini => ../../../asciigoat.org/ini
+
 require (
 	asciigoat.org/ini v0.2.5
 	darvaza.org/core v0.9.8

go.sum

@@ -1,7 +1,5 @@
 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/resolver v0.5.4 h1:dlSBNV14yYsp7Kg7ipwYOMNsLbrpeXa8Z0HBTa0Ryxs=

pkg/zones/ceph.go

@@ -14,8 +14,12 @@ import (
 // GetCephFSID returns our Ceph's FSID
 func (m *Zones) GetCephFSID() (uuid.UUID, error) {
 	if core.IsZero(m.CephFSID) {
-		// TODO: generate one
+		// generate one
-		return uuid.Nil, nil
+		v, err := uuid.NewV4()
+		if err != nil {
+			return uuid.Nil, err
+		}
+		m.CephFSID = v
 	}
 	return m.CephFSID, nil
 }

pkg/zones/env.go

@@ -11,15 +11,24 @@ import (
 type Env struct {
 	ZoneIterator
 
-	export bool
+	cephFSID string
+	export   bool
 }
 
 // Env returns a shell environment factory
-func (m *Zones) Env(export bool) *Env {
+func (m *Zones) Env(export bool) (*Env, error) {
-	return &Env{
+	fsid, err := m.GetCephFSID()
+	if err != nil {
+		return nil, err
+	}
+
+	env := &Env{
 		ZoneIterator: m,
+		cephFSID:     fsid.String(),
 		export:       export,
 	}
+
+	return env, nil
 }
 
 // Zones returns the list of Zone IDs
@@ -38,7 +47,12 @@ func (m *Env) Zones() []int {
 func (m *Env) WriteTo(w io.Writer) (int64, error) {
 	var buf bytes.Buffer
 
+	if m.cephFSID != "" {
+		m.writeEnvVar(&buf, m.cephFSID, "FSID")
+	}
+
 	m.writeEnvVarInts(&buf, m.Zones(), "ZONES")
+
 	m.ForEachZone(func(z *Zone) bool {
 		m.writeEnvZone(&buf, z)
 		return false