Update functions that return error to not return pointer

* Matches Golang convention
This commit is contained in:
Eric Meyer
2017-12-04 10:34:49 -06:00
parent f46891f732
commit 486fdc10e4
7 changed files with 24 additions and 24 deletions
+6 -6
View File
@@ -24,12 +24,12 @@ var NewErrConfigFileNotFound = func(environment string) error {
return errors.New(fmt.Sprintf("No configuration found for environment: %v", environment))
}
func NewConfig(environment string) (*Config, error) {
func NewConfig(environment string) (Config, error) {
filenameWithExtension := fmt.Sprintf("%s.toml", environment)
absolutePath := filepath.Join(ProjectRoot(), "environments", filenameWithExtension)
config, err := parseConfigFile(absolutePath)
if err != nil {
return nil, NewErrConfigFileNotFound(environment)
return Config{}, NewErrConfigFileNotFound(environment)
} else {
if !filepath.IsAbs(config.Client.IPCPath) {
config.Client.IPCPath = filepath.Join(ProjectRoot(), config.Client.IPCPath)
@@ -43,16 +43,16 @@ func ProjectRoot() string {
return path.Join(path.Dir(filename), "..", "..")
}
func parseConfigFile(filePath string) (*Config, error) {
func parseConfigFile(filePath string) (Config, error) {
var cfg Config
_, err := os.Stat(filePath)
if err != nil {
return nil, err
return Config{}, err
} else {
_, err := toml.DecodeFile(filePath, &cfg)
if err != nil {
return nil, err
return Config{}, err
}
return &cfg, err
return cfg, err
}
}