-
Notifications
You must be signed in to change notification settings - Fork 117
fix: skip MR comment for non-permission errors #2340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ab-ghosh
wants to merge
3
commits into
openshift-pipelines:main
Choose a base branch
from
ab-ghosh:fix-gitlab-permission-error-mr-comment
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -319,12 +319,26 @@ func (v *Provider) CreateStatus(_ context.Context, event *info.Event, statusOpts | |
| v.Logger.Debugf("created commit status on source project ID %d", event.TargetProjectID) | ||
| return nil | ||
| } | ||
| if _, _, err2 := v.Client().Commits.SetCommitStatus(event.TargetProjectID, event.SHA, opt); err2 == nil { | ||
| _, _, err2 := v.Client().Commits.SetCommitStatus(event.TargetProjectID, event.SHA, opt) | ||
| if err2 == nil { | ||
| v.Logger.Debugf("created commit status on target project ID %d", event.TargetProjectID) | ||
| // we managed to set the status on the target repo, all good we are done | ||
| return nil | ||
| } | ||
| v.Logger.Debugf("cannot set status with the GitLab token on the target project: %v", err) | ||
| v.Logger.Debugf("cannot set status with the GitLab token on the target project: %v", err2) | ||
|
|
||
| // Skip creating MR comments if the error is a state transition error | ||
| // (e.g., "Cannot transition status via :run from :running"). | ||
| // This means the status is already set, so we should not create a comment. | ||
| // For other errors (permission issues, network errors, etc.), we fall back to comments. | ||
| isTransitionErr := func(e error) bool { | ||
| return e != nil && strings.Contains(e.Error(), "Cannot transition status") | ||
| } | ||
| if isTransitionErr(err) || isTransitionErr(err2) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. so you don't need to check both |
||
| v.Logger.Debugf("skipping MR comment as error is a state transition issue (status already set)") | ||
| return nil | ||
| } | ||
|
|
||
| // we only show the first error as it's likely something the user has more control to fix | ||
| // the second err is cryptic as it needs a dummy gitlab pipeline to start | ||
| // with and will only give more confusion in the event namespace | ||
|
|
||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of
err2reuse above err here