Use lexical sorting if both required

stateful · Nov 5, 2024 · fcea599 · fcea599
1 parent 89850b0
commit fcea599
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/internal/owl/store.go b/internal/owl/store.go
@@ -193,12 +193,6 @@ func (res SetVarItems) sort() {
 		if j.Spec == nil {
 			return 1
 		}
-		if i.Spec.Required {
-			return -1
-		}
-		if j.Spec.Required {
-			return 1
-		}
 		if i.Spec.Name != "Opaque" && j.Spec.Name != "Opaque" {
 			jUpdated := j.Var.Updated.Unix()
 			iUpdated := i.Var.Updated.Unix()
@@ -210,6 +204,15 @@ func (res SetVarItems) sort() {
 			}
 			return delta
 		}
+		if i.Spec.Required && j.Spec.Required {
+			return strings.Compare(i.Var.Key, j.Var.Key)
+		}
+		if i.Spec.Required {
+			return -1
+		}
+		if j.Spec.Required {
+			return 1
+		}
 		if i.Spec.Name != "Opaque" {
 			return -1
 		}