fix(pkg/scripts_test): darwin tests

Signed-off-by: Justin Kolberg <[email protected]>
SumoLogic · Jun 22, 2023 · a5e3486 · a5e3486
1 parent 6a14271
commit a5e3486
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 44 deletions.
diff --git a/pkg/scripts_test/Makefile b/pkg/scripts_test/Makefile
@@ -11,4 +11,3 @@ GOTESTBINARY=sumologic_scripts_tests.test
 test:
 	$(GOTEST) -c
 	$(GOTESTPREFIX) ./$(GOTESTBINARY)
-#-test.run TestInstallScriptDarwin/configuration_with_tags
diff --git a/pkg/scripts_test/check.go b/pkg/scripts_test/check.go
@@ -65,41 +65,6 @@ func checkConfigCreated(c check) {
 	checkConfigDirectoryOwnershipAndPermissions(c)
 }
 
-func checkConfigFilesOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
-	return func(c check) {
-		etcPathGlob := filepath.Join(etcPath, "*")
-		etcPathNestedGlob := filepath.Join(etcPath, "*", "*")
-
-		for _, glob := range []string{etcPathGlob, etcPathNestedGlob} {
-			paths, err := filepath.Glob(glob)
-			require.NoError(c.test, err)
-			for _, path := range paths {
-				var permissions uint32
-				info, err := os.Stat(path)
-				require.NoError(c.test, err)
-				if info.IsDir() {
-					switch path {
-					case etcPath:
-						permissions = etcPathPermissions
-					default:
-						permissions = configPathDirPermissions
-					}
-				} else {
-					switch path {
-					case configPath, userConfigPath:
-						permissions = configPathFilePermissions
-					default:
-						permissions = confDPathFilePermissions
-					}
-				}
-				PathHasPermissions(c.test, path, permissions)
-				PathHasOwner(c.test, configPath, ownerName, ownerGroup)
-			}
-		}
-		PathHasPermissions(c.test, configPath, configPathFilePermissions)
-	}
-}
-
 func checkConfigNotCreated(c check) {
 	require.NoFileExists(c.test, configPath, "configuration has been created")
 }
@@ -148,13 +113,6 @@ func checkHostmetricsConfigCreated(c check) {
 	require.FileExists(c.test, hostmetricsConfigPath, "hostmetrics configuration has not been created properly")
 }
 
-func checkHostmetricsOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
-	return func(c check) {
-		PathHasOwner(c.test, hostmetricsConfigPath, ownerName, ownerGroup)
-		PathHasPermissions(c.test, hostmetricsConfigPath, confDPathFilePermissions)
-	}
-}
-
 func checkHostmetricsConfigNotCreated(c check) {
 	require.NoFileExists(c.test, hostmetricsConfigPath, "hostmetrics configuration has been created")
 }

diff --git a/pkg/scripts_test/check_darwin.go b/pkg/scripts_test/check_darwin.go
@@ -3,12 +3,46 @@ package sumologic_scripts_tests
 import (
 	"io/fs"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
 	"github.com/stretchr/testify/require"
 )
 
+func checkConfigFilesOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
+	return func(c check) {
+		etcPathGlob := filepath.Join(etcPath, "*")
+		etcPathNestedGlob := filepath.Join(etcPath, "*", "*")
+
+		for _, glob := range []string{etcPathGlob, etcPathNestedGlob} {
+			paths, err := filepath.Glob(glob)
+			require.NoError(c.test, err)
+			for _, path := range paths {
+				var permissions uint32
+				info, err := os.Stat(path)
+				require.NoError(c.test, err)
+				if info.IsDir() {
+					if path == etcPath {
+						permissions = etcPathPermissions
+					} else {
+						permissions = configPathDirPermissions
+					}
+				} else {
+					if filepath.Dir(path) != confDPath || path == userConfigPath {
+						permissions = configPathFilePermissions
+					} else {
+						permissions = confDPathFilePermissions
+					}
+				}
+				PathHasPermissions(c.test, path, permissions)
+				PathHasOwner(c.test, configPath, ownerName, ownerGroup)
+			}
+		}
+		PathHasPermissions(c.test, configPath, configPathFilePermissions)
+	}
+}
+
 func checkDifferentTokenInLaunchdConfig(c check) {
 	require.NotEmpty(c.test, c.installOptions.installToken, "installation token has not been provided")
 
@@ -28,6 +62,13 @@ func checkGroupNotExists(c check) {
 	require.False(c.test, exists, "group has been created")
 }
 
+func checkHostmetricsOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
+	return func(c check) {
+		PathHasOwner(c.test, hostmetricsConfigPath, ownerName, ownerGroup)
+		PathHasPermissions(c.test, hostmetricsConfigPath, confDPathFilePermissions)
+	}
+}
+
 func checkLaunchdConfigCreated(c check) {
 	require.FileExists(c.test, launchdPath, "launchd configuration has not been created properly")
 }

diff --git a/pkg/scripts_test/check_linux.go b/pkg/scripts_test/check_linux.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"os/user"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"testing"
@@ -19,6 +20,31 @@ func checkACLAvailability(c check) bool {
 	return assert.FileExists(&testing.T{}, "/usr/bin/getfacl", "File ACLS is not supported")
 }
 
+func checkConfigFilesOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
+	return func(c check) {
+		etcPathGlob := filepath.Join(etcPath, "*")
+		etcPathNestedGlob := filepath.Join(etcPath, "*", "*")
+
+		for _, glob := range []string{etcPathGlob, etcPathNestedGlob} {
+			paths, err := filepath.Glob(glob)
+			require.NoError(c.test, err)
+			for _, path := range paths {
+				var permissions uint32
+				info, err := os.Stat(path)
+				require.NoError(c.test, err)
+				if info.IsDir() {
+					permissions = configPathDirPermissions
+				} else {
+					permissions = configPathFilePermissions
+				}
+				PathHasPermissions(c.test, path, permissions)
+				PathHasOwner(c.test, configPath, ownerName, ownerGroup)
+			}
+		}
+		PathHasPermissions(c.test, configPath, configPathFilePermissions)
+	}
+}
+
 func checkDeprecatedTokenInConfig(c check) {
 	require.NotEmpty(c.test, c.installOptions.deprecatedInstallToken, "installation token has not been provided")
 
@@ -54,6 +80,13 @@ func checkDownloadTimeout(c check) {
 	require.Equal(c.test, 6, count)
 }
 
+func checkHostmetricsOwnershipAndPermissions(ownerName string, ownerGroup string) func(c check) {
+	return func(c check) {
+		PathHasOwner(c.test, hostmetricsConfigPath, ownerName, ownerGroup)
+		PathHasPermissions(c.test, hostmetricsConfigPath, configPathFilePermissions)
+	}
+}
+
 func checkOutputUserAddWarnings(c check) {
 	output := strings.Join(c.output, "\n")
 	require.NotContains(c.test, output, "useradd", "unexpected useradd output")

diff --git a/pkg/scripts_test/install_darwin_test.go b/pkg/scripts_test/install_darwin_test.go
@@ -120,7 +120,7 @@ func TestInstallScriptDarwin(t *testing.T) {
 				checkBinaryIsRunning,
 				checkConfigCreated,
 				checkConfigOverrided,
-				checkUserConfigNotCreated,
+				checkUserConfigCreated,
 				checkLaunchdConfigCreated,
 			},
 		},