Move ComponentsModifies to the component package

Author: swiatekm

internal/pkg/agent/application/application.go

@@ -171,7 +171,7 @@ func New(
 
 	var configMgr coordinator.ConfigManager
 	var managed *managedConfigManager
-	var compModifiers = []coordinator.ComponentsModifier{InjectAPMConfig}
+	var compModifiers = []component.ComponentsModifier{InjectAPMConfig}
 	var composableManaged bool
 	var isManaged bool
 	var actionAcker acker.Acker

internal/pkg/agent/application/coordinator/coordinator.go

@@ -224,10 +224,6 @@ type VarsManager interface {
 	Watch() <-chan []*transpiler.Vars
 }
 
-// ComponentsModifier is a function that takes the computed components model and modifies it before
-// passing it into the components runtime manager.
-type ComponentsModifier func(comps []component.Component, cfg map[string]interface{}) ([]component.Component, error)
-
 // managerShutdownTimeout is how long the coordinator will wait during shutdown
 // to receive termination states from its managers.
 // Note: The current timeout (5s) is shorter than the default stop timeout for
@@ -267,7 +263,7 @@ type Coordinator struct {
 	otelCfg *confmap.Conf
 
 	caps      capabilities.Capabilities
-	modifiers []ComponentsModifier
+	modifiers []component.ComponentsModifier
 
 	// The current state of the Coordinator. This value and its subfields are
 	// safe to read directly from within the main Coordinator goroutine.
@@ -439,7 +435,7 @@ func New(
 	otelMgr OTelManager,
 	fleetAcker acker.Acker,
 	initialUpgradeDetails *details.Details,
-	modifiers ...ComponentsModifier,
+	modifiers ...component.ComponentsModifier,
 ) *Coordinator {
 	var fleetState cproto.State
 	var fleetMessage string

internal/pkg/agent/application/endpoint_component_modifier.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/elastic/elastic-agent-client/v7/pkg/client"
 	"github.com/elastic/elastic-agent-libs/transport/tlscommon"
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/coordinator"
 	"github.com/elastic/elastic-agent/pkg/component"
 	"github.com/elastic/elastic-agent/pkg/core/logger"
 )
@@ -50,7 +49,7 @@ func (tlsCache) MakeKey(keyPassPath, certPath, keyPath string) string {
 //	    "revision": 1,
 //	    "type": "endpoint"
 //	}
-func EndpointSignedComponentModifier() coordinator.ComponentsModifier {
+func EndpointSignedComponentModifier() component.ComponentsModifier {
 	return func(comps []component.Component, cfg map[string]interface{}) ([]component.Component, error) {
 		const signedKey = "signed"
 
@@ -83,7 +82,7 @@ func EndpointSignedComponentModifier() coordinator.ComponentsModifier {
 // 'key_passphrase_path'.
 // It does so, ONLY for the client TLS configuration for mTLS used with
 // fleet-server.
-func EndpointTLSComponentModifier(log *logger.Logger) coordinator.ComponentsModifier {
+func EndpointTLSComponentModifier(log *logger.Logger) component.ComponentsModifier {
 	return newEndpointTLSComponentModifier(log, &tlsCache{mu: &sync.Mutex{}})
 }
 

internal/pkg/agent/application/fleet_server_bootstrap.go

@@ -50,7 +50,7 @@ var injectFleetServerInput = config.MustNewConfigFrom(map[string]interface{}{
 
 // FleetServerComponentModifier modifies the comps to inject extra information from the policy into
 // the Fleet Server component and units needed to run Fleet Server correctly.
-func FleetServerComponentModifier(serverCfg *configuration.FleetServerConfig) coordinator.ComponentsModifier {
+func FleetServerComponentModifier(serverCfg *configuration.FleetServerConfig) component.ComponentsModifier {
 	return func(comps []component.Component, _ map[string]interface{}) ([]component.Component, error) {
 		for i, comp := range comps {
 			if comp.InputSpec != nil && comp.InputSpec.InputType == fleetServer && comp.Err == nil {
@@ -118,7 +118,7 @@ func addBootstrapCfg(dst map[string]interface{}, es *configuration.Elasticsearch
 
 // InjectFleetConfigComponentModifier The modifier that injects the fleet configuration for the components
 // that need to be able to connect to fleet server.
-func InjectFleetConfigComponentModifier(fleetCfg *configuration.FleetAgentConfig, agentInfo info.Agent) coordinator.ComponentsModifier {
+func InjectFleetConfigComponentModifier(fleetCfg *configuration.FleetAgentConfig, agentInfo info.Agent) component.ComponentsModifier {
 	return func(comps []component.Component, cfg map[string]interface{}) ([]component.Component, error) {
 		hostsStr := fleetCfg.Client.GetHosts()
 		fleetHosts := make([]interface{}, 0, len(hostsStr))

internal/pkg/agent/application/inject_proxy_component_modifier.go

@@ -10,7 +10,6 @@ import (
 	"golang.org/x/net/http/httpproxy"
 
 	"github.com/elastic/elastic-agent-client/v7/pkg/client"
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/coordinator"
 	"github.com/elastic/elastic-agent/pkg/component"
 )
 
@@ -20,7 +19,7 @@ import (
 // The URL used is the HTTPS_PROXY env var. If that's not set the HTTP_PROXY env var is used.
 // If there are no env vars set, or the unit's config has `proxy_disable: true`, nothing is injected
 // If the output config has `proxy_url: ""`, it will not be overwritten.
-func InjectProxyEndpointModifier() coordinator.ComponentsModifier {
+func InjectProxyEndpointModifier() component.ComponentsModifier {
 	return func(comps []component.Component, _ map[string]interface{}) ([]component.Component, error) {
 		for i, comp := range comps {
 			if comp.InputSpec != nil && comp.InputSpec.InputType == endpoint {

pkg/component/component.go

@@ -286,6 +286,10 @@ func (c *Component) RemoveWorkDir(parentDirPath string) error {
 	return os.RemoveAll(c.WorkDirPath(parentDirPath))
 }
 
+// ComponentsModifier is a function that takes the computed components model and modifies it before
+// passing it into the components runtime manager.
+type ComponentsModifier func(comps []Component, cfg map[string]interface{}) ([]Component, error)
+
 // Model is the components model with signed policy data
 // This replaces former top level []Components with the top Model that captures signed policy data.
 // The signed data is a part of the policy since 8.8.0 release and contains the signed policy fragments and the signature that can be validated.