From bf57668423f58794323aa3e2cefd2abb25bbeb1b Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 19 Aug 2019 12:53:09 -0700 Subject: Bug fixes for GCP modules (#60721) --- lib/ansible/modules/cloud/google/gcp_compute_network_info.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/ansible/modules/cloud/google/gcp_compute_network_info.py') diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network_info.py b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py index aea0a38765..4ea9cc1a21 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_network_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py @@ -162,12 +162,7 @@ def main(): if not module.params['scopes']: module.params['scopes'] = ['https://www.googleapis.com/auth/compute'] - items = fetch_list(module, collection(module), query_options(module.params['filters'])) - if items.get('items'): - items = items.get('items') - else: - items = [] - return_value = {'resources': items} + return_value = {'resources': fetch_list(module, collection(module), query_options(module.params['filters']))} module.exit_json(**return_value) @@ -177,8 +172,7 @@ def collection(module): def fetch_list(module, link, query): auth = GcpSession(module, 'compute') - response = auth.get(link, params={'filter': query}) - return return_if_object(module, response) + return auth.list(link, return_if_object, array_name='items', params={'filter': query}) def query_options(filters): -- cgit v1.2.1