resolve minion override issue in config screen

server/modules/salt/saltstore.go

@@ -370,7 +370,7 @@ func (store *Saltstore) recursivelyParseSettings(
 			merged := false
 			if minion == "" {
 				for _, existing := range settings {
-					if existing.Id == newId {
+					if existing.Id == newId && existing.NodeId == "" {
 						existing.Value = newValue
 						if existing.Multiline != multiline {
 							log.WithFields(log.Fields{

server/modules/salt/saltstore_test.go

@@ -7,11 +7,13 @@
 package salt
 
 import (
+	"cmp"
 	"context"
 	"errors"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"testing"
 
 	"github.com/security-onion-solutions/securityonion-soc/model"
@@ -23,7 +25,7 @@ import (
 const TMP_SALTSTACK_PATH = "/tmp/gotest-soc-saltstore"
 const TMP_QUEUE_DIR = "/tmp/gotest-soc-salt-relay-queue"
 const TMP_REQUEST_FILE = "req"
-const TEST_SETTINGS_COUNT = 24
+const TEST_SETTINGS_COUNT = 26
 
 func Cleanup() {
 	exec.Command("rm", "-fr", TMP_SALTSTACK_PATH).Run()
@@ -200,9 +202,19 @@ func TestGetSettings(tester *testing.T) {
 
 	salt := NewTestSalt()
 	settings, err := salt.GetSettings(ctx(), true)
+	slices.SortFunc(settings,
+		func(a, b *model.Setting) int {
+			return cmp.Compare(a.Id, b.Id)
+		})
 	assert.NoError(tester, err)
 
 	count := 0
+
+	assert.Equal(tester, "myapp.advanced", settings[count].Id)
+	assert.Equal(tester, "myapp:\n  global: advanced\n", settings[count].Value)
+	assert.Equal(tester, "", settings[count].NodeId)
+	count++
+
 	assert.Equal(tester, "myapp.bar", settings[count].Id)
 	assert.Equal(tester, "minion-override", settings[count].Value)
 	assert.Equal(tester, "normal_import", settings[count].NodeId)
@@ -329,8 +341,14 @@ func TestGetSettings(tester *testing.T) {
 	assert.Equal(tester, "", settings[count].NodeId)
 	count++
 
-	assert.Equal(tester, "myapp.advanced", settings[count].Id)
-	assert.Equal(tester, "myapp:\n  global: advanced\n", settings[count].Value)
+	assert.Equal(tester, "myapp.zdef", settings[count].Id)
+	assert.Equal(tester, "strawberry", settings[count].Value)
+	assert.Equal(tester, "normal_import", settings[count].NodeId)
+	count++
+
+	assert.Equal(tester, "myapp.zdef", settings[count].Id)
+	assert.Equal(tester, "chocolate", settings[count].Value)
+	assert.Equal(tester, "vanilla", settings[count].Default)
 	assert.Equal(tester, "", settings[count].NodeId)
 	count++
 

server/modules/salt/test_resources/saltstack/default/salt/myapp/defaults.yaml

@@ -1,4 +1,5 @@
 myapp:
   my_def:
   - item1
-  - item2
+  - item2
+  zdef: vanilla

server/modules/salt/test_resources/saltstack/local/pillar/minions/normal_import.sls

@@ -1,3 +1,4 @@
 myapp:
   foo: minion-born
-  bar: minion-override
+  bar: minion-override
+  zdef: strawberry

server/modules/salt/test_resources/saltstack/local/pillar/myapp/soc_myapp.sls

@@ -35,3 +35,4 @@ myapp:
   float: 3.5
   str: my_str
   bool: true
+  zdef: chocolate