Remove fx.Supply(params) from system-probe command, fix tests

DataDog · Nov 21, 2023 · dc12159 · dc12159
1 parent c91b2f9
commit dc12159
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/cmd/agent/subcommands/diagnose/command_test.go b/cmd/agent/subcommands/diagnose/command_test.go
@@ -75,8 +75,8 @@ func TestShowMetadataInventoryHostCommand(t *testing.T) {
 		Commands(&command.GlobalParams{}),
 		[]string{"diagnose", "show-metadata", "inventory-host"},
 		printPayload,
-		func(cliParams *cliParams, coreParams core.BundleParams) {
-			require.Equal(t, false, coreParams.ConfigLoadSecrets())
+		func(cliParams *cliParams, coreParams core.BundleParams, secretParams secrets.Params) {
+			require.Equal(t, false, secretParams.Enabled)
 			require.Equal(t, "inventory-host", cliParams.payloadName)
 		})
 }
diff --git a/cmd/agent/subcommands/run/command_windows.go b/cmd/agent/subcommands/run/command_windows.go
@@ -114,8 +114,8 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error
 				hostMetadata,
 				invAgent,
 				invHost,
+				secretResolver,
 			)
-				secretResolver)
 			if err != nil {
 				return err
 			}

diff --git a/cmd/system-probe/subcommands/run/command.go b/cmd/system-probe/subcommands/run/command.go
@@ -29,8 +29,6 @@ import (
 	"github.com/DataDog/datadog-agent/cmd/system-probe/utils"
 	"github.com/DataDog/datadog-agent/comp/core/config"
 	"github.com/DataDog/datadog-agent/comp/core/log"
-	"github.com/DataDog/datadog-agent/comp/core/secrets"
-	"github.com/DataDog/datadog-agent/comp/core/secrets/secretsimpl"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	"github.com/DataDog/datadog-agent/comp/core/telemetry"
@@ -74,13 +72,11 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 				fx.Supply(cliParams),
 				fx.Supply(config.NewAgentParams("", config.WithConfigMissingOK(true))),
 				fx.Supply(sysprobeconfigimpl.NewParams(sysprobeconfigimpl.WithSysProbeConfFilePath(globalParams.ConfFilePath))),
-				fx.Supply(secrets.NewDisabledParams()),
 				fx.Supply(log.ForDaemon("SYS-PROBE", "log_file", common.DefaultLogFile)),
 				config.Module,
 				telemetry.Module,
 				sysprobeconfigimpl.Module,
 				rcclient.Module,
-				secretsimpl.Module,
 				// use system-probe config instead of agent config for logging
 				fx.Provide(func(lc fx.Lifecycle, params log.Params, sysprobeconfig sysprobeconfig.Component) (log.Component, error) {
 					return log.NewLogger(lc, params, sysprobeconfig)

diff --git a/comp/core/config/config.go b/comp/core/config/config.go
@@ -39,7 +39,8 @@ type dependencies struct {
 	fx.In
 
 	Params Params
-	Secret secrets.Component
+	// secrets Component is optional, if not provided, the config will not decrypt secrets
+	Secret secrets.Component `optional:"true"`
 }
 
 func (d dependencies) getParams() *Params {