Bug fixes for GCP modules (#63608)

lib/ansible/modules/cloud/google/gcp_pubsub_topic_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_pubsub_topic_info
 description:
 - Gather info for GCP Topic
-- This module was called C(gcp_pubsub_topic_facts) before Ansible 2.9. The usage has
-  not changed.
 short_description: Gather info for GCP Topic
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -158,9 +156,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
-    if module._name == 'gcp_pubsub_topic_facts':
-        module.deprecate("The 'gcp_pubsub_topic_facts' module has been renamed to 'gcp_pubsub_topic_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/pubsub']
 

lib/ansible/modules/cloud/google/gcp_redis_instance_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_redis_instance_info
 description:
 - Gather info for GCP Instance
-- This module was called C(gcp_redis_instance_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP Instance
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -229,9 +227,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(region=dict(required=True, type='str')))
 
-    if module._name == 'gcp_redis_instance_facts':
-        module.deprecate("The 'gcp_redis_instance_facts' module has been renamed to 'gcp_redis_instance_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 

lib/ansible/modules/cloud/google/gcp_resourcemanager_project_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_resourcemanager_project_info
 description:
 - Gather info for GCP Project
-- This module was called C(gcp_resourcemanager_project_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP Project
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -179,9 +177,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
-    if module._name == 'gcp_resourcemanager_project_facts':
-        module.deprecate("The 'gcp_resourcemanager_project_facts' module has been renamed to 'gcp_resourcemanager_project_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 

lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_sourcerepo_repository_info
 description:
 - Gather info for GCP Repository
-- This module was called C(gcp_sourcerepo_repository_facts) before Ansible 2.9. The
-  usage has not changed.
 short_description: Gather info for GCP Repository
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -139,9 +137,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
-    if module._name == 'gcp_sourcerepo_repository_facts':
-        module.deprecate("The 'gcp_sourcerepo_repository_facts' module has been renamed to 'gcp_sourcerepo_repository_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 

lib/ansible/modules/cloud/google/gcp_spanner_database_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_spanner_database_info
 description:
 - Gather info for GCP Database
-- This module was called C(gcp_spanner_database_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP Database
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -152,9 +150,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='dict')))
 
-    if module._name == 'gcp_spanner_database_facts':
-        module.deprecate("The 'gcp_spanner_database_facts' module has been renamed to 'gcp_spanner_database_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/spanner.admin']
 

lib/ansible/modules/cloud/google/gcp_spanner_instance_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_spanner_instance_info
 description:
 - Gather info for GCP Instance
-- This module was called C(gcp_spanner_instance_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP Instance
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -155,9 +153,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
-    if module._name == 'gcp_spanner_instance_facts':
-        module.deprecate("The 'gcp_spanner_instance_facts' module has been renamed to 'gcp_spanner_instance_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/spanner.admin']
 

lib/ansible/modules/cloud/google/gcp_sql_database_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_sql_database_info
 description:
 - Gather info for GCP Database
-- This module was called C(gcp_sql_database_facts) before Ansible 2.9. The usage has
-  not changed.
 short_description: Gather info for GCP Database
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -155,9 +153,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='str')))
 
-    if module._name == 'gcp_sql_database_facts':
-        module.deprecate("The 'gcp_sql_database_facts' module has been renamed to 'gcp_sql_database_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']
 

lib/ansible/modules/cloud/google/gcp_sql_instance_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_sql_instance_info
 description:
 - Gather info for GCP Instance
-- This module was called C(gcp_sql_instance_facts) before Ansible 2.9. The usage has
-  not changed.
 short_description: Gather info for GCP Instance
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -432,9 +430,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
-    if module._name == 'gcp_sql_instance_facts':
-        module.deprecate("The 'gcp_sql_instance_facts' module has been renamed to 'gcp_sql_instance_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']
 

lib/ansible/modules/cloud/google/gcp_sql_user_info.py

@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_sql_user_info
 description:
 - Gather info for GCP User
-- This module was called C(gcp_sql_user_facts) before Ansible 2.9. The usage has not
-  changed.
 short_description: Gather info for GCP User
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -155,9 +153,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='dict')))
 
-    if module._name == 'gcp_sql_user_facts':
-        module.deprecate("The 'gcp_sql_user_facts' module has been renamed to 'gcp_sql_user_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']