[CSI] Prevent stage_publish_base_dir from being subdir of mount_dir #19441
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
|
@tgross can you take a look? |
ggriffiths
force-pushed
the
fix_19440
branch
from
fb3f373 to
1e3bcbd
Compare
tgross
requested changes
Dec 12, 2023
There was a problem hiding this comment.
Hi @ggriffiths! Thanks for the PR!
In addition to addressing the comments I've posted, can you run make cl to add a changelog entry for the fix once you're done?
ggriffiths
force-pushed
the
fix_19440
branch
from
6c3e9c4 to
b43088b
Compare
ggriffiths
force-pushed
the
fix_19440
branch
from
b43088b to
e4afe83
Compare
Signed-off-by: Grant Griffiths <[email protected]>
ggriffiths
force-pushed
the
fix_19440
branch
from
e4afe83 to
303382b
Compare
ggriffiths
commented
Dec 12, 2023
| @@ -7942,6 +7942,11 @@ func (t *Task) Validate(jobType string, tg *TaskGroup) error { | |||
| mErr.Errors = append(mErr.Errors, fmt.Errorf("CSIPluginConfig PluginType must be one of 'node', 'controller', or 'monolith', got: \"%s\"", t.CSIPluginConfig.Type)) | |||
| } | |||
|
|
|||
| if t.CSIPluginConfig.StagePublishBaseDir != "" && t.CSIPluginConfig.MountDir != "" && | |||
| strings.HasPrefix(t.CSIPluginConfig.StagePublishBaseDir, t.CSIPluginConfig.MountDir) { | |||
There was a problem hiding this comment.
I think this will handle most cases. For example, if stage_publish_base_dir=/local/csi and mount_dir=/local, then we'll error out.
However, we don't error out if stage_publish_base_dir=/csi and mount_dir=/local/csi
tgross
requested changes
Dec 13, 2023
There was a problem hiding this comment.
This looks great @ggriffiths. Just the two minor suggestions left to accept and I think we can merge this.
Co-authored-by: Tim Gross <[email protected]>
|
Sounds good. Thanks for the quick review @tgross |
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.
Fixes #19440