Merge pull request #589 from Checkmk/fix/571-folder-lookup-plugin-title

Fix folder lookup plugin title
Checkmk · May 24, 2024 · 2d8b5b9 · 2d8b5b9
2 parents 89e2007 + 2f85213
commit 2d8b5b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/changelogs/fragments/lookup_folder.yml b/changelogs/fragments/lookup_folder.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - Folder lookup module - Return the complete folder information, not only the extensions.
diff --git a/plugins/lookup/folder.py b/plugins/lookup/folder.py
@@ -165,6 +165,6 @@ def run(self, terms, variables, **kwargs):
                         response.get("msg", ""),
                     )
                 )
-            ret.append(response.get("extensions"))
+            ret.append(response)
 
         return ret
diff --git a/tests/integration/targets/lookup_folder/tasks/test.yml b/tests/integration/targets/lookup_folder/tasks/test.yml
@@ -30,9 +30,9 @@
 
 - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Get attributes of folder."
   ansible.builtin.debug:
-    msg: "Criticality of {{ checkmk_folder.name }} is {{ extensions.attributes.tag_criticality }}"
+    msg: "Criticality of {{ checkmk_folder.name }} is {{ folder.extensions.attributes.tag_criticality }}"
   vars:
-    extensions: "{{ lookup('checkmk.general.folder',
+    folder: "{{ lookup('checkmk.general.folder',
                     checkmk_folder.path,
                     server_url=checkmk_var_server_url,
                     site=outer_item.site,
@@ -45,9 +45,9 @@
 
 - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Verify folder criticality."
   ansible.builtin.assert:
-    that: "extensions.attributes.tag_criticality == checkmk_folder.criticality"
+    that: "folder.extensions.attributes.tag_criticality == checkmk_folder.criticality"
   vars:
-    extensions: "{{ lookup('checkmk.general.folder',
+    folder: "{{ lookup('checkmk.general.folder',
                     checkmk_folder.path,
                     server_url=checkmk_var_server_url,
                     site=outer_item.site,
@@ -60,9 +60,9 @@
 
 - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Use variables outside the module call."
   ansible.builtin.assert:
-    that: "extensions.attributes.tag_criticality == checkmk_folder.criticality"
+    that: "folder.extensions.attributes.tag_criticality == checkmk_folder.criticality"
   vars:
-    extensions: "{{ lookup('checkmk.general.folder', checkmk_folder.path) }}"
+    folder: "{{ lookup('checkmk.general.folder', checkmk_folder.path) }}"
   delegate_to: localhost
   run_once: true  # noqa run-once[task]
   when: outer_item.edition == "stable_cee"