From 7085a069258abdb20f0acfdba70f85b2adae5162 Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 16 Aug 2019 16:47:16 -0700 Subject: [PATCH] issue with async + decoders (#357) Signed-off-by: Modular Magician --- plugins/modules/gcp_compute_instance.py | 6 +++++- plugins/modules/gcp_compute_instance_template.py | 6 +++++- plugins/modules/gcp_compute_target_pool.py | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/modules/gcp_compute_instance.py b/plugins/modules/gcp_compute_instance.py index a4a2181..49f6ca8 100644 --- a/plugins/modules/gcp_compute_instance.py +++ b/plugins/modules/gcp_compute_instance.py @@ -1270,7 +1270,11 @@ def wait_for_operation(module, response): return {} status = navigate_hash(op_result, ['status']) wait_done = wait_for_completion(status, op_result, module) - return decode_response(fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#instance'), module) + response = fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#instance') + if response: + return decode_response(response, module) + else: + return {} def wait_for_completion(status, op_result, module): diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index ff52c84..975de80 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -1117,7 +1117,11 @@ def wait_for_operation(module, response): return {} status = navigate_hash(op_result, ['status']) wait_done = wait_for_completion(status, op_result, module) - return decode_response(fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#instanceTemplate'), module) + response = fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#instanceTemplate') + if response: + return decode_response(response, module) + else: + return {} def wait_for_completion(status, op_result, module): diff --git a/plugins/modules/gcp_compute_target_pool.py b/plugins/modules/gcp_compute_target_pool.py index d1c870c..366d50b 100644 --- a/plugins/modules/gcp_compute_target_pool.py +++ b/plugins/modules/gcp_compute_target_pool.py @@ -419,7 +419,11 @@ def wait_for_operation(module, response): return {} status = navigate_hash(op_result, ['status']) wait_done = wait_for_completion(status, op_result, module) - return decode_response(fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#targetPool'), module) + response = fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#targetPool') + if response: + return decode_response(response, module) + else: + return {} def wait_for_completion(status, op_result, module):