Fix custom agent deployer

Author: jsoriano

internal/configuration/locations/locations.go

@@ -26,18 +26,15 @@ const (
 	fieldsCachedDir = "cache/fields"
 
 	terraformDeployerYmlFile = "terraform-deployer.yml"
-
-	dockerCustomAgentDeployerYmlFile = "docker-custom-agent-base.yml"
 )
 
 var (
 	// elasticPackageDataHome is the name of the environment variable used to override data folder for elastic-package
 	elasticPackageDataHome = environment.WithElasticPackagePrefix("DATA_HOME")
 
-	serviceLogsDir               = filepath.Join(temporaryDir, "service_logs")
-	kubernetesDeployerDir        = filepath.Join(deployerDir, "kubernetes")
-	terraformDeployerDir         = filepath.Join(deployerDir, "terraform")
-	dockerCustomAgentDeployerDir = filepath.Join(deployerDir, "docker_custom_agent")
+	serviceLogsDir        = filepath.Join(temporaryDir, "service_logs")
+	kubernetesDeployerDir = filepath.Join(deployerDir, "kubernetes")
+	terraformDeployerDir  = filepath.Join(deployerDir, "terraform")
 )
 
 // LocationManager maintains an instance of a config path location
@@ -101,16 +98,6 @@ func (loc LocationManager) TerraformDeployerYml() string {
 	return filepath.Join(loc.stackPath, terraformDeployerDir, terraformDeployerYmlFile)
 }
 
