From 3dbf49190fd39aae78dd3d2a9c77c2ee39557685 Mon Sep 17 00:00:00 2001
From: jeanluc <lkubb@protonmail.com>
Date: Sun, 11 Dec 2022 14:05:31 +0100
Subject: [PATCH] Backport message fixes

---
 salt/states/gpg.py                    |  6 +++---
 tests/pytests/unit/states/test_gpg.py | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/salt/states/gpg.py b/salt/states/gpg.py
index 3a9503aaf2e..14ad37d98f0 100644
--- a/salt/states/gpg.py
+++ b/salt/states/gpg.py
@@ -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)
diff --git a/tests/pytests/unit/states/test_gpg.py b/tests/pytests/unit/states/test_gpg.py
index 2dca40eb09f..2df53fbee17 100644
--- a/tests/pytests/unit/states/test_gpg.py
+++ b/tests/pytests/unit/states/test_gpg.py
@@ -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,
         ),