move project name rendering to agentdeployer package

Author: efd6

internal/agentdeployer/agent.go

@@ -133,7 +133,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI
 		return nil, fmt.Errorf("could not create resources for custom agent: %w", err)
 	}
 
-	composeProjectName := fmt.Sprintf("elastic-package-agent-%s-%s", d.agentName(), agentInfo.Test.RunID)
+	composeProjectName := d.ProjectName(agentInfo.Test.RunID)
 
 	agent := dockerComposeDeployedAgent{
 		ymlPaths:  []string{filepath.Join(configDir, dockerTestAgentDockerCompose)},
@@ -228,6 +228,11 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI
 	return &agent, nil
 }
 
+// ProjectName returns the Docker Compose project name for the agent.
+func (d *DockerComposeAgentDeployer) ProjectName(runID string) string {
+	return fmt.Sprintf("elastic-package-agent-%s-%s", d.agentName(), runID)
+}
+
 func (d *DockerComposeAgentDeployer) agentHostname() string {
 	return fmt.Sprintf("%s-%s", dockerTestAgentServiceName, d.agentRunID)
 }

internal/testrunner/script/agents.go

@@ -123,7 +123,7 @@ func installAgent(ts *testscript.TestScript, neg bool, args []string) {
 		ts.Setenv(*networkNameLabel, depInfo.NetworkName)
 	}
 	if *containerNameLabel != "" {
-		ts.Setenv(*containerNameLabel, fmt.Sprintf("elastic-package-agent-%s-%s-%s-%s-1", filepath.Base(pkgRoot), ds, info.Test.RunID, depInfo.Name))
+		ts.Setenv(*containerNameLabel, fmt.Sprintf("%s-%s-1", dep.ProjectName(info.Test.RunID), depInfo.Name))
 	}
 	polID := installed.deployed.Info().Policy.ID
 	ts.Check(decoratedWith("getting kibana agent", doKibanaAgent(ctx, stk.kibana, func(a kibana.Agent) (bool, error) {