From 758a0bd68c338d0b3986b259dc68f216d59aa130 Mon Sep 17 00:00:00 2001
From: Isaac Aymerich <isaac.aymerich@gmail.com>
Date: Thu, 17 Jun 2021 16:50:45 +0200
Subject: [PATCH] FEAT: toscactl can read config from /etc/tosca configfile
 renamed from tosca.yml to config.yml

---
 client/src/go/toscactl/cli/root.go             | 15 +++++++++++----
 client/src/go/toscactl/entity/configuration.go |  4 ++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/src/go/toscactl/cli/root.go b/client/src/go/toscactl/cli/root.go
index 423015a..338e216 100644
--- a/client/src/go/toscactl/cli/root.go
+++ b/client/src/go/toscactl/cli/root.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"toscactl/entity"
 
 )
@@ -17,7 +18,7 @@ import (
 var (
 	cfgFile string
 	Verbose bool
-	appConfig *entity.ApplicationConfig
+	appConfig = &entity.ApplicationConfig{}
 	RootCmd = &cobra.Command{
 		Use:   "toscactl",
 		Long: `This application Allow you to manage Tosca remotely`,
@@ -49,7 +50,7 @@ func initConfig() {
 		log.Fatal(err)
 	}
 
-	viper.SetConfigName("tosca") // name of config file (without extension)
+	viper.SetConfigName("config") // name of config file (without extension)
 	if cfgFile != "" {                         // enable ability to specify config file via flag
 		log.Debug("cfgFile: ", cfgFile)
 		viper.SetConfigFile(cfgFile)
@@ -60,10 +61,15 @@ func initConfig() {
 	}
 
 	viper.AddConfigPath(dir)
-	viper.AddConfigPath(".")
-	viper.AddConfigPath("$HOME")
+	if runtime.GOOS != "windows" {
+		viper.AddConfigPath("/etc/tosca")
+	}else{
+		viper.AddConfigPath("C:\\Program Files\\Tricentis\\Tosca\\")
+	}
+	viper.AddConfigPath("$HOME/.tosca")
 	viper.AutomaticEnv() // read in environment variables that match
 	viper.SetEnvPrefix("tosca")
+	viper.AddConfigPath(".")
 	viper.BindPFlags(RootCmd.PersistentFlags())
 
 
@@ -71,6 +77,7 @@ func initConfig() {
 	if err := viper.ReadInConfig(); err == nil {
 		log.Infof("Using config file: %s", viper.ConfigFileUsed())
 	}
+	appConfig.Initialize()
 	if err:=viper.Unmarshal(&appConfig); err!=nil{
 		log.Errorf("Error when unmarshalling configuration %v",err)
 		os.Exit(1)
diff --git a/client/src/go/toscactl/entity/configuration.go b/client/src/go/toscactl/entity/configuration.go
index 6fab374..7576be9 100644
--- a/client/src/go/toscactl/entity/configuration.go
+++ b/client/src/go/toscactl/entity/configuration.go
@@ -18,6 +18,10 @@ type ApplicationConfig struct {
 	TestTimeout     time.Duration
 }
 
+func (a *ApplicationConfig) Initialize() {
+	a.TestTimeout = 30*time.Minute
+}
+
 
 func (i *StringArray) String() string {
 	return ""