Bug fixes for GCP modules (#55974)

lib/ansible/modules/cloud/google/gcp_compute_health_check_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -313,7 +313,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_http_health_check_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -159,7 +159,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_https_health_check_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -159,7 +159,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_image_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -301,7 +301,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_instance_facts.py

@@ -65,8 +65,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -494,7 +494,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_instance_group_facts.py

@@ -65,8 +65,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -167,7 +167,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_instance_group_manager_facts.py

@@ -65,8 +65,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -242,7 +242,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_instance_template_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -483,7 +483,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment.py

@@ -108,7 +108,8 @@ options:
     required: false
   vlan_tag8021q:
     description:
-    - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094.
+    - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094. When using
+      PARTNER type this will be managed upstream.
     required: false
   region:
     description:
@@ -249,7 +250,8 @@ candidateSubnets:
   type: list
 vlanTag8021q:
   description:
-  - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094.
+  - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094. When using
+    PARTNER type this will be managed upstream.
   returned: success
   type: int
 region:

lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_facts.py

@@ -65,8 +65,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -189,7 +189,8 @@ items:
       type: list
     vlanTag8021q:
       description:
-      - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094.
+      - The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094. When using
+        PARTNER type this will be managed upstream.
       returned: success
       type: int
     region:
@@ -221,7 +222,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_network_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -162,7 +162,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py

@@ -65,8 +65,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -247,7 +247,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

lib/ansible/modules/cloud/google/gcp_compute_route_facts.py

@@ -60,8 +60,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-items:
-  description: List of items
+resources:
+  description: List of resources
   returned: always
   type: complex
   contains:
@@ -162,7 +162,7 @@ def main():
         items = items.get('items')
     else:
         items = []
-    return_value = {'items': items}
+    return_value = {'resources': items}
     module.exit_json(**return_value)
 
 

test/integration/targets/gcp_compute_http_health_check/tasks/main.yml

@@ -55,7 +55,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a http health check that already exists
   gcp_compute_http_health_check:
@@ -105,7 +105,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a http health check that does not exist
   gcp_compute_http_health_check:

test/integration/targets/gcp_compute_https_health_check/tasks/main.yml

@@ -55,7 +55,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a https health check that already exists
   gcp_compute_https_health_check:
@@ -105,7 +105,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a https health check that does not exist
   gcp_compute_https_health_check:

test/integration/targets/gcp_compute_image/tasks/main.yml

@@ -58,7 +58,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a image that already exists
   gcp_compute_image:
@@ -102,7 +102,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a image that does not exist
   gcp_compute_image:

test/integration/targets/gcp_compute_instance/tasks/main.yml

@@ -106,7 +106,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a instance that already exists
   gcp_compute_instance:
@@ -179,7 +179,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a instance that does not exist
   gcp_compute_instance:

test/integration/targets/gcp_compute_instance_group/tasks/main.yml

@@ -66,7 +66,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a instance group that already exists
   gcp_compute_instance_group:
@@ -119,7 +119,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a instance group that does not exist
   gcp_compute_instance_group:

test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml

@@ -94,7 +94,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a instance group manager that already exists
   gcp_compute_instance_group_manager:
@@ -145,7 +145,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a instance group manager that does not exist
   gcp_compute_instance_group_manager:

test/integration/targets/gcp_compute_instance_template/tasks/main.yml

@@ -90,7 +90,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a instance template that already exists
   gcp_compute_instance_template:
@@ -158,7 +158,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a instance template that does not exist
   gcp_compute_instance_template:

test/integration/targets/gcp_compute_network/tasks/main.yml

@@ -49,7 +49,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a network that already exists
   gcp_compute_network:
@@ -93,7 +93,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a network that does not exist
   gcp_compute_network:

test/integration/targets/gcp_compute_region_disk/tasks/main.yml

@@ -62,7 +62,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a region disk that already exists
   gcp_compute_region_disk:
@@ -119,7 +119,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a region disk that does not exist
   gcp_compute_region_disk:

test/integration/targets/gcp_compute_route/tasks/main.yml

@@ -67,7 +67,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
 - name: create a route that already exists
   gcp_compute_route:
@@ -121,7 +121,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a route that does not exist
   gcp_compute_route: