Backport/2.11/74476

[maximmasiutin]

SUMMARY

The error message about the failure to import a 'gpg' key by the 'ansible.builtin.apt_key' module was incorrect.

This is a backport of #74476 into the 2.11.

The backport to 2.10 is not needed, since this bug didn't yet exist in 2.10.

When importing a key by the apt_key module, in case of error, the error message was incorrect, because the logic to distinguish between the file name and the explicit data was inversed.

The error message was:

Unable to extract key from '-'

While it should have been:

Unable to extract key from 'inline data'

The relevant code is in the following line from: /lib/ansible/modules/apt_key.py

module.fail_json(msg="Unable to extract key from '%s'" % ('inline data' if data is None else filename), stdout=out, stderr=err)

(it should have been if data is None)

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

lib/ansible/modules/apt_key

ADDITIONAL INFORMATION

Fixes: #74423

To reproduce this error, see the associated test .yml from the present commit.

Alternatively, you can reproduce the error by the following files:

The Vagrantfile file:

Vagrant.configure("2") do |config|
  config.vm.synced_folder ".", "/vagrant", disabled: false

  config.vm.define "test-host" do |n|
    n.vm.box = "ubuntu/bionic64"
    n.vm.hostname = "test-host"
    n.vm.provision :ansible do |ansible|
      ansible.limit = "all"
      ansible.playbook = "test.yaml"
    end
  end
end

The test.yaml file:

- name: Test Playbook
  hosts: test-host
  become: yes
  tasks:
    - name: Add binary key
      apt_key: url=https://packages.cloud.google.com/apt/doc/apt-key.gpg

and run vagrant up

Expected Results:

Unable to extract key from 'inline data'

Actual Results:

Unable to extract key from '-'

@Akasurde - please review

[maximmasiutin]

Sorry, pulled too many commits