Support removed_at_date
in ansible-doc (#70002)
* Support removed_at_date in ansible-doc Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com> Changes: * ansible-doc does not support `removed_at_date` and assumes that deprecated dict will either have `removed_in` or `version`. This results in ansible-doc (and hence "sanity --test=ansible-doc") failing for modules having only `removed_at_date`. * This patch adds support for `removed_at_date` and also gives it precedence over `removed_in` or `version`. * Add tests and changelog Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>
This commit is contained in:
parent
4869874337
commit
9d6b0f2b03
4 changed files with 61 additions and 3 deletions
2
changelogs/fragments/ansible-doc-remove_at_date.yaml
Normal file
2
changelogs/fragments/ansible-doc-remove_at_date.yaml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- ansible-doc - Allow and give precedence to `removed_at_date` for deprecated modules.
|
|
@ -617,9 +617,14 @@ class DocCLI(CLI):
|
||||||
if doc.get('deprecated', False):
|
if doc.get('deprecated', False):
|
||||||
text.append("DEPRECATED: \n")
|
text.append("DEPRECATED: \n")
|
||||||
if isinstance(doc['deprecated'], dict):
|
if isinstance(doc['deprecated'], dict):
|
||||||
if 'version' in doc['deprecated'] and 'removed_in' not in doc['deprecated']:
|
if 'removed_at_date' in doc['deprecated']:
|
||||||
doc['deprecated']['removed_in'] = doc['deprecated']['version']
|
text.append(
|
||||||
text.append("\tReason: %(why)s\n\tWill be removed in: Ansible %(removed_in)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated'))
|
"\tReason: %(why)s\n\tWill be removed in a release after %(removed_at_date)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated')
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if 'version' in doc['deprecated'] and 'removed_in' not in doc['deprecated']:
|
||||||
|
doc['deprecated']['removed_in'] = doc['deprecated']['version']
|
||||||
|
text.append("\tReason: %(why)s\n\tWill be removed in: Ansible %(removed_in)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated'))
|
||||||
else:
|
else:
|
||||||
text.append("%s" % doc.pop('deprecated'))
|
text.append("%s" % doc.pop('deprecated'))
|
||||||
text.append("\n")
|
text.append("\n")
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
#!/usr/bin/python
|
||||||
|
from __future__ import absolute_import, division, print_function
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
|
||||||
|
DOCUMENTATION = '''
|
||||||
|
---
|
||||||
|
module: test_docs_removed_precedence
|
||||||
|
short_description: Test module
|
||||||
|
description:
|
||||||
|
- Test module
|
||||||
|
author:
|
||||||
|
- Ansible Core Team
|
||||||
|
deprecated:
|
||||||
|
alternative: new_module
|
||||||
|
why: Updated module released with more functionality
|
||||||
|
removed_at_date: '2022-06-01'
|
||||||
|
removed_in: '2.14'
|
||||||
|
'''
|
||||||
|
|
||||||
|
EXAMPLES = '''
|
||||||
|
'''
|
||||||
|
|
||||||
|
RETURN = '''
|
||||||
|
'''
|
||||||
|
|
||||||
|
|
||||||
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
module = AnsibleModule(
|
||||||
|
argument_spec=dict(),
|
||||||
|
)
|
||||||
|
|
||||||
|
module.exit_json()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
|
@ -73,3 +73,14 @@
|
||||||
- assert:
|
- assert:
|
||||||
that:
|
that:
|
||||||
- result is failed
|
- result is failed
|
||||||
|
|
||||||
|
- name: deprecated module with both removed date and version (date should get precedence)
|
||||||
|
command: ansible-doc test_docs_removed_precedence
|
||||||
|
register: result
|
||||||
|
|
||||||
|
- assert:
|
||||||
|
that:
|
||||||
|
- '"DEPRECATED" in result.stdout'
|
||||||
|
- '"Reason: Updated module released with more functionality" in result.stdout'
|
||||||
|
- '"Will be removed in a release after 2022-06-01" in result.stdout'
|
||||||
|
- '"Alternatives: new_module" in result.stdout'
|
||||||
|
|
Loading…
Reference in a new issue