Simplify if unprivileged mode is supported.

Author: blakerouse

testing/integration/upgrade_fleet_test.go

@@ -215,19 +215,8 @@ func testUpgradeFleetManagedElasticAgent(
 	require.NoError(t, err)
 
 	if unprivileged {
-		if startParsedVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
-			t.Skipf("Starting version %s is less than 8.13-SNAPSHOT and doesn't support --unprivileged", startParsedVersion.String())
-		}
-		if endParsedVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
-			t.Skipf("Ending version %s is less than 8.13-SNAPSHOT and doesn't support --unprivileged", endParsedVersion.String())
-		}
-		if runtime.GOOS != define.Linux {
-			if startParsedVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
-				t.Skipf("Starting version %s is less than 8.14-SNAPSHOT and doesn't support --unprivileged on Windows", startParsedVersion.String())
-			}
-			if endParsedVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
-				t.Skipf("Ending version %s is less than 8.14-SNAPSHOT and doesn't support --unprivileged on Windows", endParsedVersion.String())
-			}
+		if !upgradetest.SupportsUnprivileged(startParsedVersion, endParsedVersion) {
+			t.Skipf("Either starting version %s or ending version %s doesn't support --unprivileged", startParsedVersion.String(), endParsedVersion.String())
 		}
 	}
 

testing/integration/upgrade_standalone_same_commit_test.go

@@ -18,7 +18,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -53,15 +52,9 @@ func TestStandaloneUpgradeSameCommit(t *testing.T) {
 	}
 
 	unprivilegedAvailable := false
-	// This is probably redundant: see the skip statement above
-	if runtime.GOOS == define.Linux && !currentVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
-		// only available if version is 8.13+ on Linux
-		unprivilegedAvailable = true
-	} else if !currentVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
-		// 8.14+ its always available
+	if upgradetest.SupportsUnprivileged(currentVersion) {
 		unprivilegedAvailable = true
 	}
-
 	unPrivilegedString := "unprivileged"
 	if !unprivilegedAvailable {
 		unPrivilegedString = "privileged"

testing/integration/upgrade_standalone_test.go

@@ -9,7 +9,6 @@ package integration
 import (
 	"context"
 	"fmt"
-	"runtime"
 	"testing"
 	"time"
 
@@ -37,11 +36,7 @@ func TestStandaloneUpgrade(t *testing.T) {
 
 	for _, startVersion := range versionList {
 		unprivilegedAvailable := false
-		if runtime.GOOS == define.Linux && !startVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) && !endVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
-			// unprivileged available if both versions are 8.13+ on Linux
-			unprivilegedAvailable = true
-		} else if !startVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) && !endVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
-			// always available if both versions are 8.14+
+		if upgradetest.SupportsUnprivileged(startVersion, endVersion) {
 			unprivilegedAvailable = true
 		}
 		t.Run(fmt.Sprintf("Upgrade %s to %s (privileged)", startVersion, define.Version()), func(t *testing.T) {

testing/upgradetest/upgrader.go

@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 
@@ -21,7 +20,6 @@ import (
 	v1client "github.com/elastic/elastic-agent/pkg/control/v1/client"
 	v2proto "github.com/elastic/elastic-agent/pkg/control/v2/cproto"
 	atesting "github.com/elastic/elastic-agent/pkg/testing"
-	"github.com/elastic/elastic-agent/pkg/testing/define"
 	"github.com/elastic/elastic-agent/pkg/version"
 )
 
@@ -209,13 +207,7 @@ func PerformUpgrade(
 	// in the unprivileged is unset we adjust it to use unprivileged when the version allows it
 	// in the case that its explicitly set then we ensure the version supports it
 	if upgradeOpts.unprivileged == nil {
-		if !startVersion.Less(*Version_8_13_0_SNAPSHOT) && !endVersion.Less(*Version_8_13_0_SNAPSHOT) && runtime.GOOS == define.Linux {
-			// both version support --unprivileged on Linux
-			unprivileged := true
-			upgradeOpts.unprivileged = &unprivileged
-			logger.Logf("installation of Elastic Agent will use --unprivileged as both start and end version support --unprivileged mode on Linux")
-		} else if !startVersion.Less(*Version_8_14_0_SNAPSHOT) && !endVersion.Less(*Version_8_14_0_SNAPSHOT) {
-			// both version support --unprivileged on all platforms
+		if SupportsUnprivileged(startVersion, endVersion) {
 			unprivileged := true
 			upgradeOpts.unprivileged = &unprivileged
 			logger.Logf("installation of Elastic Agent will use --unprivileged as both start and end version support --unprivileged mode")
@@ -225,11 +217,8 @@ func PerformUpgrade(
 			upgradeOpts.unprivileged = &unprivileged
 		}
 	} else if *upgradeOpts.unprivileged {
-		if startVersion.Less(*Version_8_13_0_SNAPSHOT) {
-			return errors.New("cannot install starting version with --unprivileged (which is default) because the it is older than 8.13")
-		}
-		if endVersion.Less(*Version_8_13_0_SNAPSHOT) {
-			return errors.New("cannot upgrade to ending version as end version doesn't support running with --unprivileged (which is default) because it is older than 8.13")
+		if !SupportsUnprivileged(startVersion, endVersion) {
+			return fmt.Errorf("cannot install with forced --unprivileged because either start version %s or end version %s doesn't support --unprivileged mode", startVersion.String(), endVersion.String())
 		}
 	}
 

testing/upgradetest/versions.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strings"
 
@@ -254,3 +255,16 @@ func EnsureSnapshot(version string) string {
 	}
 	return version
 }
+
+// SupportsUnprivileged returns true when the version supports unprivileged mode.
+func SupportsUnprivileged(versions ...*version.ParsedSemVer) bool {
+	for _, ver := range versions {
+		if ver.Less(*Version_8_13_0_SNAPSHOT) {
+			return false
+		}
+		if runtime.GOOS != define.Linux && ver.Less(*Version_8_14_0_SNAPSHOT) {
+			return false
+		}
+	}
+	return true
+}