fix(report): close the file #4842
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
3 tasks
DmitriyLewen
approved these changes
Jul 20, 2023
pkg/report/writer.go
Outdated
Comment on lines
82
to
90
| output := os.Stdout | ||
| if option.Output != "" { | ||
| f, err := os.Create(option.Output) | ||
| if err != nil { | ||
| return xerrors.Errorf("failed to create a file: %w", err) | ||
| } | ||
| output = f | ||
| defer f.Close() | ||
| } |
There was a problem hiding this comment.
what if we move this logic into separate function and use it for aws(https://github.com/aquasecurity/trivy/pull/4842/files#diff-62eef55c4c7ff14ad4fdbadd93c6348d55e1ba37b204b43e6e054a51dab293d6R62-R70) and k8s(https://github.com/aquasecurity/trivy/pull/4842/files#diff-3cf1939a3a0885c6af6d90b0f4d07617761f8d332db3523421f81e4ad373d123R99-R106)
chen-keinan
reviewed
Jul 23, 2023
pkg/commands/app.go
Outdated
| @@ -1218,13 +1207,12 @@ func showVersion(cacheDir, outputFormat, version string, outputWriter io.Writer) | |||
|
|
|||
| switch outputFormat { | |||
| case "json": | |||
| b, _ := json.Marshal(VersionInfo{ | |||
| _ = json.NewEncoder(w).Encode(VersionInfo{ | |||
There was a problem hiding this comment.
error is ignored here, was it done intentionally ?
There was a problem hiding this comment.
That is not the code I added, and I have no idea why the error was ignored initially. But it looks like we should handle it. Fixed in 1417f18.
chen-keinan
approved these changes
Jul 23, 2023
AnaisUrlichs
pushed a commit
to AnaisUrlichs/trivy
that referenced
this pull request
Aug 10, 2023
* fix(report): close the file * refactor: add the format type * fix: return errors in version printing * fix: lint issues * fix: do not fail on bogus cache dir --------- Co-authored-by: DmitriyLewen <dmitriy.lewen@smartforce.io>
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.
Description
Close the output file. Also, this PR treats the output value as string so that we can add support for #4451.
Also, this PR defines
type Format string.Related issues
Checklist