Merge pull request #46 from flagship-io/fix/bug-concurrency

Fix/bug concurrency

cmd/configuration/configuration_test.go

@@ -63,6 +63,8 @@ func TestConfigurationListCommand(t *testing.T) {
 
 	err := json.Unmarshal([]byte(output), &testConfigurationList)
 
+	assert.Nil(t, err)
+
 	byt, err := json.Marshal(mockfunction.TestConfiguration)
 
 	assert.Nil(t, err)

cmd/configuration/create.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/flagship-io/flagship/utils/config"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -29,12 +30,12 @@ var createCmd = &cobra.Command{
 		}
 
 		if credentialsFile != "" {
-			conf := config.ReadCredentialsFromFile(credentialsFile)
-			if slices.Contains(existingConfigurationsName, conf.GetString("name")) {
+			config.ReadCredentialsFromFile(credentialsFile)
+			if slices.Contains(existingConfigurationsName, viper.GetString("name")) {
 				fmt.Fprintln(cmd.OutOrStdout(), "Configuration name already exists")
 				return
 			}
-			config.CreateConfigurationFile(conf.GetString("name"), conf.GetString("client_id"), conf.GetString("client_secret"), conf.GetString("account_id"), conf.GetString("account_environment_id"))
+			config.CreateConfigurationFile(viper.GetString("name"), viper.GetString("client_id"), viper.GetString("client_secret"), viper.GetString("account_id"), viper.GetString("account_environment_id"))
 			fmt.Fprintln(cmd.OutOrStdout(), "Configuration created successfully")
 			return
 		}

cmd/configuration/current.go

@@ -23,11 +23,15 @@ var currentCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		var configurationYaml models.ConfigurationYaml
 		var configuration models.Configuration
-
 		var v = viper.New()
+
 		configFilepath := config.SetPathForConfigName(".cli")
 		v.SetConfigFile(configFilepath)
-		v.MergeInConfig()
+
+		err := v.MergeInConfig()
+		if err != nil {
+			log.Fatalf("error occurred: %s", err)
+		}
 
 		configurationName := v.GetString("current_used_configuration")
 

cmd/configuration/delete.go

@@ -4,7 +4,6 @@ Copyright © 2022 Flagship Team [email protected]
 package configuration
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -19,22 +18,14 @@ var deleteCmd = &cobra.Command{
 	Short: "Delete a configuration",
 	Long:  `Delete a configuration`,
 	Run: func(cmd *cobra.Command, args []string) {
-		homeDir, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
-		if _, err := os.Stat(homeDir + "/.flagship/configurations"); errors.Is(err, os.ErrNotExist) {
-			err := os.MkdirAll(homeDir+"/.flagship/configurations", os.ModePerm)
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
+
+		config.CheckFlagshipHomeDirectory()
 
 		if err := os.Remove(config.SetPathForConfigName(ConfigurationName)); err != nil {
 			log.Fatal(err)
 		}
 
 		fmt.Fprintln(cmd.OutOrStdout(), "Configuration deleted successfully")
-		return
 	},
 }
 

cmd/configuration/edit.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/flagship-io/flagship/utils/config"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -39,22 +40,22 @@ var editCmd = &cobra.Command{
 			return
 		}
 
-		conf := config.ReadCredentialsFromFile(config.SetPathForConfigName(ConfigurationName))
+		config.ReadCredentialsFromFile(config.SetPathForConfigName(ConfigurationName))
 
 		if newConfigurationName == "" {
-			newConfigurationName = conf.GetString("name")
+			newConfigurationName = viper.GetString("name")
 		}
 		if ConfigurationClientID == "" {
-			ConfigurationClientID = conf.GetString("client_id")
+			ConfigurationClientID = viper.GetString("client_id")
 		}
 		if ConfigurationClientSecret == "" {
-			ConfigurationClientSecret = conf.GetString("client_secret")
+			ConfigurationClientSecret = viper.GetString("client_secret")
 		}
 		if ConfigurationAccountID == "" {
-			ConfigurationAccountID = conf.GetString("account_id")
+			ConfigurationAccountID = viper.GetString("account_id")
 		}
 		if ConfigurationAccountEnvID == "" {
-			ConfigurationAccountEnvID = conf.GetString("account_environment_id")
+			ConfigurationAccountEnvID = viper.GetString("account_environment_id")
 		}
 
 		if newConfigurationName == "" && ConfigurationClientID == "" && ConfigurationClientSecret == "" && ConfigurationAccountID == "" && ConfigurationAccountEnvID == "" {
@@ -65,7 +66,6 @@ var editCmd = &cobra.Command{
 		config.EditConfigurationFile(ConfigurationName, newConfigurationName, ConfigurationClientID, ConfigurationClientSecret, ConfigurationAccountID, ConfigurationAccountEnvID)
 
 		fmt.Fprintln(cmd.OutOrStdout(), "Configuration edited successfully")
-		return
 	},
 }
 

cmd/configuration/use.go

@@ -53,7 +53,6 @@ var useCmd = &cobra.Command{
 		}
 
 		fmt.Fprintln(cmd.OutOrStdout(), "Configuration selected successfully")
-		return
 	},
 }
 

cmd/root.go

@@ -96,15 +96,17 @@ func initConfig() {
 	if cfgFile != "" {
 		// Use config file from the flag.
 		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		homeDir, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-		// Search config in home directory with name ".flagship" (without extension).
-		viper.SetConfigFile(homeDir + "/.flagship/configurations/.cli.yaml")
 		viper.MergeInConfig()
-		if viper.GetString("current_used_configuration") != "" {
-			config.SelectConfiguration(viper.GetString("current_used_configuration"))
-		}
+		return
 	}
+	// Find home directory.
+	homeDir, err := os.UserHomeDir()
+	cobra.CheckErr(err)
+	// Search config in home directory with name ".flagship" (without extension).
+	viper.SetConfigFile(homeDir + "/.flagship/configurations/.cli.yaml")
+	viper.MergeInConfig()
+	if viper.GetString("current_used_configuration") != "" {
+		config.ReadConfiguration(viper.GetString("current_used_configuration"))
+	}
+
 }