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

Backport message fixes

Browse source
This commit is contained in:
jeanluc 2022-12-11 14:05:31 +01:00 • committed by Pedro Algarvio
parent 73a6996c75
commit 3dbf49190f
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/gpg.py
View file

@ -97,7 +97,7 @@ def present(
)
if result["res"] is False:
ret["result"] = result["res"]
ret["comment"].extend(result["message"])
ret["comment"].append(result["message"])
else:
salt.utils.dictupdate.set_dict_key_value(
ret, f"changes:{key}:trust", trust
@ -146,7 +146,7 @@ def present(
)
if result["res"] is False:
ret["result"] = result["res"]
ret["comment"].extend(result["message"])
ret["comment"].append(result["message"])
else:
ret["comment"].append(f"Set trust level for {key} to {trust}")
else:
@ -201,7 +201,7 @@ def absent(name, keys=None, user=None, gnupghome=None, **kwargs):
)
if result["res"] is False:
ret["result"] = result["res"]
ret["comment"].extend(result["message"])
ret["comment"].append(result["message"])
else:
ret["comment"].append(f"Deleted {key} from GPG keychain")
salt.utils.dictupdate.append_dict_key_value(ret, "changes:deleted", key)

18
tests/pytests/unit/states/test_gpg.py
View file

@ -76,7 +76,7 @@ def gpg_trust(request):
trust.return_value = getattr(
request,
"param",
{"res": True, "message": ["Setting ownership trust to Marginally"]},
{"res": True, "message": "Setting ownership trust to Marginally"},
)
with patch.dict(gpg.__salt__, {"gpg.trust_key": trust}):
yield trust
@ -96,7 +96,7 @@ def gpg_receive(request):
def gpg_delete(request):
delete = Mock(spec="salt.modules.gpg.delete_key")
delete.return_value = getattr(
request, "param", {"res": True, "message": ["Public key for A deleted"]}
request, "param", {"res": True, "message": "Public key for A deleted"}
)
with patch.dict(gpg.__salt__, {"gpg.delete_key": delete}):
yield delete
@ -115,8 +115,8 @@ def test_gpg_present_no_changes(gpg_receive, gpg_trust):
@pytest.mark.parametrize(
"gpg_trust,expected",
[
({"res": True, "message": ["Setting ownership trust to Marginally"]}, True),
({"res": False, "message": ["KeyID A not in GPG keychain"]}, False),
({"res": True, "message": "Setting ownership trust to Marginally"}, True),
({"res": False, "message": "KeyID A not in GPG keychain"}, False),
],
indirect=["gpg_trust"],
)
@ -157,8 +157,8 @@ def test_gpg_present_new_key(gpg_receive, gpg_trust, expected):
@pytest.mark.parametrize(
"gpg_trust,expected",
[
({"res": True, "message": ["Setting ownership trust to Marginally"]}, True),
({"res": False, "message": ["KeyID A not in GPG keychain"]}, False),
({"res": True, "message": "Setting ownership trust to Marginally"}, True),
({"res": False, "message": "KeyID A not in GPG keychain"}, False),
],
indirect=["gpg_trust"],
)
@ -195,13 +195,11 @@ def test_gpg_absent_no_changes(gpg_delete):
@pytest.mark.parametrize(
"gpg_delete,expected",
[
({"res": True, "message": ["Public key for A deleted"]}, True),
({"res": True, "message": "Public key for A deleted"}, True),
(
{
"res": False,
"message": [
"Secret key exists, delete first or pass delete_secret=True."
],
"message": "Secret key exists, delete first or pass delete_secret=True.",
},
False,
),