Fix folder title treatment

plugins/modules/folder.py

@@ -31,7 +31,7 @@
         required: true
         type: str
     name:
-        description: The name of your folder. If omitted defaults to the folder name.
+        description: The name (title) of your folder. If omitted defaults to the folder-name from path.
         type: str
         aliases: [title]
     attributes:
@@ -220,7 +220,11 @@ def __init__(self, module):
         (self.desired["parent"], self.desired["name"]) = self._normalize_path(
             self.params.get("path")
         )
-        self.desired["title"] = self.params.get("title", self.desired["name"])
+
+        if self.params.get("name"):
+            self.desired["title"] = self.params.get("name")
+        else:
+            self.desired["title"] = self.desired.get("name")
 
         for key in FOLDER:
             if self.params.get(key):
@@ -399,7 +403,7 @@ def _check_output(self, mode):
             content="",
             etag="",
             failed=False,
-            changed=False,
+            changed=True,
         )
 
     def needs_update(self):

tests/integration/targets/folder/tasks/test.yml

@@ -158,3 +158,86 @@
       - "{{ outer_item.site }}"
   delegate_to: localhost
   run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create folders for defaults test."
+  folder:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    path: "{{ item.path }}"
+    name: "{{ item.name | default(omit) }}"
+    state: "present"
+  loop: "{{ checkmk_var_folders_defaults_test }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Activate."
+  activation:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    force_foreign_changes: true
+    sites:
+      - "{{ outer_item.site }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Print created folders."
+  ansible.builtin.debug:
+    var: folder_title
+  vars:
+    results: "{{ lookup('checkmk.general.folders',
+                    '~',
+                    server_url=checkmk_var_server_url,
+                    site=outer_item.site,
+                    validate_certs=False,
+                    automation_user=checkmk_var_automation_user,
+                    automation_secret=checkmk_var_automation_secret)
+              }}"
+    folder_title: "{{ dict((results | map(attribute='id') | map('regex_replace', '~', '/')) | zip(results | map(attribute='title'))) }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Verify created folders."
+  ansible.builtin.assert:
+    that: "folder_title[item.path | regex_replace('~', '/') ] == item.verify_name"
+  vars:
+    results: "{{ lookup('checkmk.general.folders',
+                    '~',
+                    server_url=checkmk_var_server_url,
+                    site=outer_item.site,
+                    validate_certs=False,
+                    automation_user=checkmk_var_automation_user,
+                    automation_secret=checkmk_var_automation_secret)
+              }}"
+    folder_title: "{{ dict((results | map(attribute='id') | map('regex_replace', '~', '/')) | zip(results | map(attribute='title'))) }}"
+  loop: "{{ checkmk_var_folders_defaults_test }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Delete folders."
+  folder:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    path: "{{ item.path }}"
+    name: "{{ item.name | default(omit) }}"
+    state: "absent"
+  loop: "{{ checkmk_var_folders_defaults_test }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Activate."
+  activation:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    force_foreign_changes: true
+    sites:
+      - "{{ outer_item.site }}"
+  delegate_to: localhost
+  run_once: true  # noqa run-once[task]

tests/integration/targets/folder/vars/main.yml

@@ -35,3 +35,10 @@ checkmk_folder_attr_test:
   attributes:
     tag_criticality: "test"
     tag_networking: "dmz"
+
+checkmk_var_folders_defaults_test:
+  - path: /foo
+    verify_name: "foo"
+  - path: /bar
+    name: Bar
+    verify_name: "Bar"