Adjust regex pattern to upstream & remove useless character conversion

Author: mabezi

changelogs/fragments/1499-fix-regex-pattern.yml

@@ -1,3 +1,4 @@
 ---
 bugfixes:
-  - Fixed regex pattern for character conversion when using slug parameter in multiple modules
+  - Fixed regex pattern for character conversion for slugs
+  - Removed useless character conversion when using slug parameter in multiple modules

plugins/module_utils/netbox_secrets.py

@@ -36,7 +36,8 @@ def run(self):
         # Used for msg output
         name = data.get("name")
 
-        data["slug"] = self._to_slug(name)
+        if not data.get("slug"):
+            data["slug"] = self._to_slug(name)
 
         object_query_params = self._build_query_params(
             endpoint_name, data, user_query_params

plugins/module_utils/netbox_utils.py

@@ -1423,10 +1423,11 @@ def _to_slug(self, value):
             return value
         elif isinstance(value, int):
             return value
-        else:
-            removed_chars = re.sub(r"[^\-\.\w\s]", "", value)
-            convert_chars = re.sub(r"[\-\.\s]", "-", removed_chars)
-            return convert_chars.strip().lower()
+
+        value = re.sub(r"[^\-.\w\s]", "", value)
+        value = re.sub(r"^[\s.]+|[\s.]+$", "", value)
+        value = re.sub(r"[-.\s]+", "-", value)
+        return value.strip().lower()
 
     def _normalize_data(self, data):
         """
@@ -1444,10 +1445,16 @@ def _normalize_data(self, data):
                         pass
                 else:
                     for subk, subv in v.items():
+                        if subk == "slug":
+                            continue
+
                         sub_data_type = QUERY_TYPES.get(subk, "q")
                         if sub_data_type == "slug":
                             data[k][subk] = self._to_slug(subv)
             else:
+                if k == "slug":
+                    continue
+
                 if k == "scope":
                     data_type = QUERY_TYPES.get(
                         ENDPOINT_NAME_MAPPING[SCOPE_TO_ENDPOINT[data["scope_type"]]],