Rename result to patched_output

ansible-collections · May 19, 2021 · 29c0c27 · 29c0c27
1 parent 2cc087c
commit 29c0c27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/molecule/default/tasks/json_patch.yml b/molecule/default/tasks/json_patch.yml
@@ -48,8 +48,8 @@
       assert:
         that:
           - result.changed
-          - result.result.metadata.labels.label2 == "bar"
-          - result.result.spec.containers[0].image == "busybox:glibc"
+          - result.patched_output.metadata.labels.label2 == "bar"
+          - result.patched_output.spec.containers[0].image == "busybox:glibc"
 
     - name: Describe pod
       kubernetes.core.k8s_info:
@@ -159,7 +159,7 @@
     - name: Assert all replicas are available
       assert:
         that:
-          - result.result.status.availableReplicas == 3
+          - result.patched_output.status.availableReplicas == 3
 
   always:
     - name: Ensure namespace has been deleted

diff --git a/plugins/modules/k8s_json_patch.py b/plugins/modules/k8s_json_patch.py
@@ -20,7 +20,7 @@
 
 version_added: 2.0.0
 
-author: 
+author:
 - Mike Graves (@gravesm)
 
 options:
@@ -84,7 +84,7 @@
 '''
 
 RETURN = r'''
-result:
+patched_output:
   description: The modified object.
   returned: success
   type: dict
@@ -249,9 +249,9 @@ def build_error_msg(kind, name, msg):
             module.fail_json(msg=msg, error=to_native(exc), status='', reason='')
 
     success = True
-    result = {"result": obj}
+    result = {"patched_output": obj}
     if wait and not module.check_mode:
-        success, result['result'], result['duration'] = k8s_module.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
+        success, result['patched_output'], result['duration'] = k8s_module.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
     match, diffs = k8s_module.diff_objects(existing.to_dict(), obj)
     result["changed"] = not match
     result["diff"] = diffs