Handle None/empty and numeric SLS modules listed in include declarations

leeclemens · Dec 31, 2023 · 0121e4e · 0121e4e
1 parent 1d0dfde
commit 0121e4e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/changelog/56253.fixed.md b/changelog/56253.fixed.md
@@ -0,0 +1 @@
+Handle None/empty and numeric SLS modules listed in include declarations
diff --git a/salt/state.py b/salt/state.py
@@ -4422,6 +4422,18 @@ def render_state(self, sls, saltenv, mods, matches, local=False, context=None):
                         errors.append(msg)
                         continue
 
+                    if not hasattr(inc_sls, "startswith"):
+                        if inc_sls is None:
+                            msg = (
+                                "Empty include found in include "
+                                "in SLS '{}:{}'".format(saltenv, sls)
+                            )
+                            log.error(msg)
+                            errors.append(msg)
+                            continue
+                        else:
+                            inc_sls = str(inc_sls)
+
                     if inc_sls.startswith("."):
                         match = re.match(r"^(\.+)(.*)$", inc_sls)
                         if match:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Handle None/empty and numeric SLS modules listed in include declarations