From 5eb722ff0fd39aa14b390994504fe10f72daf93c Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Thu, 2 Nov 2023 10:40:28 -0700 Subject: [PATCH] move default into separate file --- default.go | 69 +++++++++++++++++++++++++++++++++++++++++++++ env.go | 83 ++++++------------------------------------------------ 2 files changed, 78 insertions(+), 74 deletions(-) create mode 100644 default.go diff --git a/default.go b/default.go new file mode 100644 index 0000000..7550063 --- /dev/null +++ b/default.go @@ -0,0 +1,69 @@ +package config + +import "time" + +var defaultConfigManager = NewConfigManager(true) + +func GetIntSlice(key string) []int { + return defaultConfigManager.GetIntSlice(key) +} + +func ReadInConfig() error { + return defaultConfigManager.ReadInConfig() +} + +func SetConfigFile(file string) { + defaultConfigManager.SetConfigFile(file) +} + +func SetConfigName(name string) { + defaultConfigManager.SetConfigName(name) +} + +func GetInt(key string) int { + return defaultConfigManager.GetInt(key) +} + +func SetEnvPrefix(prefix string) { + defaultConfigManager.SetEnvPrefix(prefix) +} + +func SetConfigType(configType string) error { + return defaultConfigManager.SetConfigType(configType) +} + +func SetDefault(key string, value any) { + defaultConfigManager.SetDefault(key, value) +} + +func Set(key string, value any) { + defaultConfigManager.Set(key, value) +} + +func WriteConfig() { + defaultConfigManager.WriteConfig() +} + +func ConfigFileUsed() string { + return defaultConfigManager.ConfigFileUsed() +} + +func GetBool(key string) bool { + return defaultConfigManager.GetBool(key) +} + +func GetDuration(key string) time.Duration { + return defaultConfigManager.GetDuration(key) +} + +func GetString(key string) string { + return defaultConfigManager.GetString(key) +} + +func GetStringMap(key string) map[string]any { + return defaultConfigManager.GetStringMap(key) +} + +func GetStringSlice(key string) []string { + return defaultConfigManager.GetStringSlice(key) +} diff --git a/env.go b/env.go index a06c93c..6534dc8 100644 --- a/env.go +++ b/env.go @@ -27,7 +27,6 @@ type ConfigManager struct { var ( ErrConfigFileNotFound = errors.New("config File Not Found") - defaultConfigManager = NewConfigManager(true) ) func NewConfigManager(automaticEnv bool) *ConfigManager { @@ -54,82 +53,27 @@ func (c *ConfigManager) ConfigFileUsed() string { return c.configFileUsed } -func ConfigFileUsed() string { - return defaultConfigManager.ConfigFileUsed() +func (c *ConfigManager) WriteConfig() { } func (c *ConfigManager) GetBool(key string) bool { } -func GetBool(key string) bool { - return defaultConfigManager.GetBool(key) -} - func (c *ConfigManager) GetDuration(key string) time.Duration { } -func GetDuration(key string) time.Duration { - return defaultConfigManager.GetDuration(key) -} - func (c *ConfigManager) GetString(key string) string { } -func GetString(key string) string { - return defaultConfigManager.GetString(key) -} - func (c *ConfigManager) GetStringMap(key string) map[string]any { } -func GetStringMap(key string) map[string]any { - return defaultConfigManager.GetStringMap(key) -} - func (c *ConfigManager) GetStringSlice(key string) []string { } -func GetStringSlice(key string) []string { - return defaultConfigManager.GetStringSlice(key) -} - func (c *ConfigManager) GetInt(key string) int { } -func GetInt(key string) int { - return defaultConfigManager.GetInt(key) -} - -func (c *ConfigManager) GetIntSlice(key string) []int { -} - -func GetIntSlice(key string) []int { - return defaultConfigManager.GetIntSlice(key) -} - -func (c *ConfigManager) ReadInConfig() error { - return nil -} - -func ReadInConfig() error { - return defaultConfigManager.ReadInConfig() -} - -func (c *ConfigManager) SetConfigFile(file string) { - c.configFileUsed = file -} - -func SetConfigFile(file string) { - defaultConfigManager.SetConfigFile(file) -} - -func (c *ConfigManager) SetConfigName(name string) { -} - -func SetConfigName(name string) { - defaultConfigManager.SetConfigName(name) -} - func (c *ConfigManager) SetConfigType(configType string) error { switch configType { case "toml": @@ -144,34 +88,25 @@ func (c *ConfigManager) SetConfigType(configType string) error { return nil } -func SetConfigType(configType string) error { - return defaultConfigManager.SetConfigType(configType) -} - func (c *ConfigManager) SetDefault(key string, value any) { } -func SetDefault(key string, value any) { - defaultConfigManager.SetDefault(key, value) -} - func (c *ConfigManager) SetEnvPrefix(prefix string) { } -func SetEnvPrefix(prefix string) { - defaultConfigManager.SetEnvPrefix(prefix) -} - func (c *ConfigManager) Set(key string, value any) { } -func Set(key string, value any) { - defaultConfigManager.Set(key, value) +func (c *ConfigManager) GetIntSlice(key string) []int { } -func (c *ConfigManager) WriteConfig() { +func (c *ConfigManager) ReadInConfig() error { + return nil } -func WriteConfig() { - defaultConfigManager.WriteConfig() +func (c *ConfigManager) SetConfigName(name string) { +} + +func (c *ConfigManager) SetConfigFile(file string) { + c.configFileUsed = file }