Extract magic strings into command.* constants

DataDog · Jan 16, 2023 · c548704 · c548704
1 parent a6ad999
commit c548704
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/cmd/cluster-agent/command/command.go b/cmd/cluster-agent/command/command.go
@@ -17,6 +17,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	LoggerName      = "CLUSTER"
+	DefaultLogLevel = "off"
+)
+
 // GlobalParams contains the values of agent-global Cobra flags.
 //
 // A pointer to this type is passed to SubcommandFactory's, but its contents

diff --git a/cmd/cluster-agent/subcommands/check/command.go b/cmd/cluster-agent/subcommands/check/command.go
@@ -16,15 +16,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const loggerName = "CLUSTER"
-
 // Commands returns a slice of subcommands for the 'cluster-agent' command.
 func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	cmd := check.MakeCommand(func() check.GlobalParams {
 		return check.GlobalParams{
 			ConfFilePath: globalParams.ConfFilePath,
 			ConfigName:   "datadog-cluster",
-			LoggerName:   loggerName,
+			LoggerName:   command.LoggerName,
 		}
 	})
 

diff --git a/cmd/cluster-agent/subcommands/compliance/command.go b/cmd/cluster-agent/subcommands/compliance/command.go
@@ -7,7 +7,7 @@
 // +build !windows,kubeapiserver
 
 // Package compliance implements 'cluster-agent compliance'.
-package version
+package compliance
 
 import (
 	"github.com/spf13/cobra"
@@ -28,7 +28,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 
 	bundleParams := core.BundleParams{
 		ConfigParams: config.NewClusterAgentParams(""),
-		LogParams:    log.LogForOneShot("CLUSTER", "off", true),
+		LogParams:    log.LogForOneShot(command.LoggerName, command.DefaultLogLevel, true),
 	}
 
 	// TODO: The SecAgent Check package should be a component

diff --git a/cmd/cluster-agent/subcommands/config/command.go b/cmd/cluster-agent/subcommands/config/command.go
@@ -22,15 +22,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const loggerName = "CLUSTER"
-
 // Commands returns a slice of subcommands for the 'cluster-agent' command.
 func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	cmd := config.MakeCommand(func() config.GlobalParams {
 		return config.GlobalParams{
 			ConfFilePath:   globalParams.ConfFilePath,
 			ConfigName:     "datadog-cluster",
-			LoggerName:     loggerName,
+			LoggerName:     command.LoggerName,
 			SettingsClient: newSettingsClient,
 		}
 	})

diff --git a/cmd/cluster-agent/subcommands/flare/command.go b/cmd/cluster-agent/subcommands/flare/command.go
@@ -60,7 +60,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 				fx.Supply(cliParams),
 				fx.Supply(core.BundleParams{
 					ConfigParams: config.NewClusterAgentParams(globalParams.ConfFilePath, config.WithConfigLoadSecrets(true)),
-					LogParams:    log.LogForOneShot("CLUSTER", "off", true),
+					LogParams:    log.LogForOneShot(command.LoggerName, command.DefaultLogLevel, true),
 				}),
 				core.Bundle,
 			)

diff --git a/cmd/cluster-agent/subcommands/health/command.go b/cmd/cluster-agent/subcommands/health/command.go
@@ -22,7 +22,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 		return health.GlobalParams{
 			ConfFilePath: globalParams.ConfFilePath,
 			ConfigName:   "datadog-cluster",
-			LoggerName:   "CLUSTER",
+			LoggerName:   command.LoggerName,
 		}
 	})
 

diff --git a/cmd/cluster-agent/subcommands/start/command.go b/cmd/cluster-agent/subcommands/start/command.go
@@ -64,8 +64,6 @@ import (
 	"k8s.io/client-go/tools/record"
 )
 
-const loggerName = "CLUSTER"
-
 // Commands returns a slice of subcommands for the 'cluster-agent' command.
 func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	startCmd := &cobra.Command{
@@ -80,7 +78,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 				fx.Supply(globalParams),
 				fx.Supply(core.BundleParams{
 					ConfigParams: config.NewClusterAgentParams(globalParams.ConfFilePath, config.WithConfigLoadSecrets(true)),
-					LogParams:    log.LogForDaemon(loggerName, "log_file", common.DefaultDCALogFile),
+					LogParams:    log.LogForDaemon(command.LoggerName, "log_file", common.DefaultDCALogFile),
 				}),
 				core.Bundle,
 			)