Skip to content

Commit 0bf7433

Browse files
committed
Adjust regex pattern to upstream & remove useless character conversion
1 parent 02f8839 commit 0bf7433

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,10 +1423,11 @@ def _to_slug(self, value):
14231423
return value
14241424
elif isinstance(value, int):
14251425
return value
1426-
else:
1427-
removed_chars = re.sub(r"[^\-\.\w\s]", "", value)
1428-
convert_chars = re.sub(r"[\-\.\s]", "-", removed_chars)
1429-
return convert_chars.strip().lower()
1426+
1427+
value = re.sub(r"[^\-.\w\s]", "", value)
1428+
value = re.sub(r"^[\s.]+|[\s.]+$", "", value)
1429+
value = re.sub(r"[-.\s]+", "-", value)
1430+
return value.strip().lower()
14301431

14311432
def _normalize_data(self, data):
14321433
"""
@@ -1444,10 +1445,16 @@ def _normalize_data(self, data):
14441445
pass
14451446
else:
14461447
for subk, subv in v.items():
1448+
if subk == "slug":
1449+
continue
1450+
14471451
sub_data_type = QUERY_TYPES.get(subk, "q")
14481452
if sub_data_type == "slug":
14491453
data[k][subk] = self._to_slug(subv)
14501454
else:
1455+
if k == "slug":
1456+
continue
1457+
14511458
if k == "scope":
14521459
data_type = QUERY_TYPES.get(
14531460
ENDPOINT_NAME_MAPPING[SCOPE_TO_ENDPOINT[data["scope_type"]]],

0 commit comments

Comments
 (0)