"Branch already exists" during scan-repository fix #649
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
eranturgeman
had a problem deploying
to
frogbot
GitHub Actions
Failure
eranturgeman
had a problem deploying
to
frogbot
GitHub Actions
Failure
…me-already-exist-bug-fix
eranturgeman
added
bug
github-actions
bot
removed
the
safe to test
eranturgeman
changed the title
eranturgeman
added
the
safe to test
github-actions
bot
removed
the
safe to test
eranturgeman
added
the
safe to test
github-actions
bot
removed
the
safe to test
eranturgeman
commented
Mar 4, 2024
sverdlov93
reviewed
Mar 4, 2024
scanrepository/scanrepository.go
Outdated
Comment on lines
498
to
506
| /* | ||
| handler := cfp.handlers[vulnDetails.Technology] | ||
| if handler == nil { | ||
| handler = packagehandlers.GetCompatiblePackageHandler(vulnDetails, cfp.scanDetails) | ||
| cfp.handlers[vulnDetails.Technology] = handler | ||
| } else if _, unsupported := handler.(*packagehandlers.UnsupportedPackageHandler); unsupported { | ||
| return | ||
| } | ||
| */ |
attiasas
reviewed
Mar 4, 2024
There was a problem hiding this comment.
I suggest when parsing the params, if more than one project is defined and no identify exists, to set the names with a counter (or default value like 'project-1', 'project-2'... This will fix the issues for users that did not changed their config with special names
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.
This PR addresses a bug in the scan-repository flow. When multiple descriptor files contain at least one similar fix (package name + version), Frogbot encounters an issue when attempting to fix the second descriptor due to duplication in the 'fix' branch names. To resolve this issue, we have introduced a new field in the frogbot-config.yml file under the 'projects' section called 'projectName'. By adding this field to an entry in the 'projects' array, it enables differentiation between two similar fixes, resulting in unique branch names and titles (the unique identifier is appended to the title).
SCENARIOS:
ACTION PLAN:
IMPORTANT:
As of its current architecture, Frogbot does NOT offer support for multiple descriptor files.
This fix serves as a temporary "workaround" as achieving full support for this feature would necessitate significant architectural adjustments.
CAUTION:
If you opt to utilize this new feature and you already have existing PRs from Frogbot, please note that new PRs will be generated without removing the old ones!