Uniquify requisite_in'd states checks.

gpernot-celeste · gpernot-celeste · commit 9356b2d67f16 · 2025-10-17T20:17:49.000+02:00
Fix #68408
diff --git a/salt/state.py b/salt/state.py
@@ -1903,6 +1903,29 @@ def apply_exclude(self, high):
                 high.pop(id_)
         return high
 
+    @staticmethod
+    def _add_to_extend(extend, name, state, rkey, rstate, id_):
+        found = False
+        if name not in extend:
+            extend[name] = HashableOrderedDict()
+        if rstate not in extend[name]:
+            extend[name][rstate] = []
+        for ind in range(len(extend[name][rstate])):
+            if next(iter(extend[name][rstate][ind])) == rkey:
+                for key in extend[name][rstate][ind][rkey]:
+                    if key.get(state) == id_:
+                        break
+                else:
+                    # Extending again
+                    extend[name][rstate][ind][rkey].append({state: id_})
+                found = True
+
+        if not found:
+            # The rkey is not present yet, create it
+            extend[name][rstate].append({rkey: [{state: id_}]})
+
+        return found
+
     def requisite_in(self, high):
         """
         Extend the data reference with requisite_in arguments
@@ -1953,11 +1976,7 @@ def requisite_in(self, high):
                         if isinstance(items, dict):
                             # Formatted as a single req_in
                             for _state, name in items.items():
-
                                 # Not a use requisite_in
-                                found = False
-                                if name not in extend:
-                                    extend[name] = HashableOrderedDict()
                                 if "." in _state:
                                     errors.append(
                                         "Invalid requisite in {}: {} for "
@@ -1971,21 +1990,13 @@ def requisite_in(self, high):
                                         )
                                     )
                                     _state = _state.split(".")[0]
-                                if _state not in extend[name]:
-                                    extend[name][_state] = []
+                                found = self._add_to_extend(
+                                    extend, name, _state, rkey, state, id_
+                                )
                                 extend[name]["__env__"] = body["__env__"]
                                 extend[name]["__sls__"] = body["__sls__"]
-                                for ind in range(len(extend[name][_state])):
-                                    if next(iter(extend[name][_state][ind])) == rkey:
-                                        # Extending again
-                                        extend[name][_state][ind][rkey].append(
-                                            {state: id_}
-                                        )
-                                        found = True
                                 if found:
                                     continue
-                                # The rkey is not present yet, create it
-                                extend[name][_state].append({rkey: [{state: id_}]})
 
                         if isinstance(items, list):
                             # Formed as a list of requisite additions
@@ -2123,27 +2134,15 @@ def requisite_in(self, high):
                                                     continue
                                                 extend[id_][state].append(arg)
                                         continue
-                                    found = False
-                                    if name not in extend:
-                                        extend[name] = HashableOrderedDict()
-                                    if _state not in extend[name]:
-                                        extend[name][_state] = []
+                                    found = self._add_to_extend(
+                                        extend, name, _state, rkey, state, id_
+                                    )
+
                                     extend[name]["__env__"] = body["__env__"]
                                     extend[name]["__sls__"] = body["__sls__"]
-                                    for ind in range(len(extend[name][_state])):
-                                        if (
-                                            next(iter(extend[name][_state][ind]))
-                                            == rkey
-                                        ):
-                                            # Extending again
-                                            extend[name][_state][ind][rkey].append(
-                                                {state: id_}
-                                            )
-                                            found = True
+
                                     if found:
                                         continue
-                                    # The rkey is not present yet, create it
-                                    extend[name][_state].append({rkey: [{state: id_}]})
         high["__extend__"] = []
         for key, val in extend.items():
             high["__extend__"].append({key: val})
