Feedback on version checking.

Also add a bit of sanity checking and argument consistency to the
msi install/uninstall APIs

test/new-e2e/tests/windows/common/agent/agent.go

@@ -113,7 +113,7 @@ func UninstallAgent(host *components.RemoteHost, logPath string) error {
 	if err != nil {
 		return err
 	}
-	return windowsCommon.UninstallMSI(host, product, logPath)
+	return windowsCommon.UninstallMSI(host, product, "", logPath)
 }
 
 // HasValidDatadogCodeSignature an error if the file at the given path is not validy signed by the Datadog Code Signing certificate

test/new-e2e/tests/windows/common/msi.go

@@ -8,7 +8,7 @@ package common
 
 import (
 	"fmt"
-
+	"strings"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/components"
 )
 
@@ -19,6 +19,11 @@ import (
 //   - https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.management/start-process?view=powershell-7.4#example-7-specifying-arguments-to-the-process
 //   - https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7.4
 func MsiExec(host *components.RemoteHost, operation string, product string, args string, logPath string) error {
+
+	if !strings.HasPrefix(operation, "/") {
+		return fmt.Errorf("unexpected operation: %s", operation)
+	}
+
 	remoteLogPath, err := GetTemporaryFile(host)
 	if err != nil {
 		return err
@@ -48,8 +53,8 @@ func InstallMSI(host *components.RemoteHost, msiPath string, args string, logPat
 }
 
 // UninstallMSI uninstalls an MSI on the VM and collects the uninstall log
-func UninstallMSI(host *components.RemoteHost, msiPath string, logPath string) error {
-	err := MsiExec(host, "/x", msiPath, "", logPath)
+func UninstallMSI(host *components.RemoteHost, msiPath string, args string, logPath string) error {
+	err := MsiExec(host, "/x", msiPath, args, logPath)
 	if err != nil {
 		return fmt.Errorf("failed to uninstall MSI: %w", err)
 	}

test/new-e2e/tests/windows/common/version.go

@@ -12,6 +12,18 @@ import (
 
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/components"
 )
+
+// GetFileVersion gets the file version information from the versioninfo resource
+// of the specified file.  It returns as a single string
+func GetFileVersion(host *components.RemoteHost, remoteFileName string) (string, error) {
+	pscommand := fmt.Sprintf(`(Get-Item "%s").VersionInfo.FileVersion`, remoteFileName)
+	remoteversion, err := host.Execute(pscommand)
+	if err != nil {
+		return "", fmt.Errorf("failed to get version: %w", err)
+	}
+	return strings.TrimSpace(remoteversion), nil
+}
+
 // VerifyVersion takes a filename and an expected version and determines
 // if the file matches the expected version.
 //
@@ -33,19 +45,19 @@ func VerifyVersion(host *components.RemoteHost, remoteFileName, expectedVersion
 		expectedVersion = string(output)
 		expectedVersion = expectedVersion[:strings.Index(expectedVersion, "-")]
 	}
-	versions := strings.Split(expectedVersion, ".")
-	fmt.Printf("Looking for version %v\n", versions)
-	if len(versions) != 3 {
+	expectedparts := strings.Split(expectedVersion, ".")
+	fmt.Printf("Looking for version %v\n", expectedparts)
+	if len(expectedparts) != 3 {
 		return fmt.Errorf("expected version must be in the form M.m.p.b")
 	}
-	pscommand := fmt.Sprintf(`(Get-Item "%s").VersionInfo.FileVersion`, remoteFileName)
-	remoteversion, err := host.Execute(pscommand)
+
+	remoteversion, err := GetFileVersion(host, remoteFileName)
 	if err != nil {
 		return fmt.Errorf("failed to get version: %w", err)
 	}
 	remoteversionparts := strings.Split(strings.TrimSpace(remoteversion), ".")
 	fmt.Printf("Found version %v\n", remoteversionparts)
-	for idx, v := range versions {
+	for idx, v := range expectedparts {
 		if v != remoteversionparts[idx] {
 			return fmt.Errorf("expected version %v, got %v", expectedVersion, remoteversion)
 		}