-// DockerCustomAgentDeployerDir returns the DockerCustomAgent Directory
-func (loc LocationManager) DockerCustomAgentDeployerDir() string {
-	return filepath.Join(loc.stackPath, dockerCustomAgentDeployerDir)
-}
-
-// DockerCustomAgentDeployerYml returns the DockerCustomAgent deployer yml file
-func (loc LocationManager) DockerCustomAgentDeployerYml() string {
-	return filepath.Join(loc.stackPath, dockerCustomAgentDeployerDir, dockerCustomAgentDeployerYmlFile)
-}
-
 // ServiceLogDir returns the log directory
 func (loc LocationManager) ServiceLogDir() string {
 	return filepath.Join(loc.stackPath, serviceLogsDir)

internal/install/_static/docker-custom-agent-base.yml renamed to internal/testrunner/runners/system/servicedeployer/_static/docker-custom-agent-base.yml

@@ -24,22 +24,22 @@ import (
 // a Docker Compose file.
 type DockerComposeServiceDeployer struct {
 	ymlPaths []string
-	sv       ServiceVariant
+	variant  ServiceVariant
 }
 
 type dockerComposeDeployedService struct {
 	ctxt ServiceContext
 
 	ymlPaths []string
 	project  string
-	sv       ServiceVariant
+	variant  ServiceVariant
 }
 
 // NewDockerComposeServiceDeployer returns a new instance of a DockerComposeServiceDeployer.
 func NewDockerComposeServiceDeployer(ymlPaths []string, sv ServiceVariant) (*DockerComposeServiceDeployer, error) {
 	return &DockerComposeServiceDeployer{
 		ymlPaths: ymlPaths,
-		sv:       sv,
+		variant:  sv,
 	}, nil
 }
 
@@ -49,7 +49,7 @@ func (d *DockerComposeServiceDeployer) SetUp(inCtxt ServiceContext) (DeployedSer
 	service := dockerComposeDeployedService{
 		ymlPaths: d.ymlPaths,
 		project:  "elastic-package-service",
-		sv:       d.sv,
+		variant:  d.variant,
 	}
 	outCtxt := inCtxt
 
@@ -71,15 +71,15 @@ func (d *DockerComposeServiceDeployer) SetUp(inCtxt ServiceContext) (DeployedSer
 	}
 
 	// Boot up service
-	if d.sv.active() {
-		logger.Infof("Using service variant: %s", d.sv.String())
+	if d.variant.active() {
+		logger.Infof("Using service variant: %s", d.variant.String())
 	}
 
 	serviceName := inCtxt.Name
 	opts := compose.CommandOptions{
 		Env: append(
 			[]string{fmt.Sprintf("%s=%s", serviceLogsDirEnv, outCtxt.Logs.Folder.Local)},
-			d.sv.Env...),
+			d.variant.Env...),
 		ExtraArgs: []string{"--build", "-d"},
 	}
 	err = p.Up(opts)
@@ -161,14 +161,14 @@ func (s *dockerComposeDeployedService) TearDown() error {
 	opts := compose.CommandOptions{
 		Env: append(
 			[]string{fmt.Sprintf("%s=%s", serviceLogsDirEnv, s.ctxt.Logs.Folder.Local)},
-			s.sv.Env...),
+			s.variant.Env...),
 	}
 	processServiceContainerLogs(p, opts, s.ctxt.Name)
 
 	if err := p.Down(compose.CommandOptions{
 		Env: append(
 			[]string{fmt.Sprintf("%s=%s", serviceLogsDirEnv, s.ctxt.Logs.Folder.Local)},
-			s.sv.Env...),
+			s.variant.Env...),
 		ExtraArgs: []string{"--volumes"}, // Remove associated volumes.
 	}); err != nil {
 		return errors.Wrap(err, "could not shut down service using Docker Compose")

internal/testrunner/runners/system/servicedeployer/compose.go

@@ -8,6 +8,7 @@ import (
 	_ "embed"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/pkg/errors"
 
@@ -21,18 +22,25 @@ import (
 	"github.com/elastic/elastic-package/internal/stack"
 )
 
-const dockerCustomAgentName = "docker-custom-agent"
+const (
+	dockerCustomAgentName       = "docker-custom-agent"
+	dockerCustomAgentDir        = "docker_custom_agent"
+	dockerCustomAgentDockerfile = "docker-custom-agent-base.yml"
+)
+
+//go:embed _static/docker-custom-agent-base.yml
+var dockerCustomAgentDockerfileContent []byte
 
 // CustomAgentDeployer knows how to deploy a custom elastic-agent defined via
 // a Docker Compose file.
 type CustomAgentDeployer struct {
-	cfg string
+	dockerComposeFile string
 }
 
 // NewCustomAgentDeployer returns a new instance of a deployedCustomAgent.
-func NewCustomAgentDeployer(cfgPath string) (*CustomAgentDeployer, error) {
+func NewCustomAgentDeployer(dockerComposeFile string) (*CustomAgentDeployer, error) {
 	return &CustomAgentDeployer{
-		cfg: cfgPath,
+		dockerComposeFile: dockerComposeFile,
 	}, nil
 }
 
@@ -66,15 +74,20 @@ func (d *CustomAgentDeployer) SetUp(inCtxt ServiceContext) (DeployedService, err
 		fmt.Sprintf("%s=%s", localCACertEnv, caCertPath),
 	)
 
-	ymlPaths, err := d.loadComposeDefinitions()
+	configDir, err := d.installDockerfile()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "could not create resources for custom agent")
+	}
+
+	ymlPaths := []string{
+		d.dockerComposeFile,
+		filepath.Join(configDir, dockerCustomAgentDockerfile),
 	}
 
 	service := dockerComposeDeployedService{
 		ymlPaths: ymlPaths,
 		project:  "elastic-package-service",
-		sv: ServiceVariant{
+		variant: ServiceVariant{
 			Name: dockerCustomAgentName,
 			Env:  env,
 		},
@@ -149,10 +162,25 @@ func (d *CustomAgentDeployer) SetUp(inCtxt ServiceContext) (DeployedService, err
 	return &service, nil
 }
 
-func (d *CustomAgentDeployer) loadComposeDefinitions() ([]string, error) {
+// installDockerfile creates the files needed to run the custom elastic agent and returns
+// the directory with these files.
+func (d *CustomAgentDeployer) installDockerfile() (string, error) {
 	locationManager, err := locations.NewLocationManager()
 	if err != nil {
-		return nil, errors.Wrap(err, "can't locate Docker Compose file for Custom Agent deployer")
+		return "", errors.Wrap(err, "failed to find the configuration directory")
 	}
-	return []string{d.cfg, locationManager.DockerCustomAgentDeployerYml()}, nil
+
+	customAgentDir := filepath.Join(locationManager.DeployerDir(), dockerCustomAgentDir)
+	err = os.MkdirAll(customAgentDir, 0755)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to create directory for custom agent files")
+	}
+
+	customAgentDockerfile := filepath.Join(customAgentDir, dockerCustomAgentDockerfile)
+	err = os.WriteFile(customAgentDockerfile, dockerCustomAgentDockerfileContent, 0644)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to create docker compose file for custom agent")
+	}
+
+	return customAgentDir, nil
 }