Draft: feat: implement rebasing #534
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
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 |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package app | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/http" | ||
| "time" | ||
|
|
||
| gitlab "gitlab.com/gitlab-org/api/client-go" | ||
| ) | ||
|
|
||
| type RebaseMrRequest struct { | ||
| SkipCI bool `json:"skip_ci,omitempty"` | ||
| } | ||
|
|
||
| type MergeRequestRebaser interface { | ||
| RebaseMergeRequest(pid interface{}, mergeRequest int64, opt *gitlab.RebaseMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) | ||
| } | ||
|
|
||
| type MergeRequestRebaserClient interface { | ||
| MergeRequestRebaser | ||
| MergeRequestGetter | ||
| } | ||
|
|
||
| type mergeRequestRebaserService struct { | ||
| data | ||
| client MergeRequestRebaserClient | ||
| } | ||
|
|
||
| /* Rebases a merge request on the server */ | ||
| func (a mergeRequestRebaserService) ServeHTTP(w http.ResponseWriter, r *http.Request) { | ||
| payload := r.Context().Value(payload("payload")).(*RebaseMrRequest) | ||
|
|
||
| opts := gitlab.RebaseMergeRequestOptions{ | ||
| SkipCI: &payload.SkipCI, | ||
| } | ||
|
|
||
| res, err := a.client.RebaseMergeRequest(a.projectInfo.ProjectId, a.projectInfo.MergeId, &opts) | ||
| if err != nil { | ||
| handleError(w, err, "Could not rebase MR", http.StatusInternalServerError) | ||
| return | ||
| } | ||
|
|
||
| if res.StatusCode >= 300 { | ||
| handleError(w, GenericError{r.URL.Path}, "Could not rebase MR", res.StatusCode) | ||
| return | ||
| } | ||
|
|
||
| // Poll until rebase completes (GitLab rebase is async) | ||
| for { | ||
| mr, _, getMrErr := a.client.GetMergeRequest( | ||
| a.projectInfo.ProjectId, | ||
| a.projectInfo.MergeId, | ||
| &gitlab.GetMergeRequestsOptions{ | ||
| IncludeRebaseInProgress: gitlab.Ptr(true), | ||
| }, | ||
| ) | ||
| if getMrErr != nil { | ||
| handleError(w, getMrErr, "Could not check rebase status", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| if !mr.RebaseInProgress { | ||
| break | ||
| } | ||
| time.Sleep(1 * time.Second) | ||
| } | ||
|
|
||
| skippingCI := "" | ||
| if payload.SkipCI { | ||
| skippingCI = " (skipping CI)" | ||
| } | ||
| response := SuccessResponse{Message: fmt.Sprintf("MR rebased on server%s", skippingCI)} | ||
|
|
||
| w.WriteHeader(http.StatusOK) | ||
|
|
||
| err = json.NewEncoder(w).Encode(response) | ||
| if err != nil { | ||
| handleError(w, err, "Could not encode response", http.StatusInternalServerError) | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package app | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| gitlab "gitlab.com/gitlab-org/api/client-go" | ||
| ) | ||
|
|
||
| type fakeMergeRequestRebaserClient struct { | ||
| testBase | ||
| rebaseInProgressCount int // number of times to return RebaseInProgress: true | ||
| getMergeRequestCalls int // tracks how many times GetMergeRequest was called | ||
| } | ||
|
|
||
| func (f *fakeMergeRequestRebaserClient) RebaseMergeRequest(pid interface{}, mergeRequest int64, opt *gitlab.RebaseMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) { | ||
| resp, err := f.handleGitlabError() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return resp, err | ||
| } | ||
|
|
||
| func (f *fakeMergeRequestRebaserClient) GetMergeRequest(pid interface{}, mergeRequest int64, opt *gitlab.GetMergeRequestsOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) { | ||
| resp, err := f.handleGitlabError() | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
|
|
||
| f.getMergeRequestCalls++ | ||
| rebaseInProgress := f.getMergeRequestCalls <= f.rebaseInProgressCount | ||
|
|
||
| return &gitlab.MergeRequest{RebaseInProgress: rebaseInProgress}, resp, err | ||
| } | ||
|
|
||
| func TestRebaseHandler(t *testing.T) { | ||
| var testRebaseMrPayload = RebaseMrRequest{SkipCI: false} | ||
| t.Run("Rebases merge request when rebase completes immediately", func(t *testing.T) { | ||
| request := makeRequest(t, http.MethodPost, "/mr/rebase", testRebaseMrPayload) | ||
| fakeClient := &fakeMergeRequestRebaserClient{rebaseInProgressCount: 0} | ||
| svc := middleware( | ||
| mergeRequestRebaserService{testProjectData, fakeClient}, | ||
| withMr(testProjectData, fakeMergeRequestLister{}), | ||
| withPayloadValidation(methodToPayload{ | ||
| http.MethodPost: newPayload[RebaseMrRequest], | ||
| }), | ||
| withMethodCheck(http.MethodPost), | ||
| ) | ||
| data := getSuccessData(t, svc, request) | ||
| assert(t, data.Message, "MR rebased on server") | ||
| assert(t, fakeClient.getMergeRequestCalls, 1) | ||
| }) | ||
| t.Run("Rebases merge request and polls until rebase completes", func(t *testing.T) { | ||
| request := makeRequest(t, http.MethodPost, "/mr/rebase", testRebaseMrPayload) | ||
| fakeClient := &fakeMergeRequestRebaserClient{rebaseInProgressCount: 1} | ||
| svc := middleware( | ||
| mergeRequestRebaserService{testProjectData, fakeClient}, | ||
| withMr(testProjectData, fakeMergeRequestLister{}), | ||
| withPayloadValidation(methodToPayload{ | ||
| http.MethodPost: newPayload[RebaseMrRequest], | ||
| }), | ||
| withMethodCheck(http.MethodPost), | ||
| ) | ||
| data := getSuccessData(t, svc, request) | ||
| assert(t, data.Message, "MR rebased on server") | ||
| assert(t, fakeClient.getMergeRequestCalls, 2) | ||
| }) | ||
| var testRebaseMrPayloadSkipCI = RebaseMrRequest{SkipCI: true} | ||
| t.Run("Rebases merge request and skips CI", func(t *testing.T) { | ||
| request := makeRequest(t, http.MethodPost, "/mr/rebase", testRebaseMrPayloadSkipCI) | ||
| fakeClient := &fakeMergeRequestRebaserClient{} | ||
| svc := middleware( | ||
| mergeRequestRebaserService{testProjectData, fakeClient}, | ||
| withMr(testProjectData, fakeMergeRequestLister{}), | ||
| withPayloadValidation(methodToPayload{ | ||
| http.MethodPost: newPayload[RebaseMrRequest], | ||
| }), | ||
| withMethodCheck(http.MethodPost), | ||
| ) | ||
| data := getSuccessData(t, svc, request) | ||
| assert(t, data.Message, "MR rebased on server (skipping CI)") | ||
| }) | ||
| t.Run("Handles errors from Gitlab client", func(t *testing.T) { | ||
| request := makeRequest(t, http.MethodPost, "/mr/rebase", testRebaseMrPayload) | ||
| svc := middleware( | ||
| mergeRequestRebaserService{testProjectData, &fakeMergeRequestRebaserClient{testBase: testBase{errFromGitlab: true}}}, | ||
| withMr(testProjectData, fakeMergeRequestLister{}), | ||
| withPayloadValidation(methodToPayload{ | ||
| http.MethodPost: newPayload[RebaseMrRequest], | ||
| }), | ||
| withMethodCheck(http.MethodPost), | ||
| ) | ||
| data, _ := getFailData(t, svc, request) | ||
| checkErrorFromGitlab(t, data, "Could not rebase MR") | ||
| }) | ||
| t.Run("Handles non-200s from Gitlab", func(t *testing.T) { | ||
| request := makeRequest(t, http.MethodPost, "/mr/rebase", testRebaseMrPayload) | ||
| svc := middleware( | ||
| mergeRequestRebaserService{testProjectData, &fakeMergeRequestRebaserClient{testBase: testBase{status: http.StatusSeeOther}}}, | ||
| withMr(testProjectData, fakeMergeRequestLister{}), | ||
| withPayloadValidation(methodToPayload{ | ||
| http.MethodPost: newPayload[RebaseMrRequest], | ||
| }), | ||
| withMethodCheck(http.MethodPost), | ||
| ) | ||
| data, _ := getFailData(t, svc, request) | ||
| checkNon200(t, data, "Could not rebase MR", "/mr/rebase") | ||
| }) | ||
| } |
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
I'm wondering whether it would make sense to connect this to the refresh of the discussion tree instead of making it a separate function and keybinding.