From 1971d1111ed02d2fdfe2a7445125e3b1d0b0799d Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 21 Oct 2019 11:46:39 -0700 Subject: Bug fixes for GCP modules (#63603) --- lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_compute_address_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py | 5 ----- lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py | 5 ----- 6 files changed, 30 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py index 4007cf8e02..33d8b4db67 100644 --- a/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py +++ b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_bigquery_dataset_info description: - Gather info for GCP Dataset -- This module was called C(gcp_bigquery_dataset_facts) before Ansible 2.9. The usage - has not changed. short_description: Gather info for GCP Dataset version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -312,9 +310,6 @@ import json def main(): module = GcpModule(argument_spec=dict()) - if module._name == 'gcp_bigquery_dataset_facts': - module.deprecate("The 'gcp_bigquery_dataset_facts' module has been renamed to 'gcp_bigquery_dataset_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/bigquery'] diff --git a/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py b/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py index e3b78d6ef2..b7a113a64c 100644 --- a/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py +++ b/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_bigquery_table_info description: - Gather info for GCP Table -- This module was called C(gcp_bigquery_table_facts) before Ansible 2.9. The usage - has not changed. short_description: Gather info for GCP Table version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -587,9 +585,6 @@ import json def main(): module = GcpModule(argument_spec=dict(dataset=dict(type='str'))) - if module._name == 'gcp_bigquery_table_facts': - module.deprecate("The 'gcp_bigquery_table_facts' module has been renamed to 'gcp_bigquery_table_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/bigquery'] diff --git a/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py index 795e276a98..259d18a7f0 100644 --- a/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py +++ b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_cloudbuild_trigger_info description: - Gather info for GCP Trigger -- This module was called C(gcp_cloudbuild_trigger_facts) before Ansible 2.9. The usage - has not changed. short_description: Gather info for GCP Trigger version_added: '2.8' author: Google Inc. (@googlecloudplatform) @@ -365,9 +363,6 @@ import json def main(): module = GcpModule(argument_spec=dict()) - if module._name == 'gcp_cloudbuild_trigger_facts': - module.deprecate("The 'gcp_cloudbuild_trigger_facts' module has been renamed to 'gcp_cloudbuild_trigger_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_compute_address_info.py b/lib/ansible/modules/cloud/google/gcp_compute_address_info.py index a2e40813ee..6add106191 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_address_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_address_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_compute_address_info description: - Gather info for GCP Address -- This module was called C(gcp_compute_address_facts) before Ansible 2.9. The usage - has not changed. short_description: Gather info for GCP Address version_added: '2.7' author: Google Inc. (@googlecloudplatform) @@ -208,9 +206,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_address_facts': - module.deprecate("The 'gcp_compute_address_facts' module has been renamed to 'gcp_compute_address_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_backend_bucket_info.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py index a195ca845a..0e515cc9dd 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_compute_backend_bucket_info description: - Gather info for GCP BackendBucket -- This module was called C(gcp_compute_backend_bucket_facts) before Ansible 2.9. The - usage has not changed. short_description: Gather info for GCP BackendBucket version_added: '2.7' author: Google Inc. (@googlecloudplatform) @@ -183,9 +181,6 @@ import json def main(): module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'))) - if module._name == 'gcp_compute_backend_bucket_facts': - module.deprecate("The 'gcp_compute_backend_bucket_facts' module has been renamed to 'gcp_compute_backend_bucket_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_backend_service_info.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py index 4d17facde0..378ef45ba9 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py @@ -32,8 +32,6 @@ DOCUMENTATION = ''' module: gcp_compute_backend_service_info description: - Gather info for GCP BackendService -- This module was called C(gcp_compute_backend_service_facts) before Ansible 2.9. - The usage has not changed. short_description: Gather info for GCP BackendService version_added: '2.7' author: Google Inc. (@googlecloudplatform) @@ -419,9 +417,6 @@ import json def main(): module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'))) - if module._name == 'gcp_compute_backend_service_facts': - module.deprecate("The 'gcp_compute_backend_service_facts' module has been renamed to 'gcp_compute_backend_service_info'", version='2.13') - if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/compute'] -- cgit v1.2.1