The error message about the failure to import a 'gpg' key by the 'ansible.builtin.apt_key' module was incorrect (https://github.com/ansible/ansible/issues/74423) (#74521)

Co-authored-by: Sam Doran <sdoran@redhat.com>
(cherry picked from commit e4d7fc9745)
pull/74312/head
Maxim Masiutin 4 years ago committed by GitHub
parent 3d4d43a1ce
commit 3aab644285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- The error message about the failure to import a ``gpg`` key by the ``apt_key`` module was incorrect (https://github.com/ansible/ansible/issues/74423).

@ -290,7 +290,7 @@ def get_key_id_from_file(module, filename, data=None):
(rc, out, err) = module.run_command(cmd, environ_update=lang_env, data=to_native(data)) (rc, out, err) = module.run_command(cmd, environ_update=lang_env, data=to_native(data))
if rc != 0: if rc != 0:
module.fail_json(msg="Unable to extract key from '%s'" % ('inline data' if data is None else filename), stdout=out, stderr=err) module.fail_json(msg="Unable to extract key from '%s'" % ('inline data' if data is not None else filename), stdout=out, stderr=err)
keys = parse_output_for_keys(out) keys = parse_output_for_keys(out)
# assume we only want first key? # assume we only want first key?

@ -0,0 +1,5 @@
- name: "Ensure import of a deliberately corrupted downloaded GnuPG binary key results in an 'inline data' occurence in the message"
apt_key:
url: https://ansible-ci-files.s3.us-east-1.amazonaws.com/test/integration/targets/apt_key/apt-key-corrupt-zeros-2k.gpg
register: gpg_inline_result
failed_when: "not ('inline data' in gpg_inline_result.msg)"

@ -27,5 +27,8 @@
- import_tasks: 'apt_key.yml' - import_tasks: 'apt_key.yml'
when: ansible_distribution in ('Ubuntu', 'Debian') when: ansible_distribution in ('Ubuntu', 'Debian')
- import_tasks: 'apt_key_inline_data.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')
- import_tasks: 'file.yml' - import_tasks: 'file.yml'
when: ansible_distribution in ('Ubuntu', 'Debian') when: ansible_distribution in ('Ubuntu', 'Debian')

Loading…
Cancel
Save