Skip to content

Commit 5c43f37

Browse files
mabeziMarkus Ziehe
authored andcommitted
Adjust regex pattern to upstream & remove useless character conversion
1 parent e48d532 commit 5c43f37

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

plugins/module_utils/netbox_secrets.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def run(self):
3636
# Used for msg output
3737
name = data.get("name")
3838

39-
data["slug"] = self._to_slug(name)
39+
if not data.get("slug"):
40+
data["slug"] = self._to_slug(name)
4041

4142
object_query_params = self._build_query_params(
4243
endpoint_name, data, user_query_params

plugins/module_utils/netbox_utils.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ def _find_ids(self, data, user_query_params):
13511351
"tenants",
13521352
"tags",
13531353
) and isinstance(list_item, str):
1354-
temp_dict = {"slug": self._to_slug(list_item)}
1354+
temp_dict = {"slug": list_item}
13551355
elif isinstance(list_item, dict):
13561356
norm_data = self._normalize_data(list_item)
13571357
temp_dict = self._build_query_params(
@@ -1424,10 +1424,11 @@ def _to_slug(self, value):
14241424
return value
14251425
elif isinstance(value, int):
14261426
return value
1427-
else:
1428-
removed_chars = re.sub(r"[^\-\.\w\s]", "", value)
1429-
convert_chars = re.sub(r"[\-\.\s]", "-", removed_chars)
1430-
return convert_chars.strip().lower()
1427+
1428+
value = re.sub(r"[^\-.\w\s]", "", value)
1429+
value = re.sub(r"^[\s.]+|[\s.]+$", "", value)
1430+
value = re.sub(r"[-.\s]+", "-", value)
1431+
return value.strip().lower()
14311432

14321433
def _normalize_data(self, data):
14331434
"""

0 commit comments

Comments
 (0)