Don't delete PVC if it may be shared by others#883
Open
manics wants to merge 2 commits into
Open
Conversation
minrk
reviewed
Sep 3, 2025
| if ( | ||
| not self.name | ||
| and '{user_server}' not in self.pvc_name_template | ||
| and '{username}' not in self.pvc_name_template |
Member
There was a problem hiding this comment.
Sorry for leaving this hanging for so long, but these aren't the only username-sensitive template fields (anymore). We could remove the leading { on both and it would capture {escaped_username}, {safe_user_server}, etc.. There is also the userid field.
Another, looser check would be to look for the strings username and user_server without the bran.
Another, more rigorous check is to use Formatter.parse to extract the fields and check them directly, rather than substring matching:
from string import Formatter
format_fields = [f[1] for f in Formatter().parse(s) if f[1] is not None]
user_sensitive = False
for (_literal_text, field_name, _format_spec, _conversion) in Formatter().parse(template):
if field_name and 'user' in field_name:
# template is user-sensitive
user_sensitive = TrueOtherwise, 👍 to the change.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #880
I've expanded
test_delete_pvcto test changes in the pvc template.