Collections related fixes for CI (#96)

* Update module deprecations

Switch version to `removed_at_date`

* Don't install amazon.aws from galaxy

We've been using galaxy to install amazon.aws in shippable, but that
doesn't really work if we aren't publising faster. Get that collection
from git so it is most up to date.

* We need to declare python test deps now

* missed a python dep

meta/runtime.yml

@@ -219,161 +219,161 @@ plugin_routing:
   modules:
     aws_acm_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     aws_kms_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     aws_region_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     aws_s3_bucket_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     aws_sgw_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     aws_waf_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     cloudfront_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     cloudwatchlogs_log_group_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_asg_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_customer_gateway_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_instance_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_eip_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_elb_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_lc_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_placement_group_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_endpoint_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_igw_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_nacl_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_nat_gateway_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_peering_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_route_table_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_vgw_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ec2_vpc_vpn_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ecs_service_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     ecs_taskdefinition_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     efs_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     elasticache_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     elb_application_lb_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     elb_classic_lb_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     elb_target_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     elb_target_group_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     iam_cert_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     iam_mfa_device_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     iam_role_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     iam_server_certificate_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     lambda_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     rds_instance_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     rds_snapshot_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     redshift_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details
     route53_facts:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-01
         warning_text: see plugin documentation for details

plugins/modules/aws_acm_info.py

@@ -274,7 +274,7 @@ def main():
     acm_info = ACMServiceManager(module)
 
     if module._name == 'aws_acm_facts':
-        module.deprecate("The 'aws_acm_facts' module has been renamed to 'aws_acm_info'", version='2.13')
+        module.deprecate("The 'aws_acm_facts' module has been renamed to 'aws_acm_info'", date='2021-12-01', collection_name='community.aws')
 
     client = module.client('acm')
 

plugins/modules/aws_kms.py

@@ -1052,7 +1052,7 @@ def main():
 
     if module.params.get('policy_grant_types') or mode == 'deny':
         module.deprecate('Managing the KMS IAM Policy via policy_mode and policy_grant_types is fragile'
-                         ' and has been deprecated in favour of the policy option.', version='2.13')
+                         ' and has been deprecated in favour of the policy option.', date='2021-12-01', collection_name='community.aws')
         result = update_policy_grants(kms, module, key_metadata, mode)
         module.exit_json(**result)
 

plugins/modules/aws_kms_info.py

@@ -409,7 +409,7 @@ def main():
     module = AnsibleModule(argument_spec=argument_spec,
                            supports_check_mode=True)
     if module._name == 'aws_kms_facts':
-        module.deprecate("The 'aws_kms_facts' module has been renamed to 'aws_kms_info'", version='2.13')
+        module.deprecate("The 'aws_kms_facts' module has been renamed to 'aws_kms_info'", date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO3:
         module.fail_json(msg='boto3 and botocore are required for this module')

plugins/modules/aws_region_info.py

@@ -70,7 +70,7 @@ def main():
 
     module = AnsibleAWSModule(argument_spec=argument_spec)
     if module._name == 'aws_region_facts':
-        module.deprecate("The 'aws_region_facts' module has been renamed to 'aws_region_info'", version='2.13')
+        module.deprecate("The 'aws_region_facts' module has been renamed to 'aws_region_info'", date='2021-12-01', collection_name='community.aws')
 
     connection = module.client('ec2', retry_decorator=AWSRetry.jittered_backoff())
 

plugins/modules/aws_s3_bucket_info.py

@@ -94,7 +94,7 @@ def main():
     is_old_facts = module._name == 'aws_s3_bucket_facts'
     if is_old_facts:
         module.deprecate("The 'aws_s3_bucket_facts' module has been renamed to 'aws_s3_bucket_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
+                         "and the renamed one no longer returns ansible_facts", date='2021-12-01', collection_name='community.aws')
 
     # Verify Boto3 is used
     if not HAS_BOTO3:

plugins/modules/aws_sgw_info.py

@@ -345,7 +345,7 @@ def main():
 
     module = AnsibleAWSModule(argument_spec=argument_spec)
     if module._name == 'aws_sgw_facts':
-        module.deprecate("The 'aws_sgw_facts' module has been renamed to 'aws_sgw_info'", version='2.13')
+        module.deprecate("The 'aws_sgw_facts' module has been renamed to 'aws_sgw_info'", date='2021-12-01', collection_name='community.aws')
     client = module.client('storagegateway')
 
     if client is None:  # this should never happen

plugins/modules/aws_waf_info.py

@@ -126,7 +126,7 @@ def main():
     )
     module = AnsibleAWSModule(argument_spec=argument_spec, supports_check_mode=True)
     if module._name == 'aws_waf_facts':
