From 306c3508b2619725dc62600b7c79a56b35e36adf Mon Sep 17 00:00:00 2001
From: Prasad Katti <prasadmkatti@gmail.com>
Date: Wed, 8 Nov 2017 17:38:05 -0800
Subject: [PATCH] Deprecate ec2_ami_find (#32501)

---
 CHANGELOG.md                                                 | 2 ++
 .../cloud/amazon/{ec2_ami_find.py => _ec2_ami_find.py}       | 5 ++++-
 test/sanity/pep8/legacy-files.txt                            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename lib/ansible/modules/cloud/amazon/{ec2_ami_find.py => _ec2_ami_find.py} (98%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3058e763..7e0f67b7aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Ansible Changes By Release
 * The ``with_<lookup>`` loops are deprecated in favor of the new ``loop`` keyword
 
 #### Deprecated Modules (to be removed in 2.9):
+* ec2_ami_find
 
 #### Removed Modules (previously deprecated):
 * accelerate
@@ -46,6 +47,7 @@ Ansible Changes By Release
 
   * aws_ssm_parameter_store
   * digital_ocean_sshkey_facts
+  * ec2_ami_facts
 
 #### Windows
 
diff --git a/lib/ansible/modules/cloud/amazon/ec2_ami_find.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_find.py
similarity index 98%
rename from lib/ansible/modules/cloud/amazon/ec2_ami_find.py
rename to lib/ansible/modules/cloud/amazon/_ec2_ami_find.py
index 2eff822e4f..6696ec7753 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_ami_find.py
+++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_find.py
@@ -7,7 +7,7 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
@@ -16,6 +16,7 @@ DOCUMENTATION = '''
 module: ec2_ami_find
 version_added: '2.0'
 short_description: Searches for AMIs to obtain the AMI ID and other information
+deprecated: Deprecated in 2.5. Use M(ec2_ami_facts) instead.
 description:
   - Returns list of matching AMIs with AMI ID, along with other useful information
   - Can search AMIs with different owners
@@ -348,6 +349,8 @@ def main():
         supports_check_mode=True,
     )
 
+    module.deprecate("The 'ec2_ami_find' module has been deprecated. Use 'ec2_ami_facts' instead.", version=2.9)
+
     if not HAS_BOTO:
         module.fail_json(msg='boto required for this module, install via pip or your package manager')
 
diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt
index aa676d7809..9a93a31219 100644
--- a/test/sanity/pep8/legacy-files.txt
+++ b/test/sanity/pep8/legacy-files.txt
@@ -1,3 +1,4 @@
+lib/ansible/modules/cloud/amazon/_ec2_ami_find.py
 lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
 lib/ansible/modules/cloud/amazon/_ec2_remote_facts.py
 lib/ansible/modules/cloud/amazon/_ec2_vpc.py
@@ -7,7 +8,6 @@ lib/ansible/modules/cloud/amazon/cloudformation.py
 lib/ansible/modules/cloud/amazon/cloudfront_facts.py
 lib/ansible/modules/cloud/amazon/dynamodb_table.py
 lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
-lib/ansible/modules/cloud/amazon/ec2_ami_find.py
 lib/ansible/modules/cloud/amazon/ec2_elb.py
 lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
 lib/ansible/modules/cloud/amazon/ec2_eni_facts.py