From cb8f645e0f5f52f40c8d309713aba948458b9857 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 27 May 2020 03:43:40 +0200
Subject: [PATCH] Allow to deprecate / remove plugins by version. (#69712)

---
 lib/ansible/plugins/loader.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py
index e52eebc49a1..eb07d044b11 100644
--- a/lib/ansible/plugins/loader.py
+++ b/lib/ansible/plugins/loader.py
@@ -126,6 +126,7 @@ class PluginLoadContext(object):
         self.plugin_resolved_name = None
         self.deprecated = False
         self.removal_date = None
+        self.removal_version = None
         self.deprecation_warnings = []
         self.resolved = False
 
@@ -135,15 +136,23 @@ class PluginLoadContext(object):
 
         warning_text = deprecation.get('warning_text', 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 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:
                 warning_text = '{0} has been deprecated and will be removed in a future release'.format(name)
 
         self.deprecated = True
         if removal_date:
             self.removal_date = removal_date
+        if removal_version:
+            self.removal_version = removal_version
         self.deprecation_warnings.append(warning_text)
         return self
 
@@ -442,11 +451,16 @@ class PluginLoader:
             if tombstone:
                 redirect = tombstone.get('redirect', None)
                 removal_date = tombstone.get('removal_date')
+                removal_version = tombstone.get('removal_version')
                 if 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:
                     removed_msg = '{0} was removed in a previous release'.format(fq_name)
                 plugin_load_context.removal_date = removal_date
+                plugin_load_context.removal_version = removal_version
                 plugin_load_context.resolved = True
                 plugin_load_context.exit_reason = removed_msg
                 return plugin_load_context