Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

14025 fix script name checking #14030

Merged
merged 7 commits into from
Oct 17, 2023
Merged

14025 fix script name checking #14030

merged 7 commits into from
Oct 17, 2023

Conversation

arthanson
Copy link
Collaborator

@arthanson arthanson commented Oct 12, 2023

Fixes: #14025

@jeremystretch the module name checking is a bit verbose, not sure if there is a simpler way to do this.

The issue is if you have the script "test.py" module comes in as "test" and file_path is "test.py" which is why the startswith is there. If you remove startswith it won't match. I think it would be difficult at this point to change module to keep the full name with .py as I think it is stored that way.

Ideally if we could remove a potential ".py" from file_path in the filter clause but I don't think there is a way to do that. it would also work to change how the scripts are stored to include the full name but that would require a data migration with potentially incomplete historical information.

netbox/extras/views.py Outdated Show resolved Hide resolved
@arthanson arthanson closed this Oct 13, 2023
@arthanson arthanson reopened this Oct 13, 2023
@arthanson arthanson marked this pull request as ready for review October 13, 2023 17:29
@jeremystretch
Copy link
Member

Can we just use a regex to capture the portion of the file path preceding the dot? Seems like that would be sufficient.

netbox/extras/views.py Show resolved Hide resolved
netbox/core/forms/model_forms.py Outdated Show resolved Hide resolved
Copy link
Member

@jeremystretch jeremystretch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @arthanson!

@jeremystretch jeremystretch merged commit 7983c25 into develop Oct 17, 2023
8 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 17, 2023
@arthanson arthanson deleted the 14025-script-name branch May 7, 2024 14:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Exception when a script name is equal to the start of the name of another one
4 participants