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

7 files changed, 83 insertions, 51 deletions

diff --git a/test/integration/targets/gcp_pubsub_topic/tasks/main.yml b/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
index 8d1a0635c5..c26ecfbf96 100644
--- a/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
+++ b/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
@@ -44,7 +44,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - "'test-topic1' in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a topic that already exists
   gcp_pubsub_topic:
@@ -82,7 +82,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - "'test-topic1' not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a topic that does not exist
   gcp_pubsub_topic:
diff --git a/test/integration/targets/gcp_spanner_database/tasks/main.yml b/test/integration/targets/gcp_spanner_database/tasks/main.yml
index 269d2e5fd7..cc4b251db9 100644
--- a/test/integration/targets/gcp_spanner_database/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_database/tasks/main.yml
@@ -49,13 +49,18 @@
     that:
       - result.changed == true
 - name: verify that database was created
-  shell: |
-    gcloud spanner databases describe  --project="{{ gcp_project }}"  --instance="{{ instance.name }}"  "webstore"
+  gcp_spanner_database_facts:
+      instance: "{{ instance }}"
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/spanner.admin
   register: results
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 0
+      - "'webstore' in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a database that already exists
   gcp_spanner_database:
@@ -85,15 +90,18 @@
     that:
       - result.changed == true
 - name: verify that database was deleted
-  shell: |
-    gcloud spanner databases describe  --project="{{ gcp_project }}"  --instance="{{ instance.name }}"  "webstore"
+  gcp_spanner_database_facts:
+      instance: "{{ instance }}"
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/spanner.admin
   register: results
-  failed_when: results.rc == 0
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 1
-      - "\"Database not found: projects/{{ gcp_project }}/instances/instance-database/databases/webstore\" in results.stderr"
+      - "'webstore' not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a database that does not exist
   gcp_spanner_database:
@@ -110,6 +118,7 @@
       - result.changed == false
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a instance
   gcp_spanner_instance:
       name: "instance-database"
@@ -123,3 +132,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: instance
+  ignore_errors: true
diff --git a/test/integration/targets/gcp_spanner_instance/tasks/main.yml b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
index b79df29cc9..e95b890730 100644
--- a/test/integration/targets/gcp_spanner_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
@@ -44,13 +44,17 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  shell: |
-    gcloud spanner instances describe  --project="{{ gcp_project }}"  "{{ resource_name }}"
+  gcp_spanner_instance_facts:
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/spanner.admin
   register: results
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 0
+      - "\"{{resource_name}}\" in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a instance that already exists
   gcp_spanner_instance:
@@ -88,15 +92,17 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  shell: |
-    gcloud spanner instances describe  --project="{{ gcp_project }}"  "{{ resource_name }}"
+  gcp_spanner_instance_facts:
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/spanner.admin
   register: results
-  failed_when: results.rc == 0
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 1
-      - "\"Instance not found: projects/{{ gcp_project }}/instances/{{ resource_name }}\" in results.stderr"
+      - "\"{{resource_name}}\" not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a instance that does not exist
   gcp_spanner_instance:
diff --git a/test/integration/targets/gcp_sql_database/tasks/main.yml b/test/integration/targets/gcp_sql_database/tasks/main.yml
index 81226327fd..a9dd18bdf4 100644
--- a/test/integration/targets/gcp_sql_database/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_database/tasks/main.yml
@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a instance
   gcp_sql_instance:
-      name: "instance-database"
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:
@@ -54,13 +54,18 @@
       - result.changed == true
       - "result.kind == 'sql#database'"
 - name: verify that database was created
-  shell: |
-    gcloud sql databases describe  --instance='instance-database'  --project="{{ gcp_project}}"  "{{ resource_name }}"
+  gcp_sql_database_facts:
+      instance: "{{ instance }}"
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/sqlservice.admin
   register: results
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 0
+      - "\"{{resource_name}}\" in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a database that already exists
   gcp_sql_database:
@@ -94,15 +99,18 @@
       - result.changed == true
       - result.has_key('kind') == False
 - name: verify that database was deleted
-  shell: |
-    gcloud sql databases describe  --instance='instance-database'  --project="{{ gcp_project}}"  "{{ resource_name }}"
+  gcp_sql_database_facts:
+      instance: "{{ instance }}"
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/sqlservice.admin
   register: results
-  failed_when: results.rc == 0
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 1
-      - "\"(gcloud.sql.databases.describe) HTTPError 404: Not Found\" in results.stderr"
+      - "\"{{resource_name}}\" not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a database that does not exist
   gcp_sql_database:
@@ -121,9 +129,10 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a instance
   gcp_sql_instance:
-      name: "instance-database"
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:
@@ -136,3 +145,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: instance
+  ignore_errors: true
diff --git a/test/integration/targets/gcp_sql_instance/tasks/main.yml b/test/integration/targets/gcp_sql_instance/tasks/main.yml
index 5ef8f165ac..fa7690c1e8 100644
--- a/test/integration/targets/gcp_sql_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_instance/tasks/main.yml
@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -30,7 +30,7 @@
 #----------------------------------------------------------
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -49,17 +49,21 @@
       - result.changed == true
       - "result.kind == 'sql#instance'"
 - name: verify that instance was created
-  shell: |
-    gcloud sql instances describe  --project="{{ gcp_project}}"  "{{ resource_name }}"
+  gcp_sql_instance_facts:
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/sqlservice.admin
   register: results
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 0
+      - results['items'] | length >= 1
 # ----------------------------------------------------------------------------
 - name: create a instance that already exists
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -80,7 +84,7 @@
 #----------------------------------------------------------
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -99,19 +103,21 @@
       - result.changed == true
       - result.has_key('kind') == False
 - name: verify that instance was deleted
-  shell: |
-    gcloud sql instances describe  --project="{{ gcp_project}}"  "{{ resource_name }}"
+  gcp_sql_instance_facts:
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/sqlservice.admin
   register: results
-  failed_when: results.rc == 0
 - name: verify that command succeeded
   assert:
     that:
-      - results.rc == 1
-      - "\"Cloud SQL instance does not exist\" in results.stderr"
+      - results['items'] | length == 0
 # ----------------------------------------------------------------------------
 - name: delete a instance that does not exist
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
diff --git a/test/integration/targets/gcp_sql_user/tasks/main.yml b/test/integration/targets/gcp_sql_user/tasks/main.yml
index a481b394b7..ac8f8b510e 100644
--- a/test/integration/targets/gcp_sql_user/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_user/tasks/main.yml
@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a instance
   gcp_sql_instance:
-      name: "instance-user"
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:
@@ -57,8 +57,6 @@
       - "result.kind == 'sql#user'"
 - name: verify that user was created
   gcp_sql_user_facts:
-      filters:
-         - name = test-user
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -69,7 +67,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 1
+      - "'test-user' in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: create a user that already exists
   gcp_sql_user:
@@ -106,8 +104,6 @@
       - result.has_key('kind') == False
 - name: verify that user was deleted
   gcp_sql_user_facts:
-      filters:
-         - name = test-user
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -118,7 +114,7 @@
 - name: verify that command succeeded
   assert:
     that:
-      - results['items'] | length == 0
+      - "'test-user' not in \"{{ results['items'] | map(attribute='name') | list }}\""
 # ----------------------------------------------------------------------------
 - name: delete a user that does not exist
   gcp_sql_user:
@@ -138,9 +134,10 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a instance
   gcp_sql_instance:
-      name: "instance-user"
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:
@@ -153,3 +150,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: instance
+  ignore_errors: true
diff --git a/test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml b/test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml
index b9b9e763b0..c4a28f0c85 100644
--- a/test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml
+++ b/test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml
@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a bucket
   gcp_storage_bucket:
-      name: "bucket-bac"
+      name: "{{ resource_name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -96,11 +96,13 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a bucket
   gcp_storage_bucket:
-      name: "bucket-bac"
+      name: "{{ resource_name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: bucket
+  ignore_errors: true