Update default value for env. var used for Wolfi images

mrodm · mrodm · commit 17232718b5f5 · 2024-09-05T17:16:51.000+02:00
diff --git a/internal/install/application_configuration.go b/internal/install/application_configuration.go
@@ -162,10 +162,10 @@ func selectElasticAgentImageName(version, agentBaseImage string) string {
 		return elasticAgentLegacyImageName
 	}
 
-	disableWolfiImages := true
+	disableWolfiImages := false
 	valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
-	if ok && strings.ToLower(valueEnv) != "true" {
-		disableWolfiImages = false
+	if ok && strings.ToLower(valueEnv) != "false" {
+		disableWolfiImages = true
 	}
 	switch {
 	case agentBaseImage == "complete":
diff --git a/internal/install/application_configuration_test.go b/internal/install/application_configuration_test.go
@@ -53,14 +53,14 @@ func TestSelectElasticAgentImageName_NextStackInOwnNamespace(t *testing.T) {
 	assert.Equal(t, selected, elasticAgentCompleteImageName)
 }
 
-func TestSelectElasticAgentImageName_DefaultImage816_WihtoutEnvVar(t *testing.T) {
+func TestSelectElasticAgentImageName_DefaultImage816_WithoutEnvVar(t *testing.T) {
 	version := stackVersion8160
 	// Try to keep the test agnostic from the environment variables defined in CI
 	t.Setenv(disableElasticAgentWolfiEnvVar, "")
 	os.Unsetenv(disableElasticAgentWolfiEnvVar)
 
 	selected := selectElasticAgentImageName(version, "")
-	assert.Equal(t, selected, elasticAgentCompleteImageName)
+	assert.Equal(t, selected, elasticAgentWolfiImageName)
 }
 
 func TestSelectElasticAgentImageName_DisableWolfiImageEnvVar(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,10 @@ func selectElasticAgentImageName(version, agentBaseImage string) string {`
`162`	`162`	`return elasticAgentLegacyImageName`
`163`	`163`	`}`
`164`	`164`
`165`		`- disableWolfiImages := true`
	`165`	`+ disableWolfiImages := false`
`166`	`166`	`valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)`
`167`		`- if ok && strings.ToLower(valueEnv) != "true" {`
`168`		`- disableWolfiImages = false`
	`167`	`+ if ok && strings.ToLower(valueEnv) != "false" {`
	`168`	`+ disableWolfiImages = true`
`169`	`169`	`}`
`170`	`170`	`switch {`
`171`	`171`	`case agentBaseImage == "complete":`
Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ func TestSelectElasticAgentImageName_NextStackInOwnNamespace(t *testing.T) {`
`53`	`53`	`assert.Equal(t, selected, elasticAgentCompleteImageName)`
`54`	`54`	`}`
`55`	`55`
`56`		`-func TestSelectElasticAgentImageName_DefaultImage816_WihtoutEnvVar(t *testing.T) {`
	`56`	`+func TestSelectElasticAgentImageName_DefaultImage816_WithoutEnvVar(t *testing.T) {`
`57`	`57`	`version := stackVersion8160`
`58`	`58`	`// Try to keep the test agnostic from the environment variables defined in CI`
`59`	`59`	`t.Setenv(disableElasticAgentWolfiEnvVar, "")`
`60`	`60`	`os.Unsetenv(disableElasticAgentWolfiEnvVar)`
`61`	`61`
`62`	`62`	`selected := selectElasticAgentImageName(version, "")`
`63`		`- assert.Equal(t, selected, elasticAgentCompleteImageName)`
	`63`	`+ assert.Equal(t, selected, elasticAgentWolfiImageName)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func TestSelectElasticAgentImageName_DisableWolfiImageEnvVar(t *testing.T) {`