Make shared.IsSnapshot() a bit more strict
#14577
Draft
+83
−75
Conversation
This file contains 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
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
simondeziel
force-pushed
the
IsSnapshot
branch
from
3c4ab2e
to
9b1edc8
Compare
simondeziel
force-pushed
the
IsSnapshot
branch
from
9b1edc8
to
3b81126
Compare
Avoid accessing slice out of bound if no `%d` is present in the pattern. The snapshot pattern doesn't need `%d` to be escaped now that `Sprintf` isn't used. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
…itting Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Avoid accessing slice out of bound if no `%d` is present in the pattern. The snapshot pattern doesn't need `%d` to be escaped now that `Sprintf` isn't used. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
The validate.IsHostname() already rejects `/` so there is no need to explicitly check for `/` in the instance name. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
simondeziel
force-pushed
the
IsSnapshot
branch
from
3b81126
to
b952518
Compare
tomponline
reviewed
Dec 4, 2024
| parts := strings.SplitN(name, shared.SnapshotDelimiter, 2) | ||
| instanceName := parts[0] | ||
| snapshotName := parts[1] | ||
| if shared.IsSnapshot(name) { |
There was a problem hiding this comment.
Maybe we should just use api.GetParentAndSnapshotName everywhere (or at least in more places) and update it to use strings.Cut. This way we don't have to repeat the check for / in the string.
tomponline
reviewed
Dec 4, 2024
| @@ -651,9 +651,10 @@ func (r BytesReadCloser) Close() error { | |||
| return nil | |||
| } | |||
|
|
|||
| // IsSnapshot returns true if a given name contains the snapshot delimiter. | |||
| // IsSnapshot returns true if a given name contains a snapshot delimiter not at the end. | |||
| func IsSnapshot(name string) bool { | |||
There was a problem hiding this comment.
Probably we should centralise the "is snapshot/extract snapshot parts" into api.GetParentAndSnapshotName instead.
tomponline
reviewed
Dec 4, 2024
There was a problem hiding this comment.
I've not gone through this in detail yet, but one comment is that we've consciously avoided using IsSnapshot or api.GetParentAndSnapshotName in the past in places where the variable being checked isn't representing a possible instance or volume fully qualified snapshot name.
I.e instance backups follows the same style but they represent different things and could evolve separately, so maybe we also need a separate function for other conceptual fully qualified entities.
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.
No description provided.