Bug fixes for gcp_compute_instance_group (#42816)

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

@@ -15,42 +15,36 @@
 # Pre-test setup
 - name: create a network
   gcp_compute_network:
-      name: 'network-instancegroup'
+      name: "network-instancegroup"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
       state: present
   register: network
 - name: delete a instance group
   gcp_compute_instance_group:
       name: "{{ resource_name }}"
       named_ports:
-        - name: ansible
-          port: 1234
+      - name: ansible
+        port: 1234
       network: "{{ network }}"
-      zone: 'us-central1-a'
+      zone: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
       state: absent
 #----------------------------------------------------------
 - name: create a instance group
   gcp_compute_instance_group:
       name: "{{ resource_name }}"
       named_ports:
-        - name: ansible
-          port: 1234
+      - name: ansible
+        port: 1234
       network: "{{ network }}"
-      zone: 'us-central1-a'
+      zone: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
       state: present
   register: result
 - name: assert changed is true
@@ -59,27 +53,32 @@
       - result.changed == true
       - "result.kind == 'compute#instanceGroup'"
 - name: verify that instance_group was created
-  shell: |
-    gcloud compute instance-groups unmanaged describe  --project="{{ gcp_project }}"  --zone="us-central1-a"  "{{ resource_name }}"
-  register: results
-- name: verify that command succeeded
-  assert:
-    that:
-      - results.rc == 0
-# ----------------------------------------------------------------------------
-- name: create a instance group that already exists
-  gcp_compute_instance_group:
-      name: "{{ resource_name }}"
-      named_ports:
-        - name: ansible
-          port: 1234
-      network: "{{ network }}"
-      zone: 'us-central1-a'
+  gcp_compute_instance_group_facts:
+      filters:
+         - name = {{ resource_name }}
+      zone: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
       scopes:
         - https://www.googleapis.com/auth/compute
+  register: results
+- name: verify that command succeeded
+  assert:
+    that:
+      - results['items'] | length == 1
+# ----------------------------------------------------------------------------
+- name: create a instance group that already exists
+  gcp_compute_instance_group:
+      name: "{{ resource_name }}"
+      named_ports:
+      - name: ansible
+        port: 1234
+      network: "{{ network }}"
+      zone: us-central1-a
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
       state: present
   register: result
 - name: assert changed is false
@@ -92,15 +91,13 @@
   gcp_compute_instance_group:
       name: "{{ resource_name }}"
       named_ports:
-        - name: ansible
-          port: 1234
+      - name: ansible
+        port: 1234
       network: "{{ network }}"
-      zone: 'us-central1-a'
+      zone: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
       state: absent
   register: result
 - name: assert changed is true
@@ -109,29 +106,32 @@
       - result.changed == true
       - result.has_key('kind') == False
 - name: verify that instance_group was deleted
-  shell: |
-    gcloud compute instance-groups unmanaged describe  --project="{{ gcp_project }}"  --zone="us-central1-a"  "{{ resource_name }}"
-  register: results
-  failed_when: results.rc == 0
-- name: verify that command succeeded
-  assert:
-    that:
-      - results.rc == 1
-      - "\"'projects/{{ gcp_project }}/zones/us-central1-a/instanceGroups/{{ resource_name }}' was not found\" in results.stderr"
-# ----------------------------------------------------------------------------
-- name: delete a instance group that does not exist
-  gcp_compute_instance_group:
-      name: "{{ resource_name }}"
-      named_ports:
-        - name: ansible
-          port: 1234
-      network: "{{ network }}"
-      zone: 'us-central1-a'
+  gcp_compute_instance_group_facts:
+      filters:
+         - name = {{ resource_name }}
+      zone: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
       scopes:
         - https://www.googleapis.com/auth/compute
+  register: results
+- name: verify that command succeeded
+  assert:
+    that:
+      - results['items'] | length == 0
+# ----------------------------------------------------------------------------
+- name: delete a instance group that does not exist
+  gcp_compute_instance_group:
+      name: "{{ resource_name }}"
+      named_ports:
+      - name: ansible
+        port: 1234
+      network: "{{ network }}"
+      zone: us-central1-a
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: result
 - name: assert changed is false
@@ -143,11 +143,9 @@
 # Post-test teardown
 - name: delete a network
   gcp_compute_network:
-      name: 'network-instancegroup'
+      name: "network-instancegroup"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
       state: absent
   register: network