Bug fixes for GCP modules (as of 2019-01-09T15:35:45-08:00) (#50785)

tests/integration/gcp_container_cluster/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: delete a cluster
   gcp_container_cluster:
-      name: "{{ resource_name }}"
+      name: my-cluster
       initial_node_count: 2
       master_auth:
         username: cluster_admin
@@ -31,7 +31,7 @@
 #----------------------------------------------------------
 - name: create a cluster
   gcp_container_cluster:
-      name: "{{ resource_name }}"
+      name: my-cluster
       initial_node_count: 2
       master_auth:
         username: cluster_admin
@@ -50,17 +50,22 @@
     that:
       - result.changed == true
 - name: verify that cluster was created
-  shell: |
-    gcloud container clusters describe  --project="{{ gcp_project}}"  --zone=us-central1-a  "{{ resource_name }}"
+  gcp_container_cluster_facts:
+      zone: us-central1-a
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/cloud-platform
   register: results
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 0
+      - "'my-cluster' in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a cluster that already exists
   gcp_container_cluster:
-      name: "{{ resource_name }}"
+      name: my-cluster
       initial_node_count: 2
       master_auth:
         username: cluster_admin
@@ -81,7 +86,7 @@
 #----------------------------------------------------------
 - name: delete a cluster
   gcp_container_cluster:
-      name: "{{ resource_name }}"
+      name: my-cluster
       initial_node_count: 2
       master_auth:
         username: cluster_admin
@@ -100,19 +105,22 @@
     that:
       - result.changed == true
 - name: verify that cluster was deleted
-  shell: |
-    gcloud container clusters describe  --project="{{ gcp_project}}"  --zone=us-central1-a  "{{ resource_name }}"
+  gcp_container_cluster_facts:
+      zone: us-central1-a
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/cloud-platform
   register: results
-  failed_when: results.rc == 0
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 1
-      - "\"No cluster named '{{ resource_name }}' in {{ gcp_project }}.\" in results.stderr"
+      - "'my-cluster' not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a cluster that does not exist
   gcp_container_cluster:
-      name: "{{ resource_name }}"
+      name: my-cluster
       initial_node_count: 2
       master_auth:
         username: cluster_admin