fix(global): fix global options parsing (#34)

armory-io · Mar 5, 2021 · 122a62a · 122a62a
1 parent 084af37
commit 122a62a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmd/analysis/get.go b/cmd/analysis/get.go
@@ -35,7 +35,7 @@ var getCmd = &cobra.Command{
 	Short: "",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		globals, _ := options.Globals(cmd)
+		globals, _ := options.Globals(cmd.Root())
 
 		kc := kayenta.NewDefaultClient(kayenta.ClientBaseURL(globals.KayentaURL))
 		executionID := args[0]

diff --git a/cmd/root.go b/cmd/root.go
@@ -41,7 +41,8 @@ var rootCmd = &cobra.Command{
 	Short: "",
 	Long:  ``,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := initLogs(verbosity); err != nil {
+		globals, _ := options.Globals(cmd)
+		if err := initLogs(globals.Verbosity); err != nil {
 			return err
 		}
 		return nil
@@ -77,7 +78,6 @@ func Execute() {
 func init() {
 	analysis.Configure(rootCmd)
 	accounts.Configure(rootCmd)
-	rootCmd.AddCommand()
 	// global options are added by an external pacakge so that they can be
 	// managed from a single source and used across all sub-commands. this
 	// ensures that the logic for getting then stays consistent

diff --git a/internal/options/options.go b/internal/options/options.go
@@ -18,7 +18,7 @@ type GlobalOptions struct {
 }
 
 func Globals(cmd *cobra.Command) (*GlobalOptions, error) {
-	flags := cmd.PersistentFlags()
+	flags := cmd.Root().PersistentFlags()
 
 	kayentaURL, _ := flags.GetString("kayenta-url")
 	verbosity, _ := flags.GetString("verbosity")