Refactor function

elastic · Sep 20, 2024 · b8eeaa5 · b8eeaa5
1 parent dbddcd2
commit b8eeaa5
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/internal/install/application_configuration.go b/internal/install/application_configuration.go
@@ -163,29 +163,34 @@ func selectElasticAgentImageName(version, agentBaseImage string) string {
 		return elasticAgentWolfiImageName
 	}
 
-	disableWolfiImages := false
-	valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
-	if ok && strings.ToLower(valueEnv) != "false" {
-		disableWolfiImages = true
-	}
+	shouldUseWolfiImage := shouldUseWolfiImages(v)
 
-	shouldUseWolfiImages := !disableWolfiImages && !v.LessThan(elasticAgentWolfiVersion)
 	switch agentBaseImage {
 	case "systemd":
 		return selectElasticAgentSystemDImageName(v)
 	case "complete":
-		if shouldUseWolfiImages {
+		if shouldUseWolfiImage {
 			return elasticAgentCompleteWolfiImageName
 		}
 		return selectElasticAgentCompleteImageName(v)
 	default:
-		if shouldUseWolfiImages {
+		if shouldUseWolfiImage {
 			return elasticAgentWolfiImageName
 		}
 		return selectElasticAgentCompleteImageName(v)
 	}
 }
 
+func shouldUseWolfiImages(version *semver.Version) bool {
+	disableWolfiImages := false
+	valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
+	if ok && strings.ToLower(valueEnv) != "false" {
+		disableWolfiImages = true
+	}
+
+	return !disableWolfiImages && !version.LessThan(elasticAgentWolfiVersion)
+}
+
 func selectElasticAgentCompleteImageName(version *semver.Version) string {
 	switch {
 	case !version.LessThan(elasticAgentCompleteOwnNamespaceVersion):