Bug fixes for GCP modules (#63606)

12 files changed, 0 insertions, 60 deletions

diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py
index 14ed1ffcd6..868b41c791 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_ssl_certificate_info
 description:
 - Gather info for GCP SslCertificate
-- This module was called C(gcp_compute_ssl_certificate_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP SslCertificate
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -167,9 +165,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_ssl_certificate_facts':
-        module.deprecate("The 'gcp_compute_ssl_certificate_facts' module has been renamed to 'gcp_compute_ssl_certificate_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py
index da6bd64ae2..0ebb6b5d18 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_ssl_policy_info
 description:
 - Gather info for GCP SslPolicy
-- This module was called C(gcp_compute_ssl_policy_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP SslPolicy
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -205,9 +203,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_ssl_policy_facts':
-        module.deprecate("The 'gcp_compute_ssl_policy_facts' module has been renamed to 'gcp_compute_ssl_policy_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py
index e522573dfb..4eeaf725a9 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_subnetwork_info
 description:
 - Gather info for GCP Subnetwork
-- This module was called C(gcp_compute_subnetwork_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP Subnetwork
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -228,9 +226,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
-    if module._name == 'gcp_compute_subnetwork_facts':
-        module.deprecate("The 'gcp_compute_subnetwork_facts' module has been renamed to 'gcp_compute_subnetwork_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py
index d3ecfb12a6..cc4361cf16 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_http_proxy_info
 description:
 - Gather info for GCP TargetHttpProxy
-- This module was called C(gcp_compute_target_http_proxy_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP TargetHttpProxy
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -161,9 +159,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_target_http_proxy_facts':
-        module.deprecate("The 'gcp_compute_target_http_proxy_facts' module has been renamed to 'gcp_compute_target_http_proxy_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py
index 634175c85b..7629b5665d 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_https_proxy_info
 description:
 - Gather info for GCP TargetHttpsProxy
-- This module was called C(gcp_compute_target_https_proxy_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP TargetHttpsProxy
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -184,9 +182,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_target_https_proxy_facts':
-        module.deprecate("The 'gcp_compute_target_https_proxy_facts' module has been renamed to 'gcp_compute_target_https_proxy_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py
index d74771b299..b8b4ae190d 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_pool_info
 description:
 - Gather info for GCP TargetPool
-- This module was called C(gcp_compute_target_pool_facts) before Ansible 2.9. The
-  usage has not changed.
 short_description: Gather info for GCP TargetPool
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -220,9 +218,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
-    if module._name == 'gcp_compute_target_pool_facts':
-        module.deprecate("The 'gcp_compute_target_pool_facts' module has been renamed to 'gcp_compute_target_pool_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py
index b05299c243..80c8c9f861 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_ssl_proxy_info
 description:
 - Gather info for GCP TargetSslProxy
-- This module was called C(gcp_compute_target_ssl_proxy_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP TargetSslProxy
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -180,9 +178,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_target_ssl_proxy_facts':
-        module.deprecate("The 'gcp_compute_target_ssl_proxy_facts' module has been renamed to 'gcp_compute_target_ssl_proxy_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py
index 73255bc393..f09cd56f5d 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_tcp_proxy_info
 description:
 - Gather info for GCP TargetTcpProxy
-- This module was called C(gcp_compute_target_tcp_proxy_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP TargetTcpProxy
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -166,9 +164,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_target_tcp_proxy_facts':
-        module.deprecate("The 'gcp_compute_target_tcp_proxy_facts' module has been renamed to 'gcp_compute_target_tcp_proxy_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py
index 3279e9e9f5..4dcc86b7b1 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_target_vpn_gateway_info
 description:
 - Gather info for GCP TargetVpnGateway
-- This module was called C(gcp_compute_target_vpn_gateway_facts) before Ansible 2.9.
-  The usage has not changed.
 short_description: Gather info for GCP TargetVpnGateway
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -182,9 +180,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
-    if module._name == 'gcp_compute_target_vpn_gateway_facts':
-        module.deprecate("The 'gcp_compute_target_vpn_gateway_facts' module has been renamed to 'gcp_compute_target_vpn_gateway_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py
index 66194d70cf..6044cd3817 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_url_map_info
 description:
 - Gather info for GCP UrlMap
-- This module was called C(gcp_compute_url_map_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP UrlMap
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -262,9 +260,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
-    if module._name == 'gcp_compute_url_map_facts':
-        module.deprecate("The 'gcp_compute_url_map_facts' module has been renamed to 'gcp_compute_url_map_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py
index 7c618ef0d2..e87efb2a16 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_compute_vpn_tunnel_info
 description:
 - Gather info for GCP VpnTunnel
-- This module was called C(gcp_compute_vpn_tunnel_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP VpnTunnel
 version_added: '2.7'
 author: Google Inc. (@googlecloudplatform)
@@ -215,9 +213,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
-    if module._name == 'gcp_compute_vpn_tunnel_facts':
-        module.deprecate("The 'gcp_compute_vpn_tunnel_facts' module has been renamed to 'gcp_compute_vpn_tunnel_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py b/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py
index d11428aa4d..d24f6566ce 100644
--- a/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py
+++ b/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py
@@ -32,8 +32,6 @@ DOCUMENTATION = '''
 module: gcp_container_cluster_info
 description:
 - Gather info for GCP Cluster
-- This module was called C(gcp_container_cluster_facts) before Ansible 2.9. The usage
-  has not changed.
 short_description: Gather info for GCP Cluster
 version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
@@ -728,9 +726,6 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(location=dict(required=True, type='str', aliases=['region', 'zone'])))
 
-    if module._name == 'gcp_container_cluster_facts':
-        module.deprecate("The 'gcp_container_cluster_facts' module has been renamed to 'gcp_container_cluster_info'", version='2.13')
-
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']