Validate ingest pipelines while packaging #426
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
ruflin
reviewed
May 4, 2020
| _, errYAML := os.Stat(yamlPipelinePath) | ||
|
|
||
| var validFound bool | ||
| if !os.IsNotExist(errJSON) { |
There was a problem hiding this comment.
Nit: Why not put the checks for each error directly after where the error happened?
util/dataset.go
Outdated
| if err != nil { | ||
| return errors.Wrapf(err, "reading ingest pipeline file failed") | ||
| } | ||
| ext := pipelinePath[strings.LastIndex(pipelinePath, ".")+1:] |
util/dataset.go
Outdated
| func validateIngestPipelineFile(pipelinePath string) error { | ||
| f, err := ioutil.ReadFile(pipelinePath) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "reading ingest pipeline file failed") |
There was a problem hiding this comment.
It would be nice to have the path reported as part of the error which makes it much easier to find which file did not parse.
ruflin
approved these changes
May 4, 2020
util/dataset.go
Outdated
| _, errJSON := os.Stat(jsonPipelinePath) | ||
| if errJSON != nil && !os.IsNotExist(errJSON) { | ||
| return errors.Wrapf(errJSON, "stat ingest pipeline JSON file failed (path: %s)", jsonPipelinePath) | ||
| } else if !os.IsNotExist(errJSON) { |
There was a problem hiding this comment.
I don't think you need an else here as if it matches before, it will return.
util/dataset.go
Outdated
| err = validateIngestPipelineFile(jsonPipelinePath) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "validating ingest pipeline JSON file failed (path: %s)", jsonPipelinePath) | ||
| } else { |
There was a problem hiding this comment.
no else needed as it returns on 167
There was a problem hiding this comment.
is it? :-D Perhaps I'm commenting too early ;-)
There was a problem hiding this comment.
I was looking on the other if-else struct. Now, it's truly fixed :D
My bad, forgot about it. Sorry! |
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:
Issue: #404