Fix #115: cmk ignores the CLI profile arg when loading the cache file (#131)

* Fix problem 1 on issue #115

* Improvements

Author: nvazquez

cmk.go

@@ -86,6 +86,7 @@ func main() {
 	if *profile != "" {
 		cfg.LoadProfile(*profile)
 	}
+	config.LoadCache(cfg)
 
 	if *apiKey != "" && *secretKey != "" {
 		request := cmd.NewRequest(nil, cfg, nil)

config/cache.go

@@ -84,9 +84,7 @@ func LoadCache(c *Config) interface{} {
 	Debug("Trying to read API cache from:", cacheFile)
 	cache, err := ioutil.ReadFile(cacheFile)
 	if err != nil {
-		if c.HasShell {
-			fmt.Fprintf(os.Stderr, "Loaded in-built API cache. Failed to read API cache, please run 'sync'.\n")
-		}
+		fmt.Fprintf(os.Stderr, "Loaded in-built API cache. Failed to read API cache, please run 'sync'.\n")
 		cache = []byte(preCache)
 	}
 	var data map[string]interface{}

config/config.go

@@ -200,7 +200,7 @@ func setActiveProfile(cfg *Config, profile *ServerProfile) {
 	cfg.ActiveProfile.Client = newHTTPClient(cfg)
 }
 
-func reloadConfig(cfg *Config) *Config {
+func reloadConfig(cfg *Config, loadCache bool) *Config {
 	fileLock := flock.New(path.Join(getDefaultConfigDir(), "lock"))
 	err := fileLock.Lock()
 	if err != nil {
@@ -209,7 +209,9 @@ func reloadConfig(cfg *Config) *Config {
 	}
 	cfg = saveConfig(cfg)
 	fileLock.Unlock()
-	LoadCache(cfg)
+	if loadCache {
+		LoadCache(cfg)
+	}
 	return cfg
 }
 
@@ -360,7 +362,7 @@ func (c *Config) UpdateConfig(key string, value string, update bool) {
 	Debug("UpdateConfig key:", key, " value:", value, " update:", update)
 
 	if update {
-		reloadConfig(c)
+		reloadConfig(c, true)
 	}
 }
 
@@ -376,7 +378,6 @@ func NewConfig(configFilePath *string) *Config {
 			os.Exit(1)
 		}
 	}
-	cfg := reloadConfig(defaultConf)
-	LoadCache(cfg)
+	cfg := reloadConfig(defaultConf, false)
 	return cfg
 }