Compare commits

..

7 Commits

Author SHA1 Message Date
amery aa26c93343 build-sys: use local asciigoat.org/ini
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-05 20:43:03 +00:00
amery 9fe7f531f5 vscode: add asciigoat, cyclomatic and Wrapf to the dictionary
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-05 20:43:03 +00:00
amery 51d4748a6f Merge branch 'main' into next-amery 2023-09-05 20:42:51 +00:00
amery e03e5e0d05 Merge pull request 'ceph: generate fsid if needed, and export FSID on env' (#10)
Reviewed-on: #10
2023-09-05 22:13:09 +02:00
amery a655603343 env: export FSID
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-05 19:57:39 +00:00
amery c291b218a4 zones: improve GetCephFSID() to generate a new UUID if none was found
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-05 19:57:39 +00:00
amery 3911a51ccf vscode: add gofrs to the dictionary
as we use "github.com/gofrs/uuid/v5"

Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-05 19:43:27 +00:00
4 changed files with 29 additions and 6 deletions
+1
View File
@@ -4,6 +4,7 @@
"ceph",
"cyclomatic",
"darvaza",
"gofrs",
"jpictl",
"Wrapf",
"zerolog"
+5 -1
View File
@@ -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
},
}
+6 -2
View File
@@ -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
return uuid.Nil, nil
// generate one
v, err := uuid.NewV4()
if err != nil {
return uuid.Nil, err
}
m.CephFSID = v
}
return m.CephFSID, nil
}
+17 -3
View File
@@ -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 {
return &Env{
func (m *Zones) Env(export bool) (*Env, error) {
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