diff --git a/app/config/config.go b/app/config/config.go index 3cc3ebc..091edd9 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -1,13 +1,10 @@ package config import ( - "os" "time" "github.com/eosswedenorg/thalos/app/log" - "gopkg.in/yaml.v3" - shipclient "github.com/eosswedenorg-go/antelope-ship-client" ) @@ -65,32 +62,3 @@ func New() Config { }, } } - -func (ship *ShipConfig) UnmarshalYAML(value *yaml.Node) error { - var err error - - if value.Kind == yaml.ScalarNode { - ship.Url = value.Value - } else { - type ShipConfigRaw ShipConfig - raw := ShipConfigRaw(*ship) - if err = value.Decode(&raw); err == nil { - *ship = ShipConfig(raw) - } - } - - return err -} - -func (cfg *Config) ReadYAML(data []byte) error { - return yaml.Unmarshal(data, cfg) -} - -func (cfg *Config) ReadFile(filename string) error { - bytes, err := os.ReadFile(filename) - if err != nil { - return err - } - - return cfg.ReadYAML(bytes) -} diff --git a/app/config/file.go b/app/config/file.go new file mode 100644 index 0000000..b1b4863 --- /dev/null +++ b/app/config/file.go @@ -0,0 +1,14 @@ +package config + +import ( + "os" +) + +func (cfg *Config) ReadFile(filename string) error { + bytes, err := os.ReadFile(filename) + if err != nil { + return err + } + + return cfg.ReadYAML(bytes) +} diff --git a/app/config/yaml.go b/app/config/yaml.go new file mode 100644 index 0000000..b1d7db8 --- /dev/null +++ b/app/config/yaml.go @@ -0,0 +1,25 @@ +package config + +import ( + "gopkg.in/yaml.v3" +) + +func (ship *ShipConfig) UnmarshalYAML(value *yaml.Node) error { + var err error + + if value.Kind == yaml.ScalarNode { + ship.Url = value.Value + } else { + type ShipConfigRaw ShipConfig + raw := ShipConfigRaw(*ship) + if err = value.Decode(&raw); err == nil { + *ship = ShipConfig(raw) + } + } + + return err +} + +func (cfg *Config) ReadYAML(data []byte) error { + return yaml.Unmarshal(data, cfg) +}