Updated folder

collection/plugins/module_utils/common.py

@@ -1,36 +0,0 @@
-import json
-
-def deep_equal(a, b):
-    """
-    Compare two data structures for deep equality by converting them to JSON strings.
-
-    Parameters:
-    a (any): First data structure to compare.
-    b (any): Second data structure to compare.
-
-    Returns:
-    bool: True if the two data structures are equal, False otherwise.
-    """
-    return json.dumps(a, sort_keys=True) == json.dumps(b, sort_keys=True)
-
-def get_changes(module_params, module_args_keys_list, current_config):
-    """
-    Function to get changes by comparing module parameters with current configuration.
-
-    Args:
-        module_params (dict): The parameters of the module.
-        module_args_keys_list (list): List of keys to check in module parameters.
-        current_config (dict): The current configuration to compare against.
-
-    Returns:
-        dict: A dictionary containing the changes.
-    """
-    changes = {}
-    
-    for key, value in module_params.items():
-        if key in module_args_keys_list:
-            if value is not None:
-                if not deep_equal(value, current_config.get(key)):
-                    changes[key] = value
-    
-    return changes

collection/plugins/modules/device_defaults.py

@@ -151,7 +151,10 @@ response:
 '''
 
 from ansible_collections.community.syncthing.plugins.module_utils.syncthing_api import SyncthingModule
-from ansible_collections.community.syncthing.plugins.module_utils.common import get_changes
+import json
+
+def deep_equal(a, b):
+    return json.dumps(a, sort_keys=True) == json.dumps(b, sort_keys=True)
 
 def run_module():
     module_args = dict(
@@ -184,8 +187,17 @@ def run_module():
 
     module_args_keys_list = list(module_args.keys())
 
-     # Using get_changes function to determine what has changed
+    changes = {}
-    changes = get_changes(module.params, current_config)
+
+    for key, value in module.params.items():
+        # Check if the key is in module_args_keys_list
+        if key in module_args_keys_list:
+            # Check if the value is not None
+            if value is not None:
+                # Check if the value is different from the current_config
+                if not deep_equal(value, current_config.get(key)):
+                    # If all conditions are met, add the key-value pair to changes
+                    changes[key] = value
 
     if module.check_mode or len(changes.keys()) == 0:
         module.result['device_defaults'] = current_config

collection/plugins/modules/folder.py

@@ -53,25 +53,6 @@ options:
               remote changes.
         default: sendreceive
         choices: ['sendreceive', 'sendonly', 'receiveonly']
-    host:
-        description:
-            - Host to connect to, including port
-        default: http://127.0.0.1:8384
-    api_key:
-        description:
-            - API key to use for authentication with host.
-              If not provided, will try to auto-configure from filesystem.
-        required: false
-    config_file:
-        description:
-            - Path to the Syncthing configuration file for automatic
-              discovery (`api_key`). Note that the running user needs read
-              access to the file.
-        required: false
-    timeout:
-        description:
-            - The socket level timeout in seconds
-        default: 30
     state:
         description:
             - Use present/absent to ensure folder is shared, or not.