Restrict aggregate mode to a single active branch #367
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
…gregate_branch_hash
EyalDelarea
commented
Jun 21, 2023
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
eyalbe4
requested changes
Jun 24, 2023
commands/createfixpullrequests.go
Outdated
| // In case of existing aggregated fix, check for different scan results | ||
| // if scan results are the same, do nothing. | ||
| // Else, force push to the same branch to update | ||
| // Only one aggregated pull request should be open at all times. | ||
| func (cfp *CreateFixPullRequestsCmd) fixIssuesSinglePR(fixVersionsMap map[string]*utils.FixDetails) (err error) { |
There was a problem hiding this comment.
We should design a test that simulate and verifies all of the possible scenarios -
- Identical results to an existing PR
- Different results from an existing PR
- No existing open PR
There was a problem hiding this comment.
I'll implement those tests in #345
As all of the testings infrastructure exists there.
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
|
|
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
|
|
omerzi
suggested changes
Jun 28, 2023
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
changed the title
|
|
1 similar comment
|
|
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 pull request introduce new logic the the aggregate pull request flow.
The main goal is to ensure that ONLY one pull request & branch is active when the aggregate_fixes flag is set to true.
The new logic will set the branch name to a fixed branch name, that could be updated on every run.
The flow goes as follows:
Check if there is an open pull request which the source branch is the fixed aggregated branch name.
Doesn't exists ? -> open new pull request.
Exists already ?
Check the scan results of the existing branch against to new scan we are running
Same results? -> Do nothing.
Different results? -> Force update the branch.
Depends on jfrog/froggit-go#95