Make file.symlink/_symlink_check() respect follow_symlinks

Fixes: #66980
saltstack · Oct 22, 2024 · 8865c2e · 8865c2e
1 parent ef2fb24
commit 8865c2e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/changelog/66980.fixed.md b/changelog/66980.fixed.md
@@ -0,0 +1 @@
+make file.symlink/_symlink_check() respect follow_symlinks
diff --git a/salt/states/file.py b/salt/states/file.py
@@ -983,12 +983,14 @@ def _set_symlink_ownership(path, user, group, win_owner):
     return _check_symlink_ownership(path, user, group, win_owner)
 
 
-def _symlink_check(name, target, force, user, group, win_owner):
+def _symlink_check(name, target, force, user, group, win_owner, follow_symlinks=False):
     """
     Check the symlink function
     """
     changes = {}
-    if not os.path.exists(name) and not __salt__["file.is_link"](name):
+    exists = os.path.exists if follow_symlinks else os.path.lexists
+
+    if not exists(name) and not __salt__["file.is_link"](name):
         changes["new"] = name
         return (
             None,
@@ -1788,7 +1790,7 @@ def symlink(
         return _error(ret, msg)
 
     tresult, tcomment, tchanges = _symlink_check(
-        name, target, force, user, group, win_owner
+        name, target, force, user, group, win_owner, follow_symlinks
     )
 
     if not os.path.isdir(os.path.dirname(name)):

diff --git a/tests/pytests/unit/modules/file/test_file_basics.py b/tests/pytests/unit/modules/file/test_file_basics.py
@@ -294,3 +294,10 @@ def test_symlink_lexists_called_follow_symlinks_false():
         filemod.symlink(tfile, a_link, follow_symlinks=False)
         lexists.assert_called()
         exists.assert_not_called()
+
+        lexists.reset_mock()
+        exists.reset_mock()
+
+        filemod.symlink(tfile, a_link, follow_symlinks=True)
+        lexists.assert_not_called()
+        exists.assert_called()