Merge pull request ansible-collections#586 from tremble/cleanup/elb

Cleanup ec2_elb*

SUMMARY
This effectively reverts ansible/ansible#30532
@wimnat originally tried to keep ec2_elb, ec2_elb_lb and their fact/info partners separate from elb_instance / elb_classic_lb so that when a boto3 migration was performed the API/return values could be changed.  We no longer have a 'preview' flag on the interface, so this is just causing duplication.

ec2_elb_info now has a boto3 based equivalent elb_classic_lb_info deprecate it so we can drop the old boto based module
elb_classic_lb was never rewritten, point it at amazon.aws.ec2_elb_lb so we only try and do the boto3 migration in one place
elb_instance was never rewritten, point ec2_elb at community.aws.elb_instance so we only try and do the boto3 migration in one place

Before we release 2.0.0 let's get this back to something vaguely consistent.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_elb
ec2_elb_lb
ec2_elb_info
elb_classic_lb
elb_classic_lb_info
ADDITIONAL INFORMATION

Reviewed-by: Jill R <None>
Reviewed-by: Markus Bergholz <[email protected]>

changelogs/fragments/586-elb-renames.yml

@@ -0,0 +1,8 @@
+minor_changes:
+- elb_instance - make elb_instance idempotent when deregistering instances.  Merged from ec2_elb U(https://github.com/ansible/ansible/pull/31660).
+deprecated_features:
+- ec2_elb - the ``ec2_elb`` module has been removed and redirected to the ``elb_instance`` module which functions identically.
+  The original ``ec2_elb`` name is now deprecated and will be removed in release 3.0.0 (https://github.com/ansible-collections/community.aws/pull/586).
+- ec2_elb_info - the boto based ``ec2_elb_info`` module has been deprecated in favour of the boto3 based ``elb_classic_lb_info`` module.
+  The ``ec2_elb_info`` module will be removed in release 3.0.0 (https://github.com/ansible-collections/community.aws/pull/586).
+- elb_classic_lb - the ``elb_classic_lb`` module has been removed and redirected to the ``amazon.aws.ec2_elb_lb`` module which functions identically.

meta/runtime.yml

@@ -294,6 +294,14 @@ plugin_routing:
           ec2_customer_gateway_facts was renamed in Ansible 2.9 to
           ec2_customer_gateway_info.
           Please update your tasks.
+    ec2_elb:
+      redirect: community.aws.elb_instance
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: >-
+          ec2_elb was renamed in community.aws 2.0.0 to
+          elb_instance.
+          Please update your tasks.
     ec2_instance:
       redirect: amazon.aws.ec2_instance
     ec2_instance_facts:
@@ -308,9 +316,17 @@ plugin_routing:
           Please update your tasks.
     ec2_elb_facts:
       deprecation:
-        removal_date: 2021-12-01
+        removal_version: 3.0.0
+        warning_text: >-
+          The ec2_elb_info module has been deprecated and replaced by
+          the elb_classic_lb_info module.
+          Please update your tasks.
+    ec2_elb_info:
+      deprecation:
+        removal_version: 3.0.0
         warning_text: >-
-          ec2_elb_facts was renamed in Ansible 2.9 to ec2_elb_info.
+          The ec2_elb_info module has been deprecated and replaced by
+          the elb_classic_lb_info module.
           Please update your tasks.
     ec2_lc_facts:
       deprecation:
@@ -411,6 +427,8 @@ plugin_routing:
           elb_application_lb_facts was renamed in Ansible 2.9 to
           elb_application_lb_info.
           Please update your tasks.
+    elb_classic_lb:
+      redirect: amazon.aws.ec2_elb_lb
     elb_classic_lb_facts:
       deprecation:
         removal_date: 2021-12-01