ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-04-09 04:10:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix get_project_disks to process all responses

Browse source 
The code to process the reponses was not indented correctly so it would
only process the last projects response.

Fixes #651
This commit is contained in:
Bill Peck 2025-04-02 12:37:48 -04:00
parent 99ac225a1a
commit fdcf1fa1fd
No known key found for this signature in database
GPG key ID: 4F58AAF36968538F
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
plugins/inventory/gcp_compute.py
View file

@ -487,38 +487,38 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
session_responses.append(response_json) session_responses.append(response_json)
page_token = "pageToken" in request_params page_token = "pageToken" in request_params
for response in session_responses: for response in session_responses:
if "items" in response: if "items" in response:
# example k would be a zone or region name # example k would be a zone or region name
# example v would be { "disks" : [], "otherkey" : "..." } # example v would be { "disks" : [], "otherkey" : "..." }
for zone_or_region, aggregate in response["items"].items(): for zone_or_region, aggregate in response["items"].items():
if "zones" in zone_or_region: if "zones" in zone_or_region:
if "disks" in aggregate: if "disks" in aggregate:
zone = zone_or_region.replace("zones/", "") zone = zone_or_region.replace("zones/", "")
for disk in aggregate["disks"]: for disk in aggregate["disks"]:
if ( if (
"zones" in config_data "zones" in config_data
and zone in config_data["zones"] and zone in config_data["zones"]
): ):
# If zones specified, only store those zones' data # If zones specified, only store those zones' data
if "sourceImage" in disk: if "sourceImage" in disk:
self._project_disks[ self._project_disks[
disk["selfLink"] disk["selfLink"]
] = disk["sourceImage"].split("/")[-1] ] = disk["sourceImage"].split("/")[-1]
else: else:
self._project_disks[ self._project_disks[
disk["selfLink"] disk["selfLink"]
] = disk["selfLink"].split("/")[-1] ] = disk["selfLink"].split("/")[-1]
else:
if "sourceImage" in disk:
self._project_disks[
disk["selfLink"]
] = disk["sourceImage"].split("/")[-1]
else: else:
self._project_disks[ if "sourceImage" in disk:
disk["selfLink"] self._project_disks[
] = disk["selfLink"].split("/")[-1] disk["selfLink"]
] = disk["sourceImage"].split("/")[-1]
else:
self._project_disks[
disk["selfLink"]
] = disk["selfLink"].split("/")[-1]
return self._project_disks return self._project_disks