Clean up deprecations (#504)

* Adjust deprecation versions.

* Remove redirects that are already made in ansible/ansible's ansible_builtin_runtime.yml

* Remove modules that were moved to the google.cloud collection according to ansible/ansible's ansible_builtin_runtime.yml.

* The _info module is in google.cloud.

* The gcp doc_fragment is a copy of the one in google.cloud and is only used by one lookup. Mark as deprecated/internal.

* Remove entries of modules that no longer exist.

* Update ignore.txt.

* Try to fix test.

* Remove debug output.

plugins/modules/cloud/digital_ocean/digital_ocean.py

@@ -13,7 +13,7 @@ DOCUMENTATION = '''
 module: digital_ocean
 short_description: Create/delete a droplet/SSH_key in DigitalOcean
 deprecated:
-  removed_in: '2.12'
+  removed_in: 2.0.0  # was Ansible 2.12
   why: Updated module to remove external dependency with increased functionality.
   alternative: Use M(digital_ocean_droplet) instead.
 description:

plugins/modules/cloud/digital_ocean/digital_ocean_account_info.py

@@ -69,7 +69,8 @@ def main():
     argument_spec = DigitalOceanHelper.digital_ocean_argument_spec()
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_account_facts', 'community.general.digital_ocean_account_facts'):
-        module.deprecate("The 'digital_ocean_account_facts' module has been renamed to 'digital_ocean_account_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_account_facts' module has been renamed to 'digital_ocean_account_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
     try:
         core(module)
     except Exception as e:

plugins/modules/cloud/digital_ocean/digital_ocean_certificate_info.py

@@ -100,7 +100,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_certificate_facts', 'community.general.digital_ocean_certificate_facts'):
-        module.deprecate("The 'digital_ocean_certificate_facts' module has been renamed to 'digital_ocean_certificate_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_certificate_facts' module has been renamed to 'digital_ocean_certificate_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_domain_info.py

@@ -125,7 +125,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_domain_facts', 'community.general.digital_ocean_domain_facts'):
-        module.deprecate("The 'digital_ocean_domain_facts' module has been renamed to 'digital_ocean_domain_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_domain_facts' module has been renamed to 'digital_ocean_domain_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_firewall_info.py

@@ -118,7 +118,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_firewall_facts', 'community.general.digital_ocean_firewall_facts'):
-        module.deprecate("The 'digital_ocean_firewall_facts' module has been renamed to 'digital_ocean_firewall_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_firewall_facts' module has been renamed to 'digital_ocean_firewall_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_floating_ip_info.py

@@ -106,7 +106,8 @@ def main():
         argument_spec=DigitalOceanHelper.digital_ocean_argument_spec()
     )
     if module._name in ('digital_ocean_floating_ip_facts', 'community.general.digital_ocean_floating_ip_facts'):
-        module.deprecate("The 'digital_ocean_floating_ip_facts' module has been renamed to 'digital_ocean_floating_ip_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_floating_ip_facts' module has been renamed to 'digital_ocean_floating_ip_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_image_info.py

@@ -135,7 +135,8 @@ def main():
 
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_image_facts', 'community.general.digital_ocean_image_facts'):
-        module.deprecate("The 'digital_ocean_image_facts' module has been renamed to 'digital_ocean_image_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_image_facts' module has been renamed to 'digital_ocean_image_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_load_balancer_info.py

@@ -102,7 +102,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_load_balancer_facts', 'community.general.digital_ocean_load_balancer_facts'):
-        module.deprecate("The 'digital_ocean_load_balancer_facts' module has been renamed to 'digital_ocean_load_balancer_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_load_balancer_facts' module has been renamed to 'digital_ocean_load_balancer_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_region_info.py

@@ -102,7 +102,8 @@ def main():
     argument_spec = DigitalOceanHelper.digital_ocean_argument_spec()
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_region_facts', 'community.general.digital_ocean_region_facts'):
-        module.deprecate("The 'digital_ocean_region_facts' module has been renamed to 'digital_ocean_region_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_region_facts' module has been renamed to 'digital_ocean_region_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_size_info.py

@@ -100,7 +100,8 @@ def main():
         argument_spec=argument_spec,
     )
     if module._name in ('digital_ocean_size_facts', 'community.general.digital_ocean_size_facts'):
-        module.deprecate("The 'digital_ocean_size_facts' module has been renamed to 'digital_ocean_size_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_size_facts' module has been renamed to 'digital_ocean_size_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_snapshot_info.py

@@ -147,7 +147,8 @@ def main():
         ],
     )
     if module._name in ('digital_ocean_snapshot_facts', 'community.general.digital_ocean_snapshot_facts'):
-        module.deprecate("The 'digital_ocean_snapshot_facts' module has been renamed to 'digital_ocean_snapshot_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_snapshot_facts' module has been renamed to 'digital_ocean_snapshot_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py

@@ -13,7 +13,7 @@ DOCUMENTATION = '''
 ---
 module: digital_ocean_sshkey_facts
 deprecated:
-  removed_in: '2.13'
+  removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
   alternative: Use M(digital_ocean_sshkey_info) instead.
 short_description: DigitalOcean SSH keys facts
@@ -91,7 +91,8 @@ def main():
         supports_check_mode=False,
     )
 
-    module.deprecate("The 'digital_ocean_sshkey_facts' module has been deprecated, use the new 'digital_ocean_sshkey_info' module", version='2.13')
+    module.deprecate("The 'digital_ocean_sshkey_facts' module has been deprecated, use the new 'digital_ocean_sshkey_info' module",
+                     version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     core(module)
 

plugins/modules/cloud/digital_ocean/digital_ocean_tag_info.py

@@ -102,7 +102,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_tag_facts', 'community.general.digital_ocean_tag_facts'):
-        module.deprecate("The 'digital_ocean_tag_facts' module has been renamed to 'digital_ocean_tag_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_tag_facts' module has been renamed to 'digital_ocean_tag_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)

plugins/modules/cloud/digital_ocean/digital_ocean_volume_info.py

@@ -127,7 +127,8 @@ def main():
     )
     module = AnsibleModule(argument_spec=argument_spec)
     if module._name in ('digital_ocean_volume_facts', 'community.general.digital_ocean_volume_facts'):
-        module.deprecate("The 'digital_ocean_volume_facts' module has been renamed to 'digital_ocean_volume_info'", version='2.13')
+        module.deprecate("The 'digital_ocean_volume_facts' module has been renamed to 'digital_ocean_volume_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     try:
         core(module)