address comment

Author: embeaken

cmd/privateactionrunner/subcommands/ensureenrollment/BUILD.bazel

@@ -14,7 +14,7 @@ go_library(
         "//comp/core/hostname",
         "//comp/core/hostname/hostnameimpl",
         "//comp/core/log/def",
-        "//pkg/config/setup",
+        "//comp/privateactionrunner/def",
         "//pkg/privateactionrunner/enrollment",
         "//pkg/privateactionrunner/util",
         "//pkg/util/fxutil",

cmd/privateactionrunner/subcommands/ensureenrollment/command.go

@@ -22,7 +22,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/hostname"
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameimpl"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
-	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
+	par "github.com/DataDog/datadog-agent/comp/privateactionrunner/def"
 	"github.com/DataDog/datadog-agent/pkg/privateactionrunner/enrollment"
 	parutil "github.com/DataDog/datadog-agent/pkg/privateactionrunner/util"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
@@ -57,7 +57,7 @@ func run(logger log.Component, cfg config.Component, hostnameComp hostname.Compo
 }
 
 func ensureEnrollment(ctx context.Context, logger log.Component, cfg config.Component, hostnameComp hostname.Component, enrollAndPersist enrollAndPersistFunc) error {
-	if !cfg.GetBool(pkgconfigsetup.PAREnabled) {
+	if !cfg.GetBool(par.PAREnabled) {
 		return errors.New("private_action_runner.enabled is false - set it to true before ensuring enrollment")
 	}
 
@@ -88,8 +88,8 @@ func ensureEnrollment(ctx context.Context, logger log.Component, cfg config.Comp
 		}
 	}
 
-	configuredURN := cfg.GetString(pkgconfigsetup.PARUrn)
-	configuredPrivateKey := cfg.GetString(pkgconfigsetup.PARPrivateKey)
+	configuredURN := cfg.GetString(par.PARUrn)
+	configuredPrivateKey := cfg.GetString(par.PARPrivateKey)
 	if err := validateConfiguredIdentity(configuredURN, configuredPrivateKey); err != nil {
 		return err
 	}
@@ -105,7 +105,7 @@ func ensureEnrollment(ctx context.Context, logger log.Component, cfg config.Comp
 		return nil
 	}
 
-	if !cfg.GetBool(pkgconfigsetup.PARSelfEnroll) {
+	if !cfg.GetBool(par.PARSelfEnroll) {
 		return errors.New("no valid Private Action Runner identity is available and private_action_runner.self_enroll is false; configure a URN and private key or enable self-enrollment")
 	}