From 0b58cf266b673aca52951de7ae408365f209f770 Mon Sep 17 00:00:00 2001 From: eynopv Date: Sat, 21 Sep 2024 17:46:47 +0300 Subject: [PATCH] refactor: make clear distinction between variables and inputs --- cmd/root.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 312a874..32aa901 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -19,7 +19,7 @@ var ( Version: version, Args: cobra.ExactArgs(1), PersistentPreRunE: func(cmd *cobra.Command, args []string) error { - godotenv.Load(EnvironmentFilePath) + godotenv.Load(EnvironmentFilePathInput) if err := prepareVariables(); err != nil { return err @@ -36,14 +36,13 @@ var ( }, } - VariablesInput []string - HeadersInput []string - EnvironmentFilePath string - ClientConfig client.ClientConfig + VariablesInput []string + HeadersInput []string + EnvironmentFilePathInput string - Variables = map[string]string{} - - Headers = map[string]string{ + ClientConfig client.ClientConfig + Variables = map[string]string{} + Headers = map[string]string{ "user-agent": fmt.Sprintf("lac/%s", version), } ) @@ -51,9 +50,9 @@ var ( func init() { rootCmd.PersistentFlags().StringSliceVar(&VariablesInput, "vars", []string{}, "variables") rootCmd.PersistentFlags().StringSliceVar(&HeadersInput, "headers", []string{}, "headers") + rootCmd.PersistentFlags().StringVar(&EnvironmentFilePathInput, "env", ".env", "environment file") rootCmd.PersistentFlags().IntVarP(&ClientConfig.Timeout, "timeout", "t", 15, "request timeout") rootCmd.PersistentFlags().BoolVar(&ClientConfig.NoRedirects, "no-redirects", false, "do not follow redirects") - rootCmd.PersistentFlags().StringVar(&EnvironmentFilePath, "env", ".env", "environment file") } func Execute() error {