cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow to deprecate / remove plugins by version. (#69712)

Browse source
This commit is contained in:
Felix Fontein 2020-05-27 03:43:40 +02:00 committed by GitHub
parent 304c3e57e8
commit cb8f645e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/loader.py
View file

@ -126,6 +126,7 @@ class PluginLoadContext(object):
self.plugin_resolved_name = None self.plugin_resolved_name = None
self.deprecated = False self.deprecated = False
self.removal_date = None self.removal_date = None
self.removal_version = None
self.deprecation_warnings = [] self.deprecation_warnings = []
self.resolved = False self.resolved = False
@ -135,15 +136,23 @@ class PluginLoadContext(object):
warning_text = deprecation.get('warning_text', None) warning_text = deprecation.get('warning_text', None)
removal_date = deprecation.get('removal_date', None) removal_date = deprecation.get('removal_date', None)
removal_version = deprecation.get('removal_version', None)
# If both removal_date and removal_version are specified, use removal_date
if removal_date is not None:
removal_version = None
if not warning_text: if not warning_text:
if removal_date: if removal_date:
warning_text = '{0} has been deprecated and will be removed in a release after {1}'.format(name, removal_date) warning_text = '{0} has been deprecated and will be removed in a release after {1}'.format(name, removal_date)
elif removal_version:
warning_text = '{0} has been deprecated and will be removed in version {1}'.format(name, removal_version)
else: else:
warning_text = '{0} has been deprecated and will be removed in a future release'.format(name) warning_text = '{0} has been deprecated and will be removed in a future release'.format(name)
self.deprecated = True self.deprecated = True
if removal_date: if removal_date:
self.removal_date = removal_date self.removal_date = removal_date
if removal_version:
self.removal_version = removal_version
self.deprecation_warnings.append(warning_text) self.deprecation_warnings.append(warning_text)
return self return self
@ -442,11 +451,16 @@ class PluginLoader:
if tombstone: if tombstone:
redirect = tombstone.get('redirect', None) redirect = tombstone.get('redirect', None)
removal_date = tombstone.get('removal_date') removal_date = tombstone.get('removal_date')
removal_version = tombstone.get('removal_version')
if removal_date: if removal_date:
removed_msg = '{0} was removed on {1}'.format(fq_name, removal_date) removed_msg = '{0} was removed on {1}'.format(fq_name, removal_date)
removal_version = None
elif removal_version:
removed_msg = '{0} was removed in version {1}'.format(fq_name, removal_version)
else: else:
removed_msg = '{0} was removed in a previous release'.format(fq_name) removed_msg = '{0} was removed in a previous release'.format(fq_name)
plugin_load_context.removal_date = removal_date plugin_load_context.removal_date = removal_date
plugin_load_context.removal_version = removal_version
plugin_load_context.resolved = True plugin_load_context.resolved = True
plugin_load_context.exit_reason = removed_msg plugin_load_context.exit_reason = removed_msg
return plugin_load_context return plugin_load_context