From b8aba9e05e00cff5abd5aeb22a66cd4a56e144bd Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 28 Aug 2023 15:44:45 +0100 Subject: [PATCH] WIP Signed-off-by: Alejandro Mery --- go.mod | 1 + go.sum | 2 ++ pkg/ceph/ceph.go | 2 ++ pkg/ceph/config.go | 70 ++++++++++++++++++++++++++++++++++++++++++++++ pkg/zones/ceph.go | 30 ++++++++++++++++++++ pkg/zones/scan.go | 16 +++++++++++ 6 files changed, 121 insertions(+) create mode 100644 pkg/ceph/ceph.go create mode 100644 pkg/ceph/config.go create mode 100644 pkg/zones/ceph.go diff --git a/go.mod b/go.mod index 65e9c3a..596ff94 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf darvaza.org/slog v0.5.2 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/mgechev/revive v1.3.2 github.com/spf13/cobra v1.7.0 diff --git a/go.sum b/go.sum index 0903f1f..1b4e2db 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,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/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= 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/go.mod h1:khQBuCEwGXWakkmq8ZiFUvUZz84ZkJ2KNwKvChs4OrU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/pkg/ceph/ceph.go b/pkg/ceph/ceph.go new file mode 100644 index 0000000..53e1099 --- /dev/null +++ b/pkg/ceph/ceph.go @@ -0,0 +1,2 @@ +// Package ceph deals with ceph config +package ceph diff --git a/pkg/ceph/config.go b/pkg/ceph/config.go new file mode 100644 index 0000000..19c7fe2 --- /dev/null +++ b/pkg/ceph/config.go @@ -0,0 +1,70 @@ +package ceph + +import ( + "bytes" + "io" + "net/netip" + + "github.com/gofrs/uuid/v5" + "gopkg.in/gcfg.v1" +) + +// Config represents a ceph.conf file +type Config struct { + Global GlobalConfig +} + +// WriteTo writes a Wireguard [Config] onto the provided [io.Writer] +func (*Config) WriteTo(w io.Writer) (int64, error) { + var buf bytes.Buffer + + return buf.WriteTo(w) +} + +// GlobalConfig represents the [global] section of a ceph.conf file +type GlobalConfig struct { + FSID uuid.UUID + Monitors []string + MonitorsAddr []netip.Addr +} + +type intermediateConfig struct { + Global intermediateGlobalConfig +} + +func (p intermediateConfig) Export() (*Config, error) { + var out Config + var err error + + // [global] + out.Global, err = p.Global.Export() + if err != nil { + return nil, err + } + + return &out, nil +} + +type intermediateGlobalConfig struct { + FSID uuid.UUID + MonInitialMembers string + MonHost string + ClusterNetwork string +} + +func (intermediateGlobalConfig) Export() (GlobalConfig, error) { + var out GlobalConfig + var err error + + return out, err +} + +func NewConfigFromReader(r io.Reader) (*Config, error) { + var temp intermediateConfig + + if err := gcfg.ReadInto(&temp, r); err != nil { + return nil, err + } + + return temp.Export() +} diff --git a/pkg/zones/ceph.go b/pkg/zones/ceph.go new file mode 100644 index 0000000..550827b --- /dev/null +++ b/pkg/zones/ceph.go @@ -0,0 +1,30 @@ +package zones + +import ( + "bytes" + + "git.jpi.io/amery/jpictl/pkg/ceph" +) + +// GetCephConfig reads the ceph.conf file +func (m *Zones) GetCephConfig() (*ceph.Config, error) { + data, err := m.ReadFile("ceph.conf") + if err != nil { + return nil, err + } + + r := bytes.NewReader(data) + return ceph.NewConfigFromReader(r) +} + +// WriteCephConfig writes the ceph.conf file +func (m *Zones) WriteCephConfig(cfg *ceph.Config) error { + f, err := m.CreateTruncFile("ceph.conf") + if err != nil { + return err + } + defer f.Close() + + _, err = cfg.WriteTo(f) + return err +} diff --git a/pkg/zones/scan.go b/pkg/zones/scan.go index 08734a3..fb60603 100644 --- a/pkg/zones/scan.go +++ b/pkg/zones/scan.go @@ -2,6 +2,8 @@ package zones import ( "io/fs" + "log" + "os" "sort" ) @@ -12,6 +14,7 @@ func (m *Zones) scan(opts *ScanOptions) error { m.scanZoneIDs, m.scanSort, m.scanGateways, + m.scanCephMonitors, } { if err := fn(opts); err != nil { return err @@ -121,6 +124,19 @@ func (m *Zones) scanGateways(_ *ScanOptions) error { return err } +func (m *Zones) scanCephMonitors() error { + cfg, err := m.GetCephConfig() + switch { + case os.IsNotExist(err): + err = nil + case err != nil: + return err + } + + log.Print(cfg) + return nil +} + func (z *Zone) scan() error { // each directory is a machine entries, err := fs.ReadDir(z.zones.dir, z.Name)