summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Magician <magic-modules@google.com>2019-06-18 12:47:22 -0700
committeransibot <ansibot@users.noreply.github.com>2019-06-18 15:47:21 -0400
commit7733dcabd3066c2c2a5a3af606b4c4f46b8356e4 (patch)
tree7debc9e152654c1b73422d36c4d40a98eca74d83
parenta1128b6b94a487cbbdf0cbcc878a690a18675d5a (diff)
downloadansible-7733dcabd3066c2c2a5a3af606b4c4f46b8356e4.tar.gz
Bug fixes for GCP modules (#57826)
-rw-r--r--test/integration/targets/gcp_spanner_database/tasks/main.yml4
-rw-r--r--test/integration/targets/gcp_spanner_instance/tasks/main.yml4
-rw-r--r--test/integration/targets/gcp_sql_database/tasks/main.yml4
-rw-r--r--test/integration/targets/gcp_sql_user/tasks/main.yml4
4 files changed, 8 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 c059ad2e38..25b399d72c 100644
--- a/test/integration/targets/gcp_spanner_database/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_database/tasks/main.yml
@@ -60,7 +60,7 @@
- name: verify that command succeeded
assert:
that:
- - "'webstore' in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "'webstore' in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: create a database that already exists
gcp_spanner_database:
@@ -101,7 +101,7 @@
- name: verify that command succeeded
assert:
that:
- - "'webstore' not in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "'webstore' not in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: delete a database that does not exist
gcp_spanner_database:
diff --git a/test/integration/targets/gcp_spanner_instance/tasks/main.yml b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
index 15c720610d..41b1d78bee 100644
--- a/test/integration/targets/gcp_spanner_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
@@ -54,7 +54,7 @@
- name: verify that command succeeded
assert:
that:
- - "\"{{resource_name}}\" in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "\"{{resource_name}}\" in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: create a instance that already exists
gcp_spanner_instance:
@@ -102,7 +102,7 @@
- name: verify that command succeeded
assert:
that:
- - "\"{{resource_name}}\" not in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "\"{{resource_name}}\" not in \"{{ results['resources'] | 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 5321004694..6c9f732e2e 100644
--- a/test/integration/targets/gcp_sql_database/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_database/tasks/main.yml
@@ -65,7 +65,7 @@
- name: verify that command succeeded
assert:
that:
- - "\"{{resource_name}}\" in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "\"{{resource_name}}\" in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: create a database that already exists
gcp_sql_database:
@@ -110,7 +110,7 @@
- name: verify that command succeeded
assert:
that:
- - "\"{{resource_name}}\" not in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "\"{{resource_name}}\" not in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: delete a database that does not exist
gcp_sql_database:
diff --git a/test/integration/targets/gcp_sql_user/tasks/main.yml b/test/integration/targets/gcp_sql_user/tasks/main.yml
index 653308c764..ec342de0a6 100644
--- a/test/integration/targets/gcp_sql_user/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_user/tasks/main.yml
@@ -67,7 +67,7 @@
- name: verify that command succeeded
assert:
that:
- - "'test-user' in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "'test-user' in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: create a user that already exists
gcp_sql_user:
@@ -114,7 +114,7 @@
- name: verify that command succeeded
assert:
that:
- - "'test-user' not in \"{{ results['items'] | map(attribute='name') | list }}\""
+ - "'test-user' not in \"{{ results['resources'] | map(attribute='name') | list }}\""
# ----------------------------------------------------------------------------
- name: delete a user that does not exist
gcp_sql_user: