saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixes saltstack/salt#66098 file.managed and file.serialize default tmp_dir to relative path

Browse source
This commit is contained in:
nicholasmhughes 2024-02-19 09:18:51 -05:00 • committed by Daniel Wozniak
parent 0d518807e2
commit 9f797b56c2
4 changed files with 75 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/66098.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix file.managed and file.serialize default tmp_dir to relative path

4
salt/states/file.py
View file

@ -2295,7 +2295,7 @@ def managed(
show_changes=True,
create=True,
contents=None,
tmp_dir="",
tmp_dir=None,
tmp_ext="",
contents_pillar=None,
contents_grains=None,
@ -8041,7 +8041,7 @@ def serialize(
serializer_opts=None,
deserializer_opts=None,
check_cmd=None,
tmp_dir="",
tmp_dir=None,
tmp_ext="",
**kwargs,
):

33
tests/pytests/unit/states/file/test_managed.py
View file

@ -179,7 +179,7 @@ def test_managed():
assert filestate.managed("") == ret
with patch.object(os.path, "isfile", mock_f):
comt = "File {} is not present and is not set for creation".format(name)
comt = f"File {name} is not present and is not set for creation"
ret.update({"comment": comt, "name": name, "result": True})
assert filestate.managed(name, create=False) == ret
@ -193,13 +193,13 @@ def test_managed():
assert filestate.managed(name, user=user, group=group) == ret
with patch.object(os.path, "isabs", mock_f):
comt = "Specified file {} is not an absolute path".format(name)
comt = f"Specified file {name} is not an absolute path"
ret.update({"comment": comt, "result": False})
assert filestate.managed(name, user=user, group=group) == ret
with patch.object(os.path, "isabs", mock_t):
with patch.object(os.path, "isdir", mock_t):
comt = "Specified target {} is a directory".format(name)
comt = f"Specified target {name} is a directory"
ret.update({"comment": comt})
assert filestate.managed(name, user=user, group=group) == ret
@ -237,7 +237,7 @@ def test_managed():
with patch.object(os.path, "exists", mock_t):
with patch.dict(filestate.__opts__, {"test": True}):
comt = "File {} not updated".format(name)
comt = f"File {name} not updated"
ret.update({"comment": comt})
assert (
filestate.managed(
@ -246,7 +246,7 @@ def test_managed():
== ret
)
comt = "The file {} is in the correct state".format(name)
comt = f"The file {name} is in the correct state"
ret.update({"comment": comt, "result": True})
assert (
filestate.managed(
@ -324,7 +324,7 @@ def test_managed():
if salt.utils.platform.is_windows():
mock_ret = MagicMock(return_value=ret)
comt = "File {} not updated".format(name)
comt = f"File {name} not updated"
else:
perms = {"luser": user, "lmode": "0644", "lgroup": group}
mock_ret = MagicMock(return_value=(ret, perms))
@ -359,7 +359,7 @@ def test_managed():
else:
perms = {"luser": user, "lmode": "0644", "lgroup": group}
mock_ret = MagicMock(return_value=(ret, perms))
comt = "File {} not updated".format(name)
comt = f"File {name} not updated"
with patch.dict(filestate.__salt__, {"file.check_perms": mock_ret}):
with patch.object(os.path, "exists", mock_t):
with patch.dict(filestate.__opts__, {"test": True}):
@ -431,3 +431,22 @@ def test_managed_test_mode_user_group_not_present():
)
def test_sources_source_hash_check(source, check_result):
assert filestate._http_ftp_check(source) is check_result
def test_file_managed_tmp_dir_system_temp(tmp_path):
tmp_file = tmp_path / "tmp.txt"
mock_mkstemp = MagicMock()
with patch(
"salt.states.file._load_accumulators", MagicMock(return_value=([], []))
), patch("salt.utils.files.mkstemp", mock_mkstemp), patch.dict(
filestate.__salt__,
{
"cmd.run_all": MagicMock(return_value={"retcode": 0}),
"file.file_exists": MagicMock(return_value=False),
"file.get_managed": MagicMock(return_value=["", "", ""]),
"file.manage_file": MagicMock(),
"file.source_list": MagicMock(return_value=["", ""]),
},
):
filestate.managed(str(tmp_file), contents="wollo herld", check_cmd="true")
mock_mkstemp.assert_called_with(suffix="", dir=None)

46
tests/pytests/unit/states/file/test_serialize.py Normal file
View file

@ -0,0 +1,46 @@
import pytest
import salt.serializers.json as jsonserializer
import salt.serializers.msgpack as msgpackserializer
import salt.serializers.plist as plistserializer
import salt.serializers.python as pythonserializer
import salt.serializers.yaml as yamlserializer
import salt.states.file as filestate
from tests.support.mock import MagicMock, patch
@pytest.fixture
def configure_loader_modules():
return {
filestate: {
"__env__": "base",
"__salt__": {"file.manage_file": False},
"__serializers__": {
"yaml.serialize": yamlserializer.serialize,
"yaml.seserialize": yamlserializer.serialize,
"python.serialize": pythonserializer.serialize,
"json.serialize": jsonserializer.serialize,
"plist.serialize": plistserializer.serialize,
"msgpack.serialize": msgpackserializer.serialize,
},
"__opts__": {"test": False, "cachedir": ""},
"__instance_id__": "",
"__low__": {},
"__utils__": {},
}
}
def test_file_managed_tmp_dir_system_temp(tmp_path):
tmp_file = tmp_path / "tmp.txt"
mock_mkstemp = MagicMock()
with patch("salt.utils.files.mkstemp", mock_mkstemp), patch.dict(
filestate.__salt__,
{
"cmd.run_all": MagicMock(return_value={"retcode": 0}),
"file.file_exists": MagicMock(return_value=False),
"file.manage_file": MagicMock(),
},
):
filestate.serialize(str(tmp_file), dataset={"wollo": "herld"}, check_cmd="true")
mock_mkstemp.assert_called_with(suffix="", dir=None)