-        module.deprecate("The 'aws_waf_facts' module has been renamed to 'aws_waf_info'", version='2.13')
+        module.deprecate("The 'aws_waf_facts' module has been renamed to 'aws_waf_info'", date='2021-12-01', collection_name='community.aws')
 
     resource = 'waf' if not module.params['waf_regional'] else 'waf-regional'
     client = module.client(resource)

plugins/modules/cloudfront_info.py

@@ -601,7 +601,7 @@ def main():
     is_old_facts = module._name == 'cloudfront_facts'
     if is_old_facts:
         module.deprecate("The 'cloudfront_facts' module has been renamed to 'cloudfront_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
+                         "and the renamed one no longer returns ansible_facts", date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO3:
         module.fail_json(msg='boto3 is required.')

plugins/modules/cloudwatchlogs_log_group_info.py

@@ -110,7 +110,8 @@ def main():
 
     module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
     if module._name == 'cloudwatchlogs_log_group_facts':
-        module.deprecate("The 'cloudwatchlogs_log_group_facts' module has been renamed to 'cloudwatchlogs_log_group_info'", version='2.13')
+        module.deprecate("The 'cloudwatchlogs_log_group_facts' module has been renamed to 'cloudwatchlogs_log_group_info'",
+                         date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO3:
         module.fail_json(msg='boto3 is required.')

plugins/modules/data_pipeline.py

@@ -123,8 +123,7 @@
     type: dict
   version:
     description:
-      - The version option has never had any effect and will be removed in
-        Ansible 2.14
+      - The version option has never had any effect and will be removed after 2022-06-01.
     type: str
 '''
 
@@ -605,7 +604,7 @@ def main():
     argument_spec.update(
         dict(
             name=dict(required=True),
-            version=dict(removed_in_version='2.14'),
+            version=dict(removed_at_date='2022-06-01', removed_from_collection='community.aws'),
             description=dict(required=False, default=''),
             objects=dict(required=False, type='list', default=[]),
             parameters=dict(required=False, type='list', default=[]),

plugins/modules/ec2_asg_info.py

@@ -394,7 +394,7 @@ def main():
     )
     module = AnsibleAWSModule(argument_spec=argument_spec)
     if module._name == 'ec2_asg_facts':
-        module.deprecate("The 'ec2_asg_facts' module has been renamed to 'ec2_asg_info'", version='2.13')
+        module.deprecate("The 'ec2_asg_facts' module has been renamed to 'ec2_asg_info'", date='2021-12-01', collection_name='community.aws')
 
     asg_name = module.params.get('name')
     asg_tags = module.params.get('tags')

plugins/modules/ec2_customer_gateway_info.py

@@ -126,7 +126,8 @@ def main():
                               mutually_exclusive=[['customer_gateway_ids', 'filters']],
                               supports_check_mode=True)
     if module._module._name == 'ec2_customer_gateway_facts':
-        module._module.deprecate("The 'ec2_customer_gateway_facts' module has been renamed to 'ec2_customer_gateway_info'", version='2.13')
+        module._module.deprecate("The 'ec2_customer_gateway_facts' module has been renamed to 'ec2_customer_gateway_info'",
+                                 date='2021-12-01', collection_name='community.aws')
 
     connection = module.client('ec2')
 

plugins/modules/ec2_eip.py

@@ -78,7 +78,7 @@
     type: str
   wait_timeout:
     description:
-      - The I(wait_timeout) option does nothing and will be removed in Ansible 2.14.
+      - The I(wait_timeout) option does nothing and will be removed after 2022-06-01
     type: int
 extends_documentation_fragment:
 - amazon.aws.aws
@@ -525,7 +525,7 @@ def main():
                                        default=False),
         release_on_disassociation=dict(required=False, type='bool', default=False),
         allow_reassociation=dict(type='bool', default=False),
-        wait_timeout=dict(type='int', removed_in_version='2.14'),
+        wait_timeout=dict(type='int', removed_at_date='2022-06-01', removed_from_collection='community.aws'),
         private_ip_address=dict(),
         tag_name=dict(),
         tag_value=dict(),

plugins/modules/ec2_eip_info.py

@@ -133,7 +133,7 @@ def main():
         supports_check_mode=True
     )
     if module._module._name == 'ec2_eip_facts':
-        module._module.deprecate("The 'ec2_eip_facts' module has been renamed to 'ec2_eip_info'", version='2.13')
+        module._module.deprecate("The 'ec2_eip_facts' module has been renamed to 'ec2_eip_info'", date='2021-12-01', collection_name='community.aws')
 
     module.exit_json(changed=False, addresses=get_eips_details(module))
 

plugins/modules/ec2_elb_info.py

@@ -239,7 +239,7 @@ def main():
     module = AnsibleModule(argument_spec=argument_spec,
                            supports_check_mode=True)
     if module._name == 'ec2_elb_facts':
-        module.deprecate("The 'ec2_elb_facts' module has been renamed to 'ec2_elb_info'", version='2.13')
+        module.deprecate("The 'ec2_elb_facts' module has been renamed to 'ec2_elb_info'", date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO:
         module.fail_json(msg='boto required for this module')

plugins/modules/ec2_instance_info.py

@@ -551,7 +551,7 @@ def main():
                            supports_check_mode=True
                            )
     if module._name == 'ec2_instance_facts':
-        module.deprecate("The 'ec2_instance_facts' module has been renamed to 'ec2_instance_info'", version='2.13')
+        module.deprecate("The 'ec2_instance_facts' module has been renamed to 'ec2_instance_info'", date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO3:
         module.fail_json(msg='boto3 required for this module')

plugins/modules/ec2_lc.py

@@ -176,7 +176,7 @@
     choices: ['default', 'dedicated']
   associate_public_ip_address:
     description:
-      - The I(associate_public_ip_address) option does nothing and will be removed in Ansible 2.14.
+      - The I(associate_public_ip_address) option does nothing and will be removed after 2022-06-01
     type: bool
 
 extends_documentation_fragment:
@@ -669,7 +669,7 @@ def main():
             ramdisk_id=dict(),
             instance_profile_name=dict(),
             ebs_optimized=dict(default=False, type='bool'),
-            associate_public_ip_address=dict(type='bool', removed_in_version='2.14'),
+            associate_public_ip_address=dict(type='bool', removed_at_date='2022-06-01', removed_from_collection='community.aws'),
             instance_monitoring=dict(default=False, type='bool'),
             assign_public_ip=dict(type='bool'),
             classic_link_vpc_security_groups=dict(type='list'),

plugins/modules/ec2_lc_info.py

@@ -217,7 +217,7 @@ def main():
 
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name == 'ec2_lc_facts':
-        module.deprecate("The 'ec2_lc_facts' module has been renamed to 'ec2_lc_info'", version='2.13')
+        module.deprecate("The 'ec2_lc_facts' module has been renamed to 'ec2_lc_info'", date='2021-12-01', collection_name='community.aws')
 
     if not HAS_BOTO3:
         module.fail_json(msg='boto3 required for this module')