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

Add tests and changelog

Browse source
This commit is contained in:
Twangboy 2022-11-10 11:51:52 -07:00
parent fa9f648fbe
commit 18686a31a2
No known key found for this signature in database
GPG key ID: ED267D5C0DE6F8A6
3 changed files with 221 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62968.fixed Normal file
View file

@ -0,0 +1 @@
Issue #62968: Fix issue where cloud deployments were putting the keys in the wrong location on Windows hosts

1
changelog/63024.fixed Normal file
View file

@ -0,0 +1 @@
Issue #63024: Fix issue where grains and config data were being place in the wrong location on Windows hosts

219
tests/pytests/unit/utils/test_cloud.py
View file

@ -206,6 +206,225 @@ def test_deploy_windows_custom_port():
mock.assert_called_once_with("test", "Administrator", None, 1234)
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
cloud.deploy_windows(host="test", win_installer="")
expected = "ProgramData/Salt Project/Salt/conf/pki/minion"
mock_smb.mkdirs.assert_called_with(expected, conn=mock_conn)
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata_minion_pub():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.put_str.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
cloud.deploy_windows(host="test", minion_pub="pub", win_installer="")
expected = (
"ProgramData\\Salt Project\\Salt\\conf\\pki\\minion\\minion.pub"
)
mock_smb.put_str.assert_called_with("pub", expected, conn=mock_conn)
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata_minion_pem():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.put_str.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
cloud.deploy_windows(host="test", minion_pem="pem", win_installer="")
expected = (
"ProgramData\\Salt Project\\Salt\\conf\\pki\\minion\\minion.pem"
)
mock_smb.put_str.assert_called_with("pem", expected, conn=mock_conn)
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata_master_sign_pub_file():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.put_str.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
cloud.deploy_windows(
host="test", master_sign_pub_file="test.txt", win_installer=""
)
expected = (
"ProgramData\\Salt Project\\Salt\\conf\\pki\\minion\\master_sign.pub"
)
called = False
for call in mock_smb.put_file.mock_calls:
if expected in call[1]:
called = True
assert called
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata_minion_conf_grains():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.put_str.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
minion_conf = {"grains": {"spongebob": "squarepants"}}
cloud.deploy_windows(
host="test", minion_conf=minion_conf, win_installer=""
)
expected = "ProgramData\\Salt Project\\Salt\\conf\\grains"
called = False
for call in mock_smb.put_str.mock_calls:
if expected in call[1]:
called = True
assert called
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_deploy_windows_programdata_minion_conf():
"""
Test deploy_windows with a custom port
"""
mock_true = MagicMock(return_value=True)
mock_tuple = MagicMock(return_value=(0, 0, 0))
mock_conn = MagicMock()
with patch("salt.utils.smb", MagicMock()) as mock_smb:
mock_smb.get_conn.return_value = mock_conn
mock_smb.mkdirs.return_value = None
mock_smb.put_file.return_value = None
mock_smb.put_str.return_value = None
mock_smb.delete_file.return_value = None
mock_smb.delete_directory.return_value = None
with patch(
"time.sleep", MagicMock()
), patch.object(
cloud, "wait_for_port", mock_true
), patch.object(
cloud, "fire_event", MagicMock()
), patch.object(
cloud, "wait_for_psexecsvc", mock_true
), patch.object(
cloud, "run_psexec_command", mock_tuple
):
minion_conf = {"master": "test-master"}
cloud.deploy_windows(
host="test", minion_conf=minion_conf, win_installer=""
)
config = (
"ipc_mode: tcp\r\n"
"master: test-master\r\n"
"multiprocessing: true\r\n"
"pki_dir: /conf/pki/minion\r\n"
)
expected = "ProgramData\\Salt Project\\Salt\\conf\\minion"
mock_smb.put_str.assert_called_with(config, expected, conn=mock_conn)
@pytest.mark.skip_unless_on_windows(reason="Only applicable for Windows.")
def test_winrm_pinnned_version():
"""