From 6aa571c1b8e465d15205d020ef5248a13f21bcf2 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 24 Sep 2018 10:46:28 -0700 Subject: [PATCH] Magic Modules changes. (#97) Ensure that Ansible always returns full resource after update + no op --- plugins/modules/gcp_compute_address.py | 2 -- plugins/modules/gcp_compute_backend_bucket.py | 2 -- plugins/modules/gcp_compute_backend_service.py | 4 +--- plugins/modules/gcp_compute_disk.py | 5 ++--- plugins/modules/gcp_compute_firewall.py | 2 -- plugins/modules/gcp_compute_forwarding_rule.py | 5 ++--- plugins/modules/gcp_compute_global_address.py | 5 ++--- plugins/modules/gcp_compute_global_forwarding_rule.py | 4 +--- plugins/modules/gcp_compute_health_check.py | 2 -- plugins/modules/gcp_compute_http_health_check.py | 2 -- plugins/modules/gcp_compute_https_health_check.py | 2 -- plugins/modules/gcp_compute_image.py | 4 +--- plugins/modules/gcp_compute_instance.py | 4 +--- plugins/modules/gcp_compute_instance_group.py | 2 -- plugins/modules/gcp_compute_instance_group_manager.py | 2 -- plugins/modules/gcp_compute_instance_template.py | 2 -- plugins/modules/gcp_compute_network.py | 4 +--- plugins/modules/gcp_compute_route.py | 5 ++--- plugins/modules/gcp_compute_router.py | 2 -- plugins/modules/gcp_compute_ssl_certificate.py | 2 -- plugins/modules/gcp_compute_ssl_policy.py | 2 -- plugins/modules/gcp_compute_subnetwork.py | 5 ++--- plugins/modules/gcp_compute_target_http_proxy.py | 5 ++--- plugins/modules/gcp_compute_target_https_proxy.py | 5 ++--- plugins/modules/gcp_compute_target_pool.py | 2 -- plugins/modules/gcp_compute_target_ssl_proxy.py | 5 ++--- plugins/modules/gcp_compute_target_tcp_proxy.py | 5 ++--- plugins/modules/gcp_compute_target_vpn_gateway.py | 2 -- plugins/modules/gcp_compute_url_map.py | 2 -- plugins/modules/gcp_compute_vpn_tunnel.py | 5 ++--- plugins/modules/gcp_container_cluster.py | 2 -- plugins/modules/gcp_container_node_pool.py | 2 -- plugins/modules/gcp_dns_managed_zone.py | 4 +--- plugins/modules/gcp_dns_resource_record_set.py | 5 ++--- plugins/modules/gcp_pubsub_subscription.py | 4 +--- plugins/modules/gcp_pubsub_topic.py | 2 -- plugins/modules/gcp_spanner_database.py | 2 -- plugins/modules/gcp_spanner_instance.py | 2 -- plugins/modules/gcp_sql_database.py | 2 -- plugins/modules/gcp_sql_instance.py | 5 ++--- plugins/modules/gcp_sql_user.py | 2 -- plugins/modules/gcp_storage_bucket.py | 2 -- plugins/modules/gcp_storage_bucket_access_control.py | 2 -- 43 files changed, 31 insertions(+), 105 deletions(-) diff --git a/plugins/modules/gcp_compute_address.py b/plugins/modules/gcp_compute_address.py index ebc56bb..6af3ecc 100644 --- a/plugins/modules/gcp_compute_address.py +++ b/plugins/modules/gcp_compute_address.py @@ -240,8 +240,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_backend_bucket.py b/plugins/modules/gcp_compute_backend_bucket.py index 445fa0d..2cedd02 100644 --- a/plugins/modules/gcp_compute_backend_bucket.py +++ b/plugins/modules/gcp_compute_backend_bucket.py @@ -208,8 +208,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_backend_service.py b/plugins/modules/gcp_compute_backend_service.py index 2f92e76..00b312c 100644 --- a/plugins/modules/gcp_compute_backend_service.py +++ b/plugins/modules/gcp_compute_backend_service.py @@ -679,7 +679,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -690,8 +690,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_disk.py b/plugins/modules/gcp_compute_disk.py index 50c8479..d20daf5 100644 --- a/plugins/modules/gcp_compute_disk.py +++ b/plugins/modules/gcp_compute_disk.py @@ -436,7 +436,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -446,8 +447,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_firewall.py b/plugins/modules/gcp_compute_firewall.py index b250fb1..6aecf03 100644 --- a/plugins/modules/gcp_compute_firewall.py +++ b/plugins/modules/gcp_compute_firewall.py @@ -566,8 +566,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_forwarding_rule.py b/plugins/modules/gcp_compute_forwarding_rule.py index 2804c76..121015b 100644 --- a/plugins/modules/gcp_compute_forwarding_rule.py +++ b/plugins/modules/gcp_compute_forwarding_rule.py @@ -454,7 +454,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -464,8 +465,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_global_address.py b/plugins/modules/gcp_compute_global_address.py index 0c599e7..4cb75d2 100644 --- a/plugins/modules/gcp_compute_global_address.py +++ b/plugins/modules/gcp_compute_global_address.py @@ -192,7 +192,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -202,8 +203,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_global_forwarding_rule.py b/plugins/modules/gcp_compute_global_forwarding_rule.py index 34c87ab..92a2a92 100644 --- a/plugins/modules/gcp_compute_global_forwarding_rule.py +++ b/plugins/modules/gcp_compute_global_forwarding_rule.py @@ -410,7 +410,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -421,8 +421,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_health_check.py b/plugins/modules/gcp_compute_health_check.py index a18b02d..7075683 100644 --- a/plugins/modules/gcp_compute_health_check.py +++ b/plugins/modules/gcp_compute_health_check.py @@ -622,8 +622,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_http_health_check.py b/plugins/modules/gcp_compute_http_health_check.py index 1acf2ac..bc5105a 100644 --- a/plugins/modules/gcp_compute_http_health_check.py +++ b/plugins/modules/gcp_compute_http_health_check.py @@ -249,8 +249,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_https_health_check.py b/plugins/modules/gcp_compute_https_health_check.py index 9e5d9fe..c663c94 100644 --- a/plugins/modules/gcp_compute_https_health_check.py +++ b/plugins/modules/gcp_compute_https_health_check.py @@ -246,8 +246,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_image.py b/plugins/modules/gcp_compute_image.py index ebfd473..90920ff 100644 --- a/plugins/modules/gcp_compute_image.py +++ b/plugins/modules/gcp_compute_image.py @@ -459,7 +459,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -470,8 +470,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_instance.py b/plugins/modules/gcp_compute_instance.py index 283b094..9de3820 100644 --- a/plugins/modules/gcp_compute_instance.py +++ b/plugins/modules/gcp_compute_instance.py @@ -945,7 +945,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -956,8 +956,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} if fetch: instance = InstancePower(module, fetch.get('status')) diff --git a/plugins/modules/gcp_compute_instance_group.py b/plugins/modules/gcp_compute_instance_group.py index 017d386..4e78988 100644 --- a/plugins/modules/gcp_compute_instance_group.py +++ b/plugins/modules/gcp_compute_instance_group.py @@ -249,8 +249,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} if fetch: instance = InstanceLogic(module) diff --git a/plugins/modules/gcp_compute_instance_group_manager.py b/plugins/modules/gcp_compute_instance_group_manager.py index 7ebfd4b..5860576 100644 --- a/plugins/modules/gcp_compute_instance_group_manager.py +++ b/plugins/modules/gcp_compute_instance_group_manager.py @@ -371,8 +371,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index 44f1377..2f77802 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -924,8 +924,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_network.py b/plugins/modules/gcp_compute_network.py index 6b00846..a948ef3 100644 --- a/plugins/modules/gcp_compute_network.py +++ b/plugins/modules/gcp_compute_network.py @@ -211,7 +211,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -222,8 +222,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_route.py b/plugins/modules/gcp_compute_route.py index 521a946..9342d2f 100644 --- a/plugins/modules/gcp_compute_route.py +++ b/plugins/modules/gcp_compute_route.py @@ -287,7 +287,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind) + update(module, self_link(module), kind) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -297,8 +298,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_router.py b/plugins/modules/gcp_compute_router.py index d48a855..4740c0b 100644 --- a/plugins/modules/gcp_compute_router.py +++ b/plugins/modules/gcp_compute_router.py @@ -301,8 +301,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_ssl_certificate.py b/plugins/modules/gcp_compute_ssl_certificate.py index c149b39..00ede6a 100644 --- a/plugins/modules/gcp_compute_ssl_certificate.py +++ b/plugins/modules/gcp_compute_ssl_certificate.py @@ -200,8 +200,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_ssl_policy.py b/plugins/modules/gcp_compute_ssl_policy.py index 04803a4..0c5ea43 100644 --- a/plugins/modules/gcp_compute_ssl_policy.py +++ b/plugins/modules/gcp_compute_ssl_policy.py @@ -237,8 +237,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_subnetwork.py b/plugins/modules/gcp_compute_subnetwork.py index 1c664a7..46edc9d 100644 --- a/plugins/modules/gcp_compute_subnetwork.py +++ b/plugins/modules/gcp_compute_subnetwork.py @@ -265,7 +265,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -275,8 +276,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_http_proxy.py b/plugins/modules/gcp_compute_target_http_proxy.py index 45aeacd..7d86253 100644 --- a/plugins/modules/gcp_compute_target_http_proxy.py +++ b/plugins/modules/gcp_compute_target_http_proxy.py @@ -205,7 +205,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -215,8 +216,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_https_proxy.py b/plugins/modules/gcp_compute_target_https_proxy.py index c4e1072..e9c632e 100644 --- a/plugins/modules/gcp_compute_target_https_proxy.py +++ b/plugins/modules/gcp_compute_target_https_proxy.py @@ -278,7 +278,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -288,8 +289,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_pool.py b/plugins/modules/gcp_compute_target_pool.py index 5206506..8eab114 100644 --- a/plugins/modules/gcp_compute_target_pool.py +++ b/plugins/modules/gcp_compute_target_pool.py @@ -284,8 +284,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_ssl_proxy.py b/plugins/modules/gcp_compute_target_ssl_proxy.py index c5e4764..53abd11 100644 --- a/plugins/modules/gcp_compute_target_ssl_proxy.py +++ b/plugins/modules/gcp_compute_target_ssl_proxy.py @@ -263,7 +263,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -273,8 +274,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_tcp_proxy.py b/plugins/modules/gcp_compute_target_tcp_proxy.py index 3ffb500..98c9226 100644 --- a/plugins/modules/gcp_compute_target_tcp_proxy.py +++ b/plugins/modules/gcp_compute_target_tcp_proxy.py @@ -214,7 +214,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -224,8 +225,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_target_vpn_gateway.py b/plugins/modules/gcp_compute_target_vpn_gateway.py index 54a4fdf..29f8088 100644 --- a/plugins/modules/gcp_compute_target_vpn_gateway.py +++ b/plugins/modules/gcp_compute_target_vpn_gateway.py @@ -207,8 +207,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_url_map.py b/plugins/modules/gcp_compute_url_map.py index ef15c6b..483a3dd 100644 --- a/plugins/modules/gcp_compute_url_map.py +++ b/plugins/modules/gcp_compute_url_map.py @@ -420,8 +420,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_compute_vpn_tunnel.py b/plugins/modules/gcp_compute_vpn_tunnel.py index eab5c68..6359993 100644 --- a/plugins/modules/gcp_compute_vpn_tunnel.py +++ b/plugins/modules/gcp_compute_vpn_tunnel.py @@ -300,7 +300,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind) @@ -311,8 +312,6 @@ def main(): fetch = create(module, collection(module), kind) labels_update(module, module.params, fetch) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_container_cluster.py b/plugins/modules/gcp_container_cluster.py index d0aa3fc..72b2e9b 100644 --- a/plugins/modules/gcp_container_cluster.py +++ b/plugins/modules/gcp_container_cluster.py @@ -660,8 +660,6 @@ def main(): if state == 'present': fetch = create(module, collection(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_container_node_pool.py b/plugins/modules/gcp_container_node_pool.py index 3cfc641..2ea3695 100644 --- a/plugins/modules/gcp_container_node_pool.py +++ b/plugins/modules/gcp_container_node_pool.py @@ -488,8 +488,6 @@ def main(): if state == 'present': fetch = create(module, collection(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_dns_managed_zone.py b/plugins/modules/gcp_dns_managed_zone.py index bb1d589..c0224c8 100644 --- a/plugins/modules/gcp_dns_managed_zone.py +++ b/plugins/modules/gcp_dns_managed_zone.py @@ -204,7 +204,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind) fetch = fetch_resource(module, self_link(module), kind) changed = True else: @@ -215,8 +215,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_dns_resource_record_set.py b/plugins/modules/gcp_dns_resource_record_set.py index 0e4c908..e24a42d 100644 --- a/plugins/modules/gcp_dns_resource_record_set.py +++ b/plugins/modules/gcp_dns_resource_record_set.py @@ -189,7 +189,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind, fetch) @@ -199,8 +200,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_pubsub_subscription.py b/plugins/modules/gcp_pubsub_subscription.py index b8c5420..a2409b0 100644 --- a/plugins/modules/gcp_pubsub_subscription.py +++ b/plugins/modules/gcp_pubsub_subscription.py @@ -247,7 +247,7 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - update(module, self_link(module), fetch) + update(module, self_link(module)) fetch = fetch_resource(module, self_link(module)) changed = True else: @@ -258,8 +258,6 @@ def main(): if state == 'present': fetch = create(module, self_link(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_pubsub_topic.py b/plugins/modules/gcp_pubsub_topic.py index cd8ca05..ee31cfa 100644 --- a/plugins/modules/gcp_pubsub_topic.py +++ b/plugins/modules/gcp_pubsub_topic.py @@ -128,8 +128,6 @@ def main(): if state == 'present': fetch = create(module, self_link(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_spanner_database.py b/plugins/modules/gcp_spanner_database.py index b7b3939..8cf84ad 100644 --- a/plugins/modules/gcp_spanner_database.py +++ b/plugins/modules/gcp_spanner_database.py @@ -167,8 +167,6 @@ def main(): if state == 'present': fetch = create(module, collection(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_spanner_instance.py b/plugins/modules/gcp_spanner_instance.py index 75a16b3..05012d5 100644 --- a/plugins/modules/gcp_spanner_instance.py +++ b/plugins/modules/gcp_spanner_instance.py @@ -194,8 +194,6 @@ def main(): if state == 'present': fetch = create(module, collection(module)) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_sql_database.py b/plugins/modules/gcp_sql_database.py index fd51202..465ebbc 100644 --- a/plugins/modules/gcp_sql_database.py +++ b/plugins/modules/gcp_sql_database.py @@ -168,8 +168,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_sql_instance.py b/plugins/modules/gcp_sql_instance.py index 0c28fb2..1d7fd58 100644 --- a/plugins/modules/gcp_sql_instance.py +++ b/plugins/modules/gcp_sql_instance.py @@ -668,7 +668,8 @@ def main(): if fetch: if state == 'present': if is_different(module, fetch): - fetch = update(module, self_link(module), kind, fetch) + update(module, self_link(module), kind, fetch) + fetch = fetch_resource(module, self_link(module), kind) changed = True else: delete(module, self_link(module), kind, fetch) @@ -678,8 +679,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_sql_user.py b/plugins/modules/gcp_sql_user.py index 747d807..847daae 100644 --- a/plugins/modules/gcp_sql_user.py +++ b/plugins/modules/gcp_sql_user.py @@ -176,8 +176,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_storage_bucket.py b/plugins/modules/gcp_storage_bucket.py index 7f3fafb..4eff31b 100644 --- a/plugins/modules/gcp_storage_bucket.py +++ b/plugins/modules/gcp_storage_bucket.py @@ -832,8 +832,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed}) diff --git a/plugins/modules/gcp_storage_bucket_access_control.py b/plugins/modules/gcp_storage_bucket_access_control.py index b527256..b5a12c9 100644 --- a/plugins/modules/gcp_storage_bucket_access_control.py +++ b/plugins/modules/gcp_storage_bucket_access_control.py @@ -239,8 +239,6 @@ def main(): if state == 'present': fetch = create(module, collection(module), kind) changed = True - else: - fetch = {} fetch.update({'changed': changed})