pkg/ceph: [WIP]

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

pkg/ceph/config.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/gofrs/uuid/v5"
 
-	"asciigoat.org/ini/basic"
+	"asciigoat.org/ini"
 )
 
 // Config represents a ceph.conf file
@@ -62,15 +62,11 @@ func (intermediateGlobalConfig) Export() (GlobalConfig, error) {
 
 // NewConfigFromReader parses the ceph.conf file
 func NewConfigFromReader(r io.Reader) (*Config, error) {
-	doc, err := basic.Decode(r)
+	var temp intermediateConfig
-	if err != nil {
+
+	if err := ini.ReadInto(&temp, r); err != nil {
 		return nil, err
 	}
 
-	cfg, err := newConfigFromDocument(doc)
+	return temp.Export()
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
 }

pkg/wireguard/config.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"text/template"
 
-	"asciigoat.org/ini/basic"
+	"asciigoat.org/ini"
 	"darvaza.org/core"
 )
 
@@ -249,15 +249,11 @@ func (v *intermediateConfig) PeersCount() (int, bool) {
 
 // NewConfigFromReader parses a wgN.conf file
 func NewConfigFromReader(r io.Reader) (*Config, error) {
-	doc, err := basic.Decode(r)
+	temp := &intermediateConfig{}
-	if err != nil {
+
+	if err := ini.ReadInto(temp, r); err != nil {
 		return nil, err
 	}
 
-	cfg, err := newConfigFromDocument(doc)
+	return temp.Export()
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
 }