From 86cb2f7264ef6996558e04657eeb3232bcdce17f Mon Sep 17 00:00:00 2001 From: trbs Date: Fri, 19 Jan 2018 16:44:12 +0100 Subject: [PATCH] when in checkmode _create returns None and cannot have to_dict() called (#27) --- module_utils/k8s_common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module_utils/k8s_common.py b/module_utils/k8s_common.py index 52887111..06716e43 100644 --- a/module_utils/k8s_common.py +++ b/module_utils/k8s_common.py @@ -162,12 +162,12 @@ class KubernetesAnsibleModule(AnsibleModule): if self.helper.base_model_name_snake.endswith('list'): # For list modules, execute a GET, and exit k8s_obj = self._read(name, namespace) - return_attributes[self.kind] = k8s_obj.to_dict() + return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {} self.exit_json(**return_attributes) elif self.helper.has_method('create'): # For a rollback, execute a POST, and exit k8s_obj = self._create(namespace) - return_attributes[self.kind] = k8s_obj.to_dict() + return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {} return_attributes['changed'] = True self.exit_json(**return_attributes) else: @@ -197,7 +197,7 @@ class KubernetesAnsibleModule(AnsibleModule): else: if not existing: k8s_obj = self._create(namespace) - return_attributes[self.kind] = k8s_obj.to_dict() + return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {} return_attributes['changed'] = True self.exit_json(**return_attributes) @@ -210,7 +210,7 @@ class KubernetesAnsibleModule(AnsibleModule): except KubernetesException as exc: self.fail_json(msg="Failed to replace object: {}".format(exc.message), error=exc.value.get('status')) - return_attributes[self.kind] = k8s_obj.to_dict() + return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {} return_attributes['changed'] = True self.exit_json(**return_attributes) @@ -235,7 +235,7 @@ class KubernetesAnsibleModule(AnsibleModule): k8s_obj = self.helper.patch_object(name, namespace, k8s_obj) except KubernetesException as exc: self.fail_json(msg="Failed to patch object: {}".format(exc.message)) - return_attributes[self.kind] = k8s_obj.to_dict() + return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {} return_attributes['changed'] = True self.exit_json(**return_attributes)