Adds glob support for filepath in tools command #4105
Merged
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
- Adds glob check - Adds test and test files Signed-off-by: someshkoli <kolisomesh27@gmail.com>
![sonatype-lift[bot]](https://avatars.githubusercontent.com/in/9843?s=60&v=4){kind=small}
onprem
reviewed
Apr 25, 2021
cmd/thanos/tools.go
Outdated
| @@ -39,26 +41,33 @@ func checkRulesFiles(logger log.Logger, files *[]string) error { | |||
|
|
|||
| for _, fn := range *files { | |||
| level.Info(logger).Log("msg", "checking", "filename", fn) | |||
| f, err := os.Open(fn) | |||
| matches, err := filepath.Glob(fn) | |||
| if matches == nil { | |||
There was a problem hiding this comment.
We should check the err first and then matches, because matches will most likely be nil in case there is some other error and we will be overwriting that error with "Matching file not found".
Signed-off-by: someshkoli <kolisomesh27@gmail.com>
Signed-off-by: someshkoli <kolisomesh27@gmail.com>
|
Also, I guess these change should not affect e2e 🤔, not sure why its failing :\ |
GiedriusS
reviewed
Apr 26, 2021
Signed-off-by: someshkoli <kolisomesh27@gmail.com>
Signed-off-by: someshkoli <kolisomesh27@gmail.com>
GiedriusS
approved these changes
Apr 30, 2021
| failed.Add(err) | ||
| continue | ||
| } | ||
| defer func() { _ = f.Close() }() |
There was a problem hiding this comment.
Typically we'd use rununtil.CloseWithLogOnErr but since at the end the process closes immediately, this is fine. Just something to keep in mind for future contributions 👍
There was a problem hiding this comment.
Got it, Thanks 🙌
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.
Changes
Adds glob check for filepaths provided via cli. Checks for each matching file path and throws
Matching file not founderror if no file matches the pattern.fixes #4082
Verification
Added a basic unit test