tfrobot add init function to every subcommand

threefoldtech · Nov 5, 2024 · 62660c5 · 62660c5
1 parent 4ccbc61
commit 62660c5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 34 deletions.
diff --git a/grid-client/deployer/tf_plugin_client.go b/grid-client/deployer/tf_plugin_client.go
@@ -153,6 +153,7 @@ func parsePluginOpts(opts ...PluginOpt) (pluginCfg, error) {
 		relayURLs:     []string{},
 		rmbTimeout:    60, // default rmbTimeout is 60
 		showLogs:      false,
+		noColorLogs:   false,
 		rmbInMemCache: true,
 	}
 

diff --git a/tfrobot/cmd/cancel.go b/tfrobot/cmd/cancel.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 	"github.com/threefoldtech/tfgrid-sdk-go/tfrobot/internal/parser"
 	"github.com/threefoldtech/tfgrid-sdk-go/tfrobot/pkg/deployer"
@@ -26,11 +25,6 @@ var cancelCmd = &cobra.Command{
 			return fmt.Errorf("invalid log debug mode input '%v' with error: %w", debug, err)
 		}
 
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
-		if debug {
-			zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		}
-
 		configPath, err := cmd.Flags().GetString("config")
 		if err != nil {
 			return fmt.Errorf("error in configuration file: %w", err)
@@ -70,3 +64,10 @@ var cancelCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	rootCmd.AddCommand(cancelCmd)
+
+	cancelCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
+	cancelCmd.Flags().StringP("config", "c", "", "path to config file")
+}
diff --git a/tfrobot/cmd/deploy.go b/tfrobot/cmd/deploy.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/threefoldtech/tfgrid-sdk-go/tfrobot/internal/parser"
@@ -36,11 +35,6 @@ var deployCmd = &cobra.Command{
 			return fmt.Errorf("invalid log debug mode input '%v' with error: %w", debug, err)
 		}
 
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
-		if debug {
-			zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		}
-
 		outputPath, err := cmd.Flags().GetString("output")
 		if err != nil {
 			return fmt.Errorf("error in output file: %w", err)
@@ -103,3 +97,11 @@ var deployCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	rootCmd.AddCommand(deployCmd)
+
+	deployCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
+	deployCmd.Flags().StringP("config", "c", "", "path to config file")
+	deployCmd.Flags().StringP("output", "o", "output.yaml", "path to output file")
+}
diff --git a/tfrobot/cmd/load.go b/tfrobot/cmd/load.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/threefoldtech/tfgrid-sdk-go/tfrobot/internal/parser"
@@ -29,10 +28,6 @@ var loadCmd = &cobra.Command{
 		if err != nil {
 			return fmt.Errorf("invalid log debug mode input '%v' with error: %w", debug, err)
 		}
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
-		if debug {
-			zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		}
 
 		outputPath, err := cmd.Flags().GetString("output")
 		if err != nil {
@@ -90,3 +85,11 @@ var loadCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	rootCmd.AddCommand(loadCmd)
+
+	loadCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
+	loadCmd.Flags().StringP("config", "c", "", "path to config file")
+	loadCmd.Flags().StringP("output", "o", "output.yaml", "path to output file")
+}
diff --git a/tfrobot/cmd/root.go b/tfrobot/cmd/root.go
@@ -17,28 +17,13 @@ var rootCmd = &cobra.Command{
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-
-	rootCmd.AddCommand(versionCmd)
-	rootCmd.AddCommand(deployCmd)
-	rootCmd.AddCommand(cancelCmd)
-	rootCmd.AddCommand(loadCmd)
-
 	err := rootCmd.Execute()
 	if err != nil {
 		log.Fatal().Err(err).Send()
 	}
 }
 
 func init() {
-	deployCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
-	deployCmd.Flags().StringP("config", "c", "", "path to config file")
-	deployCmd.Flags().StringP("output", "o", "output.yaml", "path to output file")
-
-	loadCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
-	loadCmd.Flags().StringP("config", "c", "", "path to config file")
-	loadCmd.Flags().StringP("output", "o", "output.yaml", "path to output file")
-
-	cancelCmd.Flags().BoolP("debug", "d", false, "allow debug logs")
-	cancelCmd.Flags().StringP("config", "c", "", "path to config file")
+	zerolog.SetGlobalLevel(zerolog.InfoLevel)
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 }
diff --git a/tfrobot/cmd/version.go b/tfrobot/cmd/version.go
@@ -29,3 +29,7 @@ var versionCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}