Fix deps in static report bulk option #324
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
Signed-off-by: Emily McMullan <[email protected]>
aufi
approved these changes
Aug 26, 2024
| @@ -1660,7 +1664,7 @@ func (a *analyzeCommand) moveResults() error { | |||
| if err != nil { | |||
| return err | |||
| } | |||
| err = copyFileContents(depsPath, fmt.Sprintf("%s.%s", analysisLogFilePath, a.inputShortName())) | |||
| err = copyFileContents(depsPath, fmt.Sprintf("%s.%s", depsPath, a.inputShortName())) | |||
| for i := range outputDeps { | ||
| _, depErr := os.Stat(outputDeps[i]) | ||
| for i := range depFiles { | ||
| _, depErr := os.Stat(depFiles[i]) |
There was a problem hiding this comment.
I think this can end up in different lenghts of outputAnalyses and depFiles arrays (when user called --bulk to the same output directory for analysis with and without dependencies, which is not recommended, but there no hard check for it).
(defining those array together on lines 1585-1586 / 1587-1588 should have been ensuring those array will be the same length).
| if (hasJava || hasGo) && a.mode == string(provider.FullAnalysisMode) && len(a.providersMap) == 1 { | ||
| staticReportArgs = append(staticReportArgs, | ||
| fmt.Sprintf("--deps-output-list=%s", DepsOutputMountPath)) | ||
| if !a.bulk { |
| _, hasGo := a.providersMap[goProvider] | ||
| if (hasJava || hasGo) && a.mode == string(provider.FullAnalysisMode) && len(a.providersMap) == 1 { | ||
| staticReportArgs = append(staticReportArgs, | ||
| fmt.Sprintf("--deps-output-list=%s", DepsOutputMountPath)) |
There was a problem hiding this comment.
I'm not sure about the DepsOutputMountPath here (instead of outputDeps), but that was introduced in #291 which I've seen already merged, so didn't pay much attention to it, will check better next time.
eemcmullan
added a commit
that referenced
this pull request
Aug 28, 2024
* remove first prov container last Signed-off-by: Emily McMullan <[email protected]> * handle cleanup for interrupt Signed-off-by: Emily McMullan <[email protected]> * include more detailed container names Signed-off-by: Emily McMullan <[email protected]> * fix deps in static report bulk option Signed-off-by: Emily McMullan <[email protected]> --------- Signed-off-by: Emily McMullan <[email protected]>
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.
Addresses https://issues.redhat.com/browse/MTA-3663