Skip to content

Commit

Permalink
The error message about the failure to import a 'gpg' key by the 'ans…
Browse files Browse the repository at this point in the history
…ible.builtin.apt_key' module was incorrect (#74423)

Co-authored-by: Sam Doran <sdoran@redhat.com>
  • Loading branch information
maximmasiutin committed Apr 30, 2021
1 parent 567361b commit e4d7fc9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/74476-apt_key-gpg-inline-data.yaml
@@ -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).
2 changes: 1 addition & 1 deletion lib/ansible/modules/apt_key.py
Expand Up @@ -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))
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)
# assume we only want first key?
Expand Down
@@ -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)"
5 changes: 4 additions & 1 deletion test/integration/targets/apt_key/tasks/main.yml
Expand Up @@ -26,6 +26,9 @@

- import_tasks: 'apt_key.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')


- import_tasks: 'apt_key_inline_data.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')

- import_tasks: 'file.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')

0 comments on commit e4d7fc9

Please sign in to comment.