From 66202c385e5af8b3ff4f0e21abfbe7c598f19635 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 21 Oct 2019 11:45:57 -0700 Subject: [PATCH] Bug fixes for GCP modules (#63607) --- .../modules/cloud/google/gcp_container_node_pool_info.py | 5 ----- .../modules/cloud/google/gcp_dns_managed_zone_info.py | 5 ----- .../modules/cloud/google/gcp_dns_resource_record_set_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_iam_role_info.py | 5 ----- .../modules/cloud/google/gcp_iam_service_account_info.py | 5 ----- .../modules/cloud/google/gcp_pubsub_subscription_info.py | 5 ----- 6 files changed, 30 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py b/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py index 51d65749272..9b32548d273 100644 --- a/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py +++ b/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_container_node_pool_info description: - Gather info for GCP NodePool -- This module was called C(gcp_container_node_pool_facts) before Ansible 2.9. The - usage has not changed. short_description: Gather info for GCP NodePool version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -412,9 +410,6 @@ import json def main(): module = GcpModule(argument_spec=dict(location=dict(required=True, type='str', aliases=['region', 'zone']), cluster=dict(required=True, type='dict'))) - if module._name == 'gcp_container_node_pool_facts': - module.deprecate("The 'gcp_container_node_pool_facts' module has been renamed to 'gcp_container_node_pool_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform'] diff --git a/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py index f751c7adee3..3f514aa2860 100644 --- a/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py +++ b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_dns_managed_zone_info description: - Gather info for GCP ManagedZone -- This module was called C(gcp_dns_managed_zone_facts) before Ansible 2.9. The usage - has not changed. short_description: Gather info for GCP ManagedZone version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -255,9 +253,6 @@ import json def main(): module = GcpModule(argument_spec=dict(dns_name=dict(type='list', elements='str'))) - if module._name == 'gcp_dns_managed_zone_facts': - module.deprecate("The 'gcp_dns_managed_zone_facts' module has been renamed to 'gcp_dns_managed_zone_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/ndev.clouddns.readwrite'] diff --git a/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py index 2b0f6c64641..97718dcddf0 100644 --- a/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py +++ b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_dns_resource_record_set_info description: - Gather info for GCP ResourceRecordSet -- This module was called C(gcp_dns_resource_record_set_facts) before Ansible 2.9. - The usage has not changed. short_description: Gather info for GCP ResourceRecordSet version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -157,9 +155,6 @@ import json def main(): module = GcpModule(argument_spec=dict(managed_zone=dict(required=True, type='dict'))) - if module._name == 'gcp_dns_resource_record_set_facts': - module.deprecate("The 'gcp_dns_resource_record_set_facts' module has been renamed to 'gcp_dns_resource_record_set_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/ndev.clouddns.readwrite'] diff --git a/lib/ansible/modules/cloud/google/gcp_iam_role_info.py b/lib/ansible/modules/cloud/google/gcp_iam_role_info.py index 4500e41a5c5..769db7374fc 100644 --- a/lib/ansible/modules/cloud/google/gcp_iam_role_info.py +++ b/lib/ansible/modules/cloud/google/gcp_iam_role_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_iam_role_info description: - Gather info for GCP Role -- This module was called C(gcp_iam_role_facts) before Ansible 2.9. The usage has not - changed. short_description: Gather info for GCP Role version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -153,9 +151,6 @@ import json def main(): module = GcpModule(argument_spec=dict()) - if module._name == 'gcp_iam_role_facts': - module.deprecate("The 'gcp_iam_role_facts' module has been renamed to 'gcp_iam_role_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/iam'] diff --git a/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py b/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py index 62ff0d4b6eb..4b9e8078946 100644 --- a/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py +++ b/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_iam_service_account_info description: - Gather info for GCP ServiceAccount -- This module was called C(gcp_iam_service_account_facts) before Ansible 2.9. The - usage has not changed. short_description: Gather info for GCP ServiceAccount version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -152,9 +150,6 @@ import json def main(): module = GcpModule(argument_spec=dict()) - if module._name == 'gcp_iam_service_account_facts': - module.deprecate("The 'gcp_iam_service_account_facts' module has been renamed to 'gcp_iam_service_account_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/iam'] diff --git a/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py b/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py index a3fd50bd23b..eceec784fb5 100644 --- a/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py +++ b/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_pubsub_subscription_info description: - Gather info for GCP Subscription -- This module was called C(gcp_pubsub_subscription_facts) before Ansible 2.9. The - usage has not changed. short_description: Gather info for GCP Subscription version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -231,9 +229,6 @@ import json def main(): module = GcpModule(argument_spec=dict()) - if module._name == 'gcp_pubsub_subscription_facts': - module.deprecate("The 'gcp_pubsub_subscription_facts' module has been renamed to 'gcp_pubsub_subscription_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/pubsub']