Replace filename with file in apt_key (#70492)

* Replace filename with file from apt_key check

  one is internal variable, the other is actual parameter used and required for parameter check.
This commit is contained in:
Amin Vakil 2020-07-10 21:12:49 +04:30 committed by GitHub
parent 9fbd65958d
commit 9c40b1b2ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 3 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- apt_key - Specifying ``file`` as mutually exclusive with ``data``, ``keyserver``, ``url`` (https://github.com/ansible/ansible/pull/70492).

View file

@ -37,7 +37,7 @@ No notable changes
Modules
=======
No notable changes
* The ``apt_key`` module has explicitly defined ``file`` as mutually exclusive with ``data``, ``keyserver`` and ``url``. They cannot be used together anymore.
Modules removed

View file

@ -274,7 +274,7 @@ def main():
state=dict(type='str', default='present', choices=['absent', 'present']),
),
supports_check_mode=True,
mutually_exclusive=(('data', 'filename', 'keyserver', 'url'),),
mutually_exclusive=(('data', 'file', 'keyserver', 'url'),),
)
key_id = module.params['id']

View file

@ -0,0 +1,30 @@
- name: Get Fedora GPG Key
get_url:
url: https://getfedora.org/static/fedora.gpg
dest: /tmp/fedora.gpg
- name: Run apt_key with both file and keyserver
apt_key:
file: /tmp/fedora.gpg
keyserver: keys.gnupg.net
id: 97A1AE57C3A2372CCA3A4ABA6C13026D12C944D0
register: both_file_keyserver
ignore_errors: true
- name: Run apt_key with file only
apt_key:
file: /tmp/fedora.gpg
register: only_file
- name: Run apt_key with keyserver only
apt_key:
keyserver: keys.gnupg.net
id: 97A1AE57C3A2372CCA3A4ABA6C13026D12C944D0
register: only_keyserver
- name: validate results
assert:
that:
- 'both_file_keyserver is failed'
- 'only_file.changed'
- 'not only_keyserver.changed'

View file

@ -26,3 +26,6 @@
- include: 'apt_key.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')
- include: 'file.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')

View file

@ -107,7 +107,6 @@ lib/ansible/modules/apt.py validate-modules:doc-default-does-not-match-spec
lib/ansible/modules/apt.py validate-modules:parameter-invalid
lib/ansible/modules/apt.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/apt.py validate-modules:undocumented-parameter
lib/ansible/modules/apt_key.py validate-modules:mutually_exclusive-unknown
lib/ansible/modules/apt_key.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/apt_key.py validate-modules:undocumented-parameter
lib/ansible/modules/apt_repository.py validate-modules:doc-default-does-not-match-spec