From fd005e1b770b071eaa137877d9fe7a5845670de9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 17 Jun 2024 11:01:20 +0300 Subject: add EDITOR client config, plus a bit refactor of the config env handling --- internal/config/client/client.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'internal/config/client/client.go') diff --git a/internal/config/client/client.go b/internal/config/client/client.go index 9329759..65dd246 100644 --- a/internal/config/client/client.go +++ b/internal/config/client/client.go @@ -8,13 +8,16 @@ import ( type ClientConfig struct { Server string `json:"Partner,omitempty"` - ApiKey string `json:"ApiKey,omitempty"` + APIKey string `json:"APIKey,omitempty"` + Editor string `json:"Editor,omitempty"` } func New(configFile string) (ClientConfig, error) { conf, _ := config.FromFile[ClientConfig](configFile) - conf.Server = config.FromENV("Servers", conf.Server) - conf.ApiKey = config.FromENV("ApiKey", conf.ApiKey) + // TODO: Refactor + conf.Server = config.FromENV("GOS_SERVERS", conf.Server) + conf.APIKey = config.FromENV("GOS_API_KEY", conf.APIKey) + conf.Editor = config.FromENV("GOS_EDITOR", "EDITOR", conf.Editor, "vi") return conf, nil } -- cgit v1.2.3