From c301d3b4ae1549c3798cb68ebd9618293b87ee64 Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 30 Apr 2019 10:43:45 -0700 Subject: [PATCH] replacing the items key with the resources key (#239) Signed-off-by: Modular Magician --- plugins/modules/gcp_bigquery_dataset_facts.py | 6 +++--- plugins/modules/gcp_bigquery_table_facts.py | 6 +++--- plugins/modules/gcp_cloudbuild_trigger_facts.py | 6 +++--- plugins/modules/gcp_compute_address_facts.py | 6 +++--- plugins/modules/gcp_compute_backend_bucket_facts.py | 6 +++--- plugins/modules/gcp_compute_backend_service_facts.py | 6 +++--- plugins/modules/gcp_compute_disk_facts.py | 6 +++--- plugins/modules/gcp_compute_firewall_facts.py | 6 +++--- plugins/modules/gcp_compute_forwarding_rule_facts.py | 6 +++--- plugins/modules/gcp_compute_global_address_facts.py | 6 +++--- plugins/modules/gcp_compute_global_forwarding_rule_facts.py | 6 +++--- plugins/modules/gcp_compute_health_check_facts.py | 6 +++--- plugins/modules/gcp_compute_http_health_check_facts.py | 6 +++--- plugins/modules/gcp_compute_https_health_check_facts.py | 6 +++--- plugins/modules/gcp_compute_image_facts.py | 6 +++--- plugins/modules/gcp_compute_instance_facts.py | 6 +++--- plugins/modules/gcp_compute_instance_group_facts.py | 6 +++--- plugins/modules/gcp_compute_instance_group_manager_facts.py | 6 +++--- plugins/modules/gcp_compute_instance_template_facts.py | 6 +++--- .../modules/gcp_compute_interconnect_attachment_facts.py | 6 +++--- plugins/modules/gcp_compute_network_facts.py | 6 +++--- plugins/modules/gcp_compute_region_disk_facts.py | 6 +++--- plugins/modules/gcp_compute_route_facts.py | 6 +++--- plugins/modules/gcp_compute_router_facts.py | 6 +++--- plugins/modules/gcp_compute_ssl_certificate_facts.py | 6 +++--- plugins/modules/gcp_compute_ssl_policy_facts.py | 6 +++--- plugins/modules/gcp_compute_subnetwork_facts.py | 6 +++--- plugins/modules/gcp_compute_target_http_proxy_facts.py | 6 +++--- plugins/modules/gcp_compute_target_https_proxy_facts.py | 6 +++--- plugins/modules/gcp_compute_target_pool_facts.py | 6 +++--- plugins/modules/gcp_compute_target_ssl_proxy_facts.py | 6 +++--- plugins/modules/gcp_compute_target_tcp_proxy_facts.py | 6 +++--- plugins/modules/gcp_compute_target_vpn_gateway_facts.py | 6 +++--- plugins/modules/gcp_compute_url_map_facts.py | 6 +++--- plugins/modules/gcp_compute_vpn_tunnel_facts.py | 6 +++--- plugins/modules/gcp_container_cluster_facts.py | 6 +++--- plugins/modules/gcp_container_node_pool_facts.py | 6 +++--- plugins/modules/gcp_dns_managed_zone_facts.py | 6 +++--- plugins/modules/gcp_dns_resource_record_set_facts.py | 6 +++--- plugins/modules/gcp_iam_role_facts.py | 6 +++--- plugins/modules/gcp_iam_service_account_facts.py | 6 +++--- plugins/modules/gcp_pubsub_subscription_facts.py | 6 +++--- plugins/modules/gcp_pubsub_topic_facts.py | 6 +++--- plugins/modules/gcp_redis_instance_facts.py | 6 +++--- plugins/modules/gcp_resourcemanager_project_facts.py | 6 +++--- plugins/modules/gcp_sourcerepo_repository_facts.py | 6 +++--- plugins/modules/gcp_spanner_database_facts.py | 6 +++--- plugins/modules/gcp_spanner_instance_facts.py | 6 +++--- plugins/modules/gcp_sql_database_facts.py | 6 +++--- plugins/modules/gcp_sql_instance_facts.py | 6 +++--- plugins/modules/gcp_sql_user_facts.py | 6 +++--- tests/integration/gcp_bigquery_dataset/tasks/main.yml | 4 ++-- tests/integration/gcp_bigquery_table/tasks/main.yml | 4 ++-- tests/integration/gcp_compute_region_disk/tasks/main.yml | 4 ++-- tests/integration/gcp_dns_managed_zone/tasks/main.yml | 4 ++-- tests/integration/gcp_iam_role/tasks/main.yml | 4 ++-- tests/integration/gcp_iam_service_account/tasks/main.yml | 4 ++-- tests/integration/gcp_redis_instance/tasks/main.yml | 4 ++-- .../integration/gcp_resourcemanager_project/tasks/main.yml | 4 ++-- tests/integration/gcp_sourcerepo_repository/tasks/main.yml | 4 ++-- tests/integration/gcp_sql_instance/tasks/main.yml | 4 ++-- 61 files changed, 173 insertions(+), 173 deletions(-) diff --git a/plugins/modules/gcp_bigquery_dataset_facts.py b/plugins/modules/gcp_bigquery_dataset_facts.py index ab5f7f3d..c2890120 100644 --- a/plugins/modules/gcp_bigquery_dataset_facts.py +++ b/plugins/modules/gcp_bigquery_dataset_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -209,7 +209,7 @@ def main(): items = items.get('datasets') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_bigquery_table_facts.py b/plugins/modules/gcp_bigquery_table_facts.py index 9aebcab6..404a7328 100644 --- a/plugins/modules/gcp_bigquery_table_facts.py +++ b/plugins/modules/gcp_bigquery_table_facts.py @@ -58,8 +58,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -523,7 +523,7 @@ def main(): items = items.get('tables') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_cloudbuild_trigger_facts.py b/plugins/modules/gcp_cloudbuild_trigger_facts.py index 42c4dc64..54bc9ac4 100644 --- a/plugins/modules/gcp_cloudbuild_trigger_facts.py +++ b/plugins/modules/gcp_cloudbuild_trigger_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -325,7 +325,7 @@ def main(): items = items.get('triggers') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_address_facts.py b/plugins/modules/gcp_compute_address_facts.py index 4ad44575..6bb0472c 100644 --- a/plugins/modules/gcp_compute_address_facts.py +++ b/plugins/modules/gcp_compute_address_facts.py @@ -66,8 +66,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -158,7 +158,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_backend_bucket_facts.py b/plugins/modules/gcp_compute_backend_bucket_facts.py index aa1dd499..ef174f58 100644 --- a/plugins/modules/gcp_compute_backend_bucket_facts.py +++ b/plugins/modules/gcp_compute_backend_bucket_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -142,7 +142,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_backend_service_facts.py b/plugins/modules/gcp_compute_backend_service_facts.py index c1efa953..935557f9 100644 --- a/plugins/modules/gcp_compute_backend_service_facts.py +++ b/plugins/modules/gcp_compute_backend_service_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -375,7 +375,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_disk_facts.py b/plugins/modules/gcp_compute_disk_facts.py index 7d727de1..18922351 100644 --- a/plugins/modules/gcp_compute_disk_facts.py +++ b/plugins/modules/gcp_compute_disk_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -301,7 +301,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_firewall_facts.py b/plugins/modules/gcp_compute_firewall_facts.py index 6c266d3d..073fa6bb 100644 --- a/plugins/modules/gcp_compute_firewall_facts.py +++ b/plugins/modules/gcp_compute_firewall_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -258,7 +258,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_forwarding_rule_facts.py b/plugins/modules/gcp_compute_forwarding_rule_facts.py index 3df697b9..892581f6 100644 --- a/plugins/modules/gcp_compute_forwarding_rule_facts.py +++ b/plugins/modules/gcp_compute_forwarding_rule_facts.py @@ -66,8 +66,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -259,7 +259,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_global_address_facts.py b/plugins/modules/gcp_compute_global_address_facts.py index 9344e8b7..1f4f45d5 100644 --- a/plugins/modules/gcp_compute_global_address_facts.py +++ b/plugins/modules/gcp_compute_global_address_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -138,7 +138,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_global_forwarding_rule_facts.py b/plugins/modules/gcp_compute_global_forwarding_rule_facts.py index e4d3c302..d5d74786 100644 --- a/plugins/modules/gcp_compute_global_forwarding_rule_facts.py +++ b/plugins/modules/gcp_compute_global_forwarding_rule_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -189,7 +189,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_health_check_facts.py b/plugins/modules/gcp_compute_health_check_facts.py index fd621700..10f3e544 100644 --- a/plugins/modules/gcp_compute_health_check_facts.py +++ b/plugins/modules/gcp_compute_health_check_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -313,7 +313,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_http_health_check_facts.py b/plugins/modules/gcp_compute_http_health_check_facts.py index a1c4fe54..47f0c965 100644 --- a/plugins/modules/gcp_compute_http_health_check_facts.py +++ b/plugins/modules/gcp_compute_http_health_check_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -159,7 +159,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_https_health_check_facts.py b/plugins/modules/gcp_compute_https_health_check_facts.py index 99ca9a72..ef8bec61 100644 --- a/plugins/modules/gcp_compute_https_health_check_facts.py +++ b/plugins/modules/gcp_compute_https_health_check_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -159,7 +159,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_image_facts.py b/plugins/modules/gcp_compute_image_facts.py index e6f19b09..e471494e 100644 --- a/plugins/modules/gcp_compute_image_facts.py +++ b/plugins/modules/gcp_compute_image_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -301,7 +301,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_instance_facts.py b/plugins/modules/gcp_compute_instance_facts.py index 950d95a4..aa45de39 100644 --- a/plugins/modules/gcp_compute_instance_facts.py +++ b/plugins/modules/gcp_compute_instance_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -494,7 +494,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_instance_group_facts.py b/plugins/modules/gcp_compute_instance_group_facts.py index 890758f2..e698b7c2 100644 --- a/plugins/modules/gcp_compute_instance_group_facts.py +++ b/plugins/modules/gcp_compute_instance_group_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -167,7 +167,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_instance_group_manager_facts.py b/plugins/modules/gcp_compute_instance_group_manager_facts.py index 4f0d703c..bdc3dc09 100644 --- a/plugins/modules/gcp_compute_instance_group_manager_facts.py +++ b/plugins/modules/gcp_compute_instance_group_manager_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -242,7 +242,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_instance_template_facts.py b/plugins/modules/gcp_compute_instance_template_facts.py index 61202749..a6fd9c2c 100644 --- a/plugins/modules/gcp_compute_instance_template_facts.py +++ b/plugins/modules/gcp_compute_instance_template_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -483,7 +483,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_interconnect_attachment_facts.py b/plugins/modules/gcp_compute_interconnect_attachment_facts.py index b374f4f0..db43666a 100644 --- a/plugins/modules/gcp_compute_interconnect_attachment_facts.py +++ b/plugins/modules/gcp_compute_interconnect_attachment_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -221,7 +221,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_network_facts.py b/plugins/modules/gcp_compute_network_facts.py index 3be15790..e721bc7f 100644 --- a/plugins/modules/gcp_compute_network_facts.py +++ b/plugins/modules/gcp_compute_network_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -162,7 +162,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_region_disk_facts.py b/plugins/modules/gcp_compute_region_disk_facts.py index 4ce0dfe5..09074856 100644 --- a/plugins/modules/gcp_compute_region_disk_facts.py +++ b/plugins/modules/gcp_compute_region_disk_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -247,7 +247,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_route_facts.py b/plugins/modules/gcp_compute_route_facts.py index 9e3fc2bb..f5736039 100644 --- a/plugins/modules/gcp_compute_route_facts.py +++ b/plugins/modules/gcp_compute_route_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -162,7 +162,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_router_facts.py b/plugins/modules/gcp_compute_router_facts.py index fd454ea5..c43d79e3 100644 --- a/plugins/modules/gcp_compute_router_facts.py +++ b/plugins/modules/gcp_compute_router_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -177,7 +177,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_ssl_certificate_facts.py b/plugins/modules/gcp_compute_ssl_certificate_facts.py index 12c1704e..b09b5fb2 100644 --- a/plugins/modules/gcp_compute_ssl_certificate_facts.py +++ b/plugins/modules/gcp_compute_ssl_certificate_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -126,7 +126,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_ssl_policy_facts.py b/plugins/modules/gcp_compute_ssl_policy_facts.py index 22758a32..042b6e15 100644 --- a/plugins/modules/gcp_compute_ssl_policy_facts.py +++ b/plugins/modules/gcp_compute_ssl_policy_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -164,7 +164,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_subnetwork_facts.py b/plugins/modules/gcp_compute_subnetwork_facts.py index 58d67c35..ed105b86 100644 --- a/plugins/modules/gcp_compute_subnetwork_facts.py +++ b/plugins/modules/gcp_compute_subnetwork_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -186,7 +186,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_http_proxy_facts.py b/plugins/modules/gcp_compute_target_http_proxy_facts.py index 0ae4f891..3d2b4334 100644 --- a/plugins/modules/gcp_compute_target_http_proxy_facts.py +++ b/plugins/modules/gcp_compute_target_http_proxy_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -120,7 +120,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_https_proxy_facts.py b/plugins/modules/gcp_compute_target_https_proxy_facts.py index 423fe90e..959a3708 100644 --- a/plugins/modules/gcp_compute_target_https_proxy_facts.py +++ b/plugins/modules/gcp_compute_target_https_proxy_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -143,7 +143,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_pool_facts.py b/plugins/modules/gcp_compute_target_pool_facts.py index 884cc6dc..09dec5fb 100644 --- a/plugins/modules/gcp_compute_target_pool_facts.py +++ b/plugins/modules/gcp_compute_target_pool_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -178,7 +178,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_ssl_proxy_facts.py b/plugins/modules/gcp_compute_target_ssl_proxy_facts.py index a1937543..6a1b9d26 100644 --- a/plugins/modules/gcp_compute_target_ssl_proxy_facts.py +++ b/plugins/modules/gcp_compute_target_ssl_proxy_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -139,7 +139,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_tcp_proxy_facts.py b/plugins/modules/gcp_compute_target_tcp_proxy_facts.py index ab0e0da3..6b641ee2 100644 --- a/plugins/modules/gcp_compute_target_tcp_proxy_facts.py +++ b/plugins/modules/gcp_compute_target_tcp_proxy_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -125,7 +125,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_target_vpn_gateway_facts.py b/plugins/modules/gcp_compute_target_vpn_gateway_facts.py index 91c2a47a..dda73d75 100644 --- a/plugins/modules/gcp_compute_target_vpn_gateway_facts.py +++ b/plugins/modules/gcp_compute_target_vpn_gateway_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -140,7 +140,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_url_map_facts.py b/plugins/modules/gcp_compute_url_map_facts.py index 99ed600a..97c6c7da 100644 --- a/plugins/modules/gcp_compute_url_map_facts.py +++ b/plugins/modules/gcp_compute_url_map_facts.py @@ -60,8 +60,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -221,7 +221,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_compute_vpn_tunnel_facts.py b/plugins/modules/gcp_compute_vpn_tunnel_facts.py index e67c1b4e..46c6a726 100644 --- a/plugins/modules/gcp_compute_vpn_tunnel_facts.py +++ b/plugins/modules/gcp_compute_vpn_tunnel_facts.py @@ -65,8 +65,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -167,7 +167,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_container_cluster_facts.py b/plugins/modules/gcp_container_cluster_facts.py index a19f8742..d3db9b8e 100644 --- a/plugins/modules/gcp_container_cluster_facts.py +++ b/plugins/modules/gcp_container_cluster_facts.py @@ -62,8 +62,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -411,7 +411,7 @@ def main(): items = items.get('clusters') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_container_node_pool_facts.py b/plugins/modules/gcp_container_node_pool_facts.py index aae03244..f526c058 100644 --- a/plugins/modules/gcp_container_node_pool_facts.py +++ b/plugins/modules/gcp_container_node_pool_facts.py @@ -72,8 +72,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -283,7 +283,7 @@ def main(): items = items.get('nodePools') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_dns_managed_zone_facts.py b/plugins/modules/gcp_dns_managed_zone_facts.py index 6e729dac..1d31e628 100644 --- a/plugins/modules/gcp_dns_managed_zone_facts.py +++ b/plugins/modules/gcp_dns_managed_zone_facts.py @@ -57,8 +57,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -159,7 +159,7 @@ def main(): items = items.get('managedZones') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_dns_resource_record_set_facts.py b/plugins/modules/gcp_dns_resource_record_set_facts.py index 1e3e6917..fc0bb48c 100644 --- a/plugins/modules/gcp_dns_resource_record_set_facts.py +++ b/plugins/modules/gcp_dns_resource_record_set_facts.py @@ -63,8 +63,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -117,7 +117,7 @@ def main(): items = items.get('rrsets') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_iam_role_facts.py b/plugins/modules/gcp_iam_role_facts.py index 9e24ebd6..4f675013 100644 --- a/plugins/modules/gcp_iam_role_facts.py +++ b/plugins/modules/gcp_iam_role_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -113,7 +113,7 @@ def main(): items = items.get('roles') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_iam_service_account_facts.py b/plugins/modules/gcp_iam_service_account_facts.py index 151423a2..0f4c760b 100644 --- a/plugins/modules/gcp_iam_service_account_facts.py +++ b/plugins/modules/gcp_iam_service_account_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -112,7 +112,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_pubsub_subscription_facts.py b/plugins/modules/gcp_pubsub_subscription_facts.py index 30e39be3..09a9831a 100644 --- a/plugins/modules/gcp_pubsub_subscription_facts.py +++ b/plugins/modules/gcp_pubsub_subscription_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -168,7 +168,7 @@ def main(): items = items.get('subscriptions') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_pubsub_topic_facts.py b/plugins/modules/gcp_pubsub_topic_facts.py index 466d8a66..8e3edf53 100644 --- a/plugins/modules/gcp_pubsub_topic_facts.py +++ b/plugins/modules/gcp_pubsub_topic_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -92,7 +92,7 @@ def main(): items = items.get('topics') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_redis_instance_facts.py b/plugins/modules/gcp_redis_instance_facts.py index bfdf4fe9..934f1c0b 100644 --- a/plugins/modules/gcp_redis_instance_facts.py +++ b/plugins/modules/gcp_redis_instance_facts.py @@ -58,8 +58,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -188,7 +188,7 @@ def main(): items = items.get('instances') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_resourcemanager_project_facts.py b/plugins/modules/gcp_resourcemanager_project_facts.py index 8f4be97e..512ccbf3 100644 --- a/plugins/modules/gcp_resourcemanager_project_facts.py +++ b/plugins/modules/gcp_resourcemanager_project_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -139,7 +139,7 @@ def main(): items = items.get('projects') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_sourcerepo_repository_facts.py b/plugins/modules/gcp_sourcerepo_repository_facts.py index e6c3a9a0..1104fc9d 100644 --- a/plugins/modules/gcp_sourcerepo_repository_facts.py +++ b/plugins/modules/gcp_sourcerepo_repository_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -99,7 +99,7 @@ def main(): items = items.get('repos') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_spanner_database_facts.py b/plugins/modules/gcp_spanner_database_facts.py index e5d02ce5..d3e0c579 100644 --- a/plugins/modules/gcp_spanner_database_facts.py +++ b/plugins/modules/gcp_spanner_database_facts.py @@ -63,8 +63,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -111,7 +111,7 @@ def main(): items = items.get('databases') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_spanner_instance_facts.py b/plugins/modules/gcp_spanner_instance_facts.py index c1c5d40c..7c64a9e5 100644 --- a/plugins/modules/gcp_spanner_instance_facts.py +++ b/plugins/modules/gcp_spanner_instance_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -115,7 +115,7 @@ def main(): items = items.get('instances') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_sql_database_facts.py b/plugins/modules/gcp_sql_database_facts.py index 215fef21..75806569 100644 --- a/plugins/modules/gcp_sql_database_facts.py +++ b/plugins/modules/gcp_sql_database_facts.py @@ -63,8 +63,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -113,7 +113,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_sql_instance_facts.py b/plugins/modules/gcp_sql_instance_facts.py index 9f1b9ce3..7a9bdc58 100644 --- a/plugins/modules/gcp_sql_instance_facts.py +++ b/plugins/modules/gcp_sql_instance_facts.py @@ -53,8 +53,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -373,7 +373,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/plugins/modules/gcp_sql_user_facts.py b/plugins/modules/gcp_sql_user_facts.py index 3cfe6326..5b151ef5 100644 --- a/plugins/modules/gcp_sql_user_facts.py +++ b/plugins/modules/gcp_sql_user_facts.py @@ -63,8 +63,8 @@ EXAMPLES = ''' ''' RETURN = ''' -items: - description: List of items +resources: + description: List of resources returned: always type: complex contains: @@ -114,7 +114,7 @@ def main(): items = items.get('items') else: items = [] - return_value = {'items': items} + return_value = {'resources': items} module.exit_json(**return_value) diff --git a/tests/integration/gcp_bigquery_dataset/tasks/main.yml b/tests/integration/gcp_bigquery_dataset/tasks/main.yml index 98421640..b8a3f237 100644 --- a/tests/integration/gcp_bigquery_dataset/tasks/main.yml +++ b/tests/integration/gcp_bigquery_dataset/tasks/main.yml @@ -49,7 +49,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a dataset that already exists gcp_bigquery_dataset: @@ -93,7 +93,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a dataset that does not exist gcp_bigquery_dataset: diff --git a/tests/integration/gcp_bigquery_table/tasks/main.yml b/tests/integration/gcp_bigquery_table/tasks/main.yml index 3a1fda0e..86c82820 100644 --- a/tests/integration/gcp_bigquery_table/tasks/main.yml +++ b/tests/integration/gcp_bigquery_table/tasks/main.yml @@ -66,7 +66,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a table that already exists gcp_bigquery_table: @@ -117,7 +117,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a table that does not exist gcp_bigquery_table: diff --git a/tests/integration/gcp_compute_region_disk/tasks/main.yml b/tests/integration/gcp_compute_region_disk/tasks/main.yml index f693bbe8..e18f1240 100644 --- a/tests/integration/gcp_compute_region_disk/tasks/main.yml +++ b/tests/integration/gcp_compute_region_disk/tasks/main.yml @@ -62,7 +62,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 1 + - results['resources'] | length == 1 # ---------------------------------------------------------------------------- - name: create a region disk that already exists gcp_compute_region_disk: @@ -119,7 +119,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a region disk that does not exist gcp_compute_region_disk: diff --git a/tests/integration/gcp_dns_managed_zone/tasks/main.yml b/tests/integration/gcp_dns_managed_zone/tasks/main.yml index 425836bf..e274a380 100644 --- a/tests/integration/gcp_dns_managed_zone/tasks/main.yml +++ b/tests/integration/gcp_dns_managed_zone/tasks/main.yml @@ -50,7 +50,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 1 + - results['resources'] | length == 1 # ---------------------------------------------------------------------------- - name: create a managed zone that already exists gcp_dns_managed_zone: @@ -95,7 +95,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a managed zone that does not exist gcp_dns_managed_zone: diff --git a/tests/integration/gcp_iam_role/tasks/main.yml b/tests/integration/gcp_iam_role/tasks/main.yml index 6299f760..a8f6da8e 100644 --- a/tests/integration/gcp_iam_role/tasks/main.yml +++ b/tests/integration/gcp_iam_role/tasks/main.yml @@ -56,7 +56,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a role that already exists gcp_iam_role: @@ -106,7 +106,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a role that does not exist gcp_iam_role: diff --git a/tests/integration/gcp_iam_service_account/tasks/main.yml b/tests/integration/gcp_iam_service_account/tasks/main.yml index f302e82e..52f4af97 100644 --- a/tests/integration/gcp_iam_service_account/tasks/main.yml +++ b/tests/integration/gcp_iam_service_account/tasks/main.yml @@ -46,7 +46,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a service account that already exists gcp_iam_service_account: @@ -86,7 +86,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a service account that does not exist gcp_iam_service_account: diff --git a/tests/integration/gcp_redis_instance/tasks/main.yml b/tests/integration/gcp_redis_instance/tasks/main.yml index 55febdbc..5fd54188 100644 --- a/tests/integration/gcp_redis_instance/tasks/main.yml +++ b/tests/integration/gcp_redis_instance/tasks/main.yml @@ -73,7 +73,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a instance that already exists gcp_redis_instance: @@ -132,7 +132,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a instance that does not exist gcp_redis_instance: diff --git a/tests/integration/gcp_resourcemanager_project/tasks/main.yml b/tests/integration/gcp_resourcemanager_project/tasks/main.yml index 50cb5863..d98ab5e6 100644 --- a/tests/integration/gcp_resourcemanager_project/tasks/main.yml +++ b/tests/integration/gcp_resourcemanager_project/tasks/main.yml @@ -50,7 +50,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a project that already exists gcp_resourcemanager_project: @@ -94,7 +94,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a project that does not exist gcp_resourcemanager_project: diff --git a/tests/integration/gcp_sourcerepo_repository/tasks/main.yml b/tests/integration/gcp_sourcerepo_repository/tasks/main.yml index 5d704fcb..7557acb8 100644 --- a/tests/integration/gcp_sourcerepo_repository/tasks/main.yml +++ b/tests/integration/gcp_sourcerepo_repository/tasks/main.yml @@ -44,7 +44,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a repository that already exists gcp_sourcerepo_repository: @@ -82,7 +82,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a repository that does not exist gcp_sourcerepo_repository: diff --git a/tests/integration/gcp_sql_instance/tasks/main.yml b/tests/integration/gcp_sql_instance/tasks/main.yml index eace727c..af752187 100644 --- a/tests/integration/gcp_sql_instance/tasks/main.yml +++ b/tests/integration/gcp_sql_instance/tasks/main.yml @@ -59,7 +59,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length >= 1 + - results['resources'] | length >= 1 # ---------------------------------------------------------------------------- - name: create a instance that already exists gcp_sql_instance: @@ -113,7 +113,7 @@ - name: verify that command succeeded assert: that: - - results['items'] | length == 0 + - results['resources'] | length == 0 # ---------------------------------------------------------------------------- - name: delete a instance that does not exist gcp_sql_instance: