ceph: add NewConfigFromReader() and initial ceph.conf parser
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
@@ -3,11 +3,13 @@ module git.jpi.io/amery/jpictl
|
|||||||
go 1.19
|
go 1.19
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
asciigoat.org/ini v0.2.4
|
||||||
darvaza.org/core v0.9.5
|
darvaza.org/core v0.9.5
|
||||||
darvaza.org/resolver v0.5.2
|
darvaza.org/resolver v0.5.2
|
||||||
darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
|
darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
|
||||||
darvaza.org/slog v0.5.2
|
darvaza.org/slog v0.5.2
|
||||||
github.com/burntSushi/toml v0.3.1
|
github.com/burntSushi/toml v0.3.1
|
||||||
|
github.com/gofrs/uuid/v5 v5.0.0
|
||||||
github.com/hack-pad/hackpadfs v0.2.1
|
github.com/hack-pad/hackpadfs v0.2.1
|
||||||
github.com/mgechev/revive v1.3.3
|
github.com/mgechev/revive v1.3.3
|
||||||
github.com/spf13/cobra v1.7.0
|
github.com/spf13/cobra v1.7.0
|
||||||
@@ -17,6 +19,7 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
asciigoat.org/core v0.3.9 // indirect
|
||||||
darvaza.org/slog/handlers/filter v0.4.4 // indirect
|
darvaza.org/slog/handlers/filter v0.4.4 // indirect
|
||||||
darvaza.org/slog/handlers/zerolog v0.4.4 // indirect
|
darvaza.org/slog/handlers/zerolog v0.4.4 // indirect
|
||||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
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.4 h1:fTswCCBle65kTq9AuyN7q7RjYJ5sVTxi9zCAKWSbP6A=
|
||||||
|
asciigoat.org/ini v0.2.4/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
|
||||||
darvaza.org/core v0.9.5 h1:sS5pZFwicaxJIQixEiqkMr9GknVHYL+EbKDMkR/4jDM=
|
darvaza.org/core v0.9.5 h1:sS5pZFwicaxJIQixEiqkMr9GknVHYL+EbKDMkR/4jDM=
|
||||||
darvaza.org/core v0.9.5/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
|
darvaza.org/core v0.9.5/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
|
||||||
darvaza.org/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=
|
darvaza.org/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=
|
||||||
@@ -26,6 +30,8 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD
|
|||||||
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
||||||
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
|
github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
|
||||||
|
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||||
github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMIxMw=
|
github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMIxMw=
|
||||||
github.com/hack-pad/hackpadfs v0.2.1/go.mod h1:khQBuCEwGXWakkmq8ZiFUvUZz84ZkJ2KNwKvChs4OrU=
|
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 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
// Package ceph deals with ceph config
|
||||||
|
package ceph
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package ceph
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/netip"
|
||||||
|
|
||||||
|
"github.com/gofrs/uuid/v5"
|
||||||
|
|
||||||
|
"asciigoat.org/ini/basic"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config represents a ceph.conf file
|
||||||
|
type Config struct {
|
||||||
|
Global GlobalConfig `ini:"global"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GlobalConfig represents the [global] section of a ceph.conf file
|
||||||
|
type GlobalConfig struct {
|
||||||
|
FSID uuid.UUID `ini:"fsid"`
|
||||||
|
Monitors []string `ini:"mon_host,comma"`
|
||||||
|
MonitorsAddr []netip.Addr `ini:"mon_initial_members,comma"`
|
||||||
|
ClusterNetwork netip.Prefix `ini:"cluster_network"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConfigFromReader parses the ceph.conf file
|
||||||
|
func NewConfigFromReader(r io.Reader) (*Config, error) {
|
||||||
|
doc, err := basic.Decode(r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg, err := newConfigFromDocument(doc)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package ceph
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io/fs"
|
||||||
|
"net/netip"
|
||||||
|
|
||||||
|
"asciigoat.org/ini/basic"
|
||||||
|
"asciigoat.org/ini/parser"
|
||||||
|
|
||||||
|
"darvaza.org/core"
|
||||||
|
)
|
||||||
|
|
||||||
|
var sectionMap = map[string]func(*Config, *basic.Section) error{
|
||||||
|
"global": loadGlobalConfSection,
|
||||||
|
}
|
||||||
|
|
||||||
|
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 h(out, src)
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadGlobalConfSection(out *Config, src *basic.Section) error {
|
||||||
|
var cfg GlobalConfig
|
||||||
|
|
||||||
|
for _, field := range src.Fields {
|
||||||
|
if err := loadGlobalConfField(&cfg, field); err != nil {
|
||||||
|
return core.Wrap(err, "global")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
out.Global = cfg
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// revive:disable:cyclomatic
|
||||||
|
// revive:disable:cognitive-complexity
|
||||||
|
|
||||||
|
func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
|
||||||
|
// revive:enable:cyclomatic
|
||||||
|
// revive:enable:cognitive-complexity
|
||||||
|
|
||||||
|
switch field.Key {
|
||||||
|
case "fsid":
|
||||||
|
if !core.IsZero(cfg.FSID) {
|
||||||
|
return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := cfg.FSID.UnmarshalText([]byte(field.Value))
|
||||||
|
switch {
|
||||||
|
case err != nil:
|
||||||
|
return core.Wrap(err, field.Key)
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
case "mon_host":
|
||||||
|
entries, _ := parser.SplitCommaArray(field.Value)
|
||||||
|
for _, s := range entries {
|
||||||
|
var addr netip.Addr
|
||||||
|
|
||||||
|
if err := addr.UnmarshalText([]byte(s)); err != nil {
|
||||||
|
return core.Wrap(err, field.Key)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.MonitorsAddr = append(cfg.MonitorsAddr, addr)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
case "mon_initial_members":
|
||||||
|
entries, _ := parser.SplitCommaArray(field.Value)
|
||||||
|
cfg.Monitors = append(cfg.Monitors, entries...)
|
||||||
|
return nil
|
||||||
|
case "cluster_network":
|
||||||
|
if !core.IsZero(cfg.ClusterNetwork) {
|
||||||
|
err := core.Wrap(fs.ErrInvalid, "fields before the first section")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err := cfg.ClusterNetwork.UnmarshalText([]byte(field.Value))
|
||||||
|
switch {
|
||||||
|
case err != nil:
|
||||||
|
return core.Wrap(err, field.Key)
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newConfigFromDocument(doc *basic.Document) (*Config, error) {
|
||||||
|
var out Config
|
||||||
|
|
||||||
|
if len(doc.Global) > 0 {
|
||||||
|
err := core.Wrap(fs.ErrInvalid, "fields before the first section")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range doc.Sections {
|
||||||
|
src := &doc.Sections[i]
|
||||||
|
if err := loadConfSection(&out, src); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &out, nil
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user