Rename system test configuration setting

internal/agentdeployer/agent.go

@@ -264,7 +264,7 @@ func (d *DockerComposeAgentDeployer) installDockerCompose(agentInfo AgentInfo) (
 		stackVersion = config.Parameters[stack.ParamServerlessLocalStackVersion]
 	}
 
-	agentImage, err := selectElasticAgentImage(stackVersion, agentInfo.Agent.Type)
+	agentImage, err := selectElasticAgentImage(stackVersion, agentInfo.Agent.BaseImage)
 	if err != nil {
 		return "", nil
 	}
@@ -303,8 +303,8 @@ func (d *DockerComposeAgentDeployer) installDockerCompose(agentInfo AgentInfo) (
 	return customAgentDir, nil
 }
 
-func selectElasticAgentImage(stackVersion, agentImageType string) (string, error) {
-	appConfig, err := install.Configuration(install.OptionWithAgentImageType(agentImageType), install.OptionWithStackVersion(stackVersion))
+func selectElasticAgentImage(stackVersion, agentBaseImage string) (string, error) {
+	appConfig, err := install.Configuration(install.OptionWithAgentBaseImage(agentBaseImage), install.OptionWithStackVersion(stackVersion))
 	if err != nil {
 		return "", fmt.Errorf("can't read application configuration: %w", err)
 	}

internal/agentdeployer/info.go

@@ -26,8 +26,8 @@ type AgentScript struct {
 type AgentSettings struct {
 	// User user to run Elastic Agent process
 	User string `config:"user"`
-	// Type elastic-agent image type to be used for testing (allowed values complete, default or empty)
-	Type string `config:"type"`
+	// BaseImage elastic-agent base image to be used for testing
+	BaseImage string `config:"base_image"`
 	// PidMode selects the host PID mode
 	// (From docker-compose docs) Turns on sharing between container and the host
 	// operating system the PID address space

internal/install/application_configuration.go

@@ -72,7 +72,7 @@ func DefaultConfiguration() *ApplicationConfiguration {
 // ApplicationConfiguration represents the configuration of the elastic-package.
 type ApplicationConfiguration struct {
 	c              configFile
-	agentImageType string
+	agentBaseImage string
 	stackVersion   string
 }
 
@@ -123,7 +123,7 @@ func (ir ImageRefs) AsEnv() []string {
 // StackImageRefs function selects the appropriate set of Docker image references for the given stack version.
 func (ac *ApplicationConfiguration) StackImageRefs() ImageRefs {
 	refs := ac.c.Stack.ImageRefOverridesForVersion(ac.stackVersion)
-	refs.ElasticAgent = stringOrDefault(refs.ElasticAgent, fmt.Sprintf("%s:%s", selectElasticAgentImageName(ac.stackVersion, ac.agentImageType), ac.stackVersion))
+	refs.ElasticAgent = stringOrDefault(refs.ElasticAgent, fmt.Sprintf("%s:%s", selectElasticAgentImageName(ac.stackVersion, ac.agentBaseImage), ac.stackVersion))
 	refs.Elasticsearch = stringOrDefault(refs.Elasticsearch, fmt.Sprintf("%s:%s", elasticsearchImageName, ac.stackVersion))
 	refs.Kibana = stringOrDefault(refs.Kibana, fmt.Sprintf("%s:%s", kibanaImageName, ac.stackVersion))
 	refs.Logstash = stringOrDefault(refs.Logstash, fmt.Sprintf("%s:%s", logstashImageName, ac.stackVersion))
@@ -150,7 +150,7 @@ func (ac *ApplicationConfiguration) SetCurrentProfile(name string) {
 
 // selectElasticAgentImageName function returns the appropriate image name for Elastic-Agent depending on the stack version.
 // This is mandatory as "elastic-agent-complete" is available since 7.15.0-SNAPSHOT.
-func selectElasticAgentImageName(version, agentImageType string) string {
+func selectElasticAgentImageName(version, agentBaseImage string) string {
 	if version == "" { // as version is optional and can be empty
 		return elasticAgentImageName
 	}
@@ -168,7 +168,7 @@ func selectElasticAgentImageName(version, agentImageType string) string {
 		disableWolfiImages = false
 	}
 	switch {
-	case !disableWolfiImages && !v.LessThan(elasticAgentWolfiVersion) && agentImageType != "complete":
+	case !disableWolfiImages && !v.LessThan(elasticAgentWolfiVersion) && agentBaseImage != "complete":
 		return elasticAgentWolfiImageName
 	case !v.LessThan(elasticAgentCompleteOwnNamespaceVersion):
 		return elasticAgentCompleteImageName
@@ -180,16 +180,16 @@ func selectElasticAgentImageName(version, agentImageType string) string {
 }
 
 type configurationOptions struct {
-	agentImageType string
+	agentBaseImage string
 	stackVersion   string
 }
 
 type ConfigurationOption func(*configurationOptions)
 
-// OptionWithAgentImageType sets the agent image type to be used.
-func OptionWithAgentImageType(agentImageType string) ConfigurationOption {
+// OptionWithAgentBaseImage sets the agent image type to be used.
+func OptionWithAgentBaseImage(agentBaseImage string) ConfigurationOption {
 	return func(opts *configurationOptions) {
-		opts.agentImageType = agentImageType
+		opts.agentBaseImage = agentBaseImage
 	}
 }
 
@@ -228,7 +228,7 @@ func Configuration(options ...ConfigurationOption) (*ApplicationConfiguration, e
 
 	configuration := ApplicationConfiguration{
 		c:              c,
-		agentImageType: configOptions.agentImageType,
+		agentBaseImage: configOptions.agentBaseImage,
 		stackVersion:   configOptions.stackVersion,
 	}
 

internal/testrunner/runners/system/tester.go

@@ -429,8 +429,8 @@ func (r *tester) createAgentInfo(policy *kibana.Policy, config *testConfig, runI
 	}
 
 	// This could be removed once package-spec adds this new field
-	if !slices.Contains([]string{"", "default", "complete"}, info.Agent.Type) {
-		return agentdeployer.AgentInfo{}, fmt.Errorf("invalid value for agent.type")
+	if !slices.Contains([]string{"", "default", "complete"}, info.Agent.BaseImage) {
+		return agentdeployer.AgentInfo{}, fmt.Errorf("invalid value for agent.base_image")
 	}
 
 	return info, nil