From 6f1a8210002166134fb4676cd5a0c3c75b7b4404 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Wed, 30 Nov 2022 22:56:31 +0100 Subject: [PATCH] Make deleting keys with user/gnupghome possible --- changelog/63159.fixed | 1 + salt/modules/gpg.py | 2 +- salt/states/gpg.py | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 changelog/63159.fixed diff --git a/changelog/63159.fixed b/changelog/63159.fixed new file mode 100644 index 00000000000..914bb703b28 --- /dev/null +++ b/changelog/63159.fixed @@ -0,0 +1 @@ +Fixed gpg.absent with gnupghome/user, fixed gpg.delete_key with gnupghome diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py index af9f10cdb24..4efc349ef4c 100644 --- a/salt/modules/gpg.py +++ b/salt/modules/gpg.py @@ -556,7 +556,7 @@ def delete_key( return ret gpg = _create_gpg(user, gnupghome) - key = get_key(keyid, fingerprint, user) + key = get_key(keyid=keyid, fingerprint=fingerprint, user=user, gnupghome=gnupghome) def __delete_key(fingerprint, secret, use_passphrase): if use_passphrase: diff --git a/salt/states/gpg.py b/salt/states/gpg.py index bbe1183d79b..4b465bb8c4c 100644 --- a/salt/states/gpg.py +++ b/salt/states/gpg.py @@ -178,7 +178,7 @@ def absent(name, keys=None, user=None, gnupghome=None, **kwargs): ret = {"name": name, "result": True, "changes": {}, "comment": []} - _current_keys = __salt__["gpg.list_keys"]() + _current_keys = __salt__["gpg.list_keys"](user=user, gnupghome=gnupghome) current_keys = [] for key in _current_keys: @@ -198,9 +198,9 @@ def absent(name, keys=None, user=None, gnupghome=None, **kwargs): salt.utils.dictupdate.append_dict_key_value(ret, "changes:deleted", key) continue result = __salt__["gpg.delete_key"]( - key, - user, - gnupghome, + keyid=key, + user=user, + gnupghome=gnupghome, ) if result["res"] is False: ret["result"] = result["res"]