fix(strm.yaml): configuration directory wasn't set yet (#46)

strmprivacy · Aug 19, 2021 · 4023657 · 4023657
1 parent a889b21
commit 4023657
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/cmd/strm/main.go b/cmd/strm/main.go
@@ -33,7 +33,7 @@ import (
 var configPath string
 
 const (
-	apiHostFlag           = "api-host"
+	apiHostFlag = "api-host"
 
 	// The environment variable prefix of all environment variables bound to our command line flags.
 	// For example, --api-host is bound to STRM_API_HOST
@@ -48,6 +48,7 @@ var RootCmd = &cobra.Command{
 	Use:   common.RootCommandName,
 	Short: fmt.Sprintf("Stream Machine CLI %s", cmd.Version),
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		constants.ConfigPath = configPath
 		util.CreateConfigDirAndFileIfNotExists()
 		err := initializeConfig(cmd)
 
@@ -60,7 +61,6 @@ var RootCmd = &cobra.Command{
 			}
 		})
 
-		constants.ConfigPath = configPath
 		auth.SetupClient(util.GetStringAndErr(cmd.Flags(), auth.ApiAuthUrlFlag))
 
 		var billingId = ""

diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go
@@ -16,7 +16,6 @@ import (
 	"streammachine.io/strm/pkg/entity/usage"
 )
 
-
 var GetCmd = &cobra.Command{
 	Use:   constants.GetCommandName,
 	Short: "Get an entity",

diff --git a/pkg/context/cmd.go b/pkg/context/cmd.go
@@ -29,8 +29,7 @@ func Configuration() *cobra.Command {
 		constants.OutputFormatFlag,
 		constants.OutputFormatFlagShort,
 		constants.OutputFormatPlain,
-		fmt.Sprintf("Configuration output format [%v]", constants.ConfigOutputFormatFlagAllowedValues,
-		),
+		fmt.Sprintf("Configuration output format [%v]", constants.ConfigOutputFormatFlagAllowedValues),
 	)
 	err := configuration.RegisterFlagCompletionFunc(constants.OutputFormatFlag, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return constants.ConfigOutputFormatFlagAllowedValues, cobra.ShellCompDirectiveNoFileComp
@@ -59,8 +58,7 @@ func EntityInfo() *cobra.Command {
 		constants.OutputFormatFlag,
 		constants.OutputFormatFlagShort,
 		constants.OutputFormatFilepath,
-		fmt.Sprintf("Entity information output format [%v]", constants.ContextOutputFormatFlagAllowedValues,
-		),
+		fmt.Sprintf("Entity information output format [%v]", constants.ContextOutputFormatFlagAllowedValues),
 	)
 	err := entityInfo.RegisterFlagCompletionFunc(constants.OutputFormatFlag, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return constants.ContextOutputFormatFlagAllowedValues, cobra.ShellCompDirectiveNoFileComp