diff options
| author | Alex Stephen <alexstephen@google.com> | 2019-01-16 09:58:57 -0800 |
|---|---|---|
| committer | ansibot <ansibot@users.noreply.github.com> | 2019-01-16 12:58:57 -0500 |
| commit | 5137bd59587ae6ab9d32643fd5436fe697f8a9f8 (patch) | |
| tree | 6920b029c545117a692b709a04cc8e462197bea3 /test/integration/targets/gcp_spanner_database | |
| parent | a7e81ba5005b8ea3136bcd89e6f8a49fcb93c60e (diff) | |
| download | ansible-5137bd59587ae6ab9d32643fd5436fe697f8a9f8.tar.gz | |
Bug fixes for GCP modules (as of 2019-01-09T15:35:45-08:00) (#50786)
Diffstat (limited to 'test/integration/targets/gcp_spanner_database')
| -rw-r--r-- | test/integration/targets/gcp_spanner_database/tasks/main.yml | 26 |
1 files changed, 18 insertions, 8 deletions
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 |