Merge pull request #8 from observeinc/alew/update-config-path

Update default config path

.goreleaser.yaml

@@ -65,7 +65,7 @@ nfpms:
     # Your app's homepage.
     homepage: https://observeinc.com/
 
-    maintainer: Konstantin Tikhonov <konstantin.tikhonov@observeinc.com>
+    maintainer: Alex Lew <alex.lew@observeinc.com>
 
     description: |-
       Observe agent.

cmd/config/confighandler.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"runtime"
 
 	"observe/agent/cmd/connections"
 
@@ -61,3 +62,16 @@ func GetOverrideConfigFile(sub *viper.Viper) (string, error) {
 	}
 	return f.Name(), nil
 }
+
+func GetDefaultConfigFolder() string {
+	switch os := runtime.GOOS; os {
+	case "darwin":
+		return "$HOME"
+	case "windows":
+		return "%PROGRAMDATA%\\observe-agent\\config"
+	case "linux":
+		return "/etc/observe-agent"
+	default:
+		return "/etc/observe-agent"
+	}
+}

cmd/root.go

@@ -5,6 +5,7 @@ package cmd
 
 import (
 	"fmt"
+	"observe/agent/cmd/config"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -44,7 +45,7 @@ func init() {
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
 
-	RootCmd.PersistentFlags().StringVar(&CfgFile, "config", "", "config file (default is $HOME/.observe-agent.yaml)")
+	RootCmd.PersistentFlags().StringVar(&CfgFile, "config", "", "config file path")
 
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
@@ -57,14 +58,10 @@ func InitConfig() {
 		// Use config file from the flag.
 		viper.SetConfigFile(CfgFile)
 	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
 		// Search config in home directory with name ".observe-agent" (without extension).
-		viper.AddConfigPath(home)
+		viper.AddConfigPath(config.GetDefaultConfigFolder())
 		viper.SetConfigType("yaml")
-		viper.SetConfigName(".observe-agent")
+		viper.SetConfigName("observe-agent")
 	}
 
 	viper.AutomaticEnv() // read in environment variables that match