2.1.0 (#241)

• removes the <esc> keybinding for popups which was causing folks to lose their changes • deprecates the backup register. • updates go-gitlab to latest in order to get "drafts" functionality • fixes issues with labels not deleting correctly • creates a new data() function to get data from the plugin directly, see :h gitlab.nvim.data • fixes issues with line values not being computed directly, blocking jumps to/from discussion tree This is a #MINOR release.
2024-04-07 21:45:19 -04:00
parent 12c4acb297
commit 36f512cd6d
19 changed files with 299 additions and 177 deletions
--- a/cmd/git.go
+++ b/cmd/git.go
@@ -86,10 +86,6 @@ func GetCurrentBranchNameFromNativeGitCmd() (res string, e error) {

 	branchName := strings.TrimSpace(string(output))

-	if branchName == "main" || branchName == "master" {
-		return "", fmt.Errorf("Cannot run on %s branch", branchName)
-	}
-
 	return branchName, nil
 }

--- a/cmd/label.go
+++ b/cmd/label.go
@@ -99,7 +99,7 @@ func (a *api) updateLabels(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	var labels = gitlab.Labels(labelUpdateRequest.Labels)
+	var labels = gitlab.LabelOptions(labelUpdateRequest.Labels)
 	mr, res, err := a.client.UpdateMergeRequest(a.projectInfo.ProjectId, a.projectInfo.MergeId, &gitlab.UpdateMergeRequestOptions{
 		Labels: &labels,
 	})
--- a/cmd/pipeline.go
+++ b/cmd/pipeline.go
@@ -12,12 +12,17 @@ import (

 type RetriggerPipelineResponse struct {
 	SuccessResponse
-	Pipeline *gitlab.Pipeline
+	LatestPipeline *gitlab.Pipeline `json:"latest_pipeline"`
 }

-type GetJobsResponse struct {
+type PipelineWithJobs struct {
+	Jobs           []*gitlab.Job    `json:"jobs"`
+	LatestPipeline *gitlab.Pipeline `json:"latest_pipeline"`
+}
+
+type GetPipelineAndJobsResponse struct {
 	SuccessResponse
-	Jobs []*gitlab.Job
+	Pipeline PipelineWithJobs `json:"latest_pipeline"`
 }

 /*
@@ -27,7 +32,7 @@ about a given job in a pipeline, see the jobHandler function
 func (a *api) pipelineHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
-		a.GetJobs(w, r)
+		a.GetPipelineAndJobs(w, r)
 	case http.MethodPost:
 		a.RetriggerPipeline(w, r)
 	default:
@@ -37,18 +42,29 @@ func (a *api) pipelineHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func (a *api) GetJobs(w http.ResponseWriter, r *http.Request) {
+func (a *api) GetPipelineAndJobs(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")

-	id := strings.TrimPrefix(r.URL.Path, "/pipeline/")
-	idInt, err := strconv.Atoi(id)
+	pipeline, res, err := a.client.GetLatestPipeline(a.projectInfo.ProjectId, &gitlab.GetLatestPipelineOptions{
+		Ref: &a.gitInfo.BranchName,
+	})

 	if err != nil {
-		handleError(w, err, "Could not convert pipeline ID to integer", http.StatusBadRequest)
+		handleError(w, err, fmt.Sprintf("Gitlab failed to get latest pipeline for %s branch", a.gitInfo.BranchName), http.StatusInternalServerError)
 		return
 	}

-	jobs, res, err := a.client.ListPipelineJobs(a.projectInfo.ProjectId, idInt, &gitlab.ListJobsOptions{})
+	if res.StatusCode >= 300 {
+		handleError(w, GenericError{endpoint: "/pipeline"}, fmt.Sprintf("Could not get latest pipeline for %s branch", a.gitInfo.BranchName), res.StatusCode)
+		return
+	}
+
+	if pipeline == nil {
+		handleError(w, GenericError{endpoint: "/pipeline"}, fmt.Sprintf("No pipeline found for %s branch", a.gitInfo.BranchName), res.StatusCode)
+		return
+	}
+
+	jobs, res, err := a.client.ListPipelineJobs(a.projectInfo.ProjectId, pipeline.ID, &gitlab.ListJobsOptions{})

 	if err != nil {
 		handleError(w, err, "Could not get pipeline jobs", http.StatusInternalServerError)
@@ -61,12 +77,15 @@ func (a *api) GetJobs(w http.ResponseWriter, r *http.Request) {
 	}

 	w.WriteHeader(http.StatusOK)
-	response := GetJobsResponse{
+	response := GetPipelineAndJobsResponse{
 		SuccessResponse: SuccessResponse{
 			Status:  http.StatusOK,
-			Message: "Pipeline jobs retrieved",
+			Message: "Pipeline retrieved",
+		},
+		Pipeline: PipelineWithJobs{
+			LatestPipeline: pipeline,
+			Jobs:           jobs,
 		},
-		Jobs: jobs,
 	}

 	err = json.NewEncoder(w).Encode(response)
@@ -78,7 +97,7 @@ func (a *api) GetJobs(w http.ResponseWriter, r *http.Request) {
 func (a *api) RetriggerPipeline(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")

-	id := strings.TrimPrefix(r.URL.Path, "/pipeline/")
+	id := strings.TrimPrefix(r.URL.Path, "/pipeline/trigger/")

 	idInt, err := strconv.Atoi(id)
 	if err != nil {
@@ -104,7 +123,7 @@ func (a *api) RetriggerPipeline(w http.ResponseWriter, r *http.Request) {
 			Message: "Pipeline retriggered",
 			Status:  http.StatusOK,
 		},
-		Pipeline: pipeline,
+		LatestPipeline: pipeline,
 	}

 	err = json.NewEncoder(w).Encode(response)
--- a/cmd/pipeline_test.go
+++ b/cmd/pipeline_test.go
@@ -32,54 +32,79 @@ func retryPipelineBuildNon200(pid interface{}, pipeline int, options ...gitlab.R
 	return nil, makeResponse(http.StatusSeeOther), nil
 }

+func getLatestPipeline200(pid interface{}, opts *gitlab.GetLatestPipelineOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error) {
+	return &gitlab.Pipeline{ID: 1}, makeResponse(http.StatusOK), nil
+}
+
 func TestPipelineHandler(t *testing.T) {
 	t.Run("Gets all pipeline jobs", func(t *testing.T) {
-		request := makeRequest(t, http.MethodGet, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{listPipelineJobs: listPipelineJobs})
-		data := serveRequest(t, server, request, GetJobsResponse{})
-		assert(t, data.SuccessResponse.Message, "Pipeline jobs retrieved")
+		request := makeRequest(t, http.MethodGet, "/pipeline", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			listPipelineJobs:  listPipelineJobs,
+			getLatestPipeline: getLatestPipeline200,
+		})
+		data := serveRequest(t, server, request, GetPipelineAndJobsResponse{})
+		assert(t, data.SuccessResponse.Message, "Pipeline retrieved")
 		assert(t, data.SuccessResponse.Status, http.StatusOK)
 	})

 	t.Run("Disallows non-GET, non-POST methods", func(t *testing.T) {
-		request := makeRequest(t, http.MethodPatch, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{listPipelineJobs: listPipelineJobs})
+		request := makeRequest(t, http.MethodPatch, "/pipeline", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			listPipelineJobs:  listPipelineJobs,
+			getLatestPipeline: getLatestPipeline200,
+		})
 		data := serveRequest(t, server, request, ErrorResponse{})
 		checkBadMethod(t, *data, http.MethodGet, http.MethodPost)
 	})

 	t.Run("Handles errors from Gitlab client", func(t *testing.T) {
-		request := makeRequest(t, http.MethodGet, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{listPipelineJobs: listPipelineJobsErr})
+		request := makeRequest(t, http.MethodGet, "/pipeline", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			listPipelineJobs:  listPipelineJobsErr,
+			getLatestPipeline: getLatestPipeline200,
+		})
 		data := serveRequest(t, server, request, ErrorResponse{})
 		checkErrorFromGitlab(t, *data, "Could not get pipeline jobs")
 	})

 	t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
-		request := makeRequest(t, http.MethodGet, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{listPipelineJobs: listPipelineJobsNon200})
+		request := makeRequest(t, http.MethodGet, "/pipeline", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			listPipelineJobs:  listPipelineJobsNon200,
+			getLatestPipeline: getLatestPipeline200,
+		})
 		data := serveRequest(t, server, request, ErrorResponse{})
 		checkNon200(t, *data, "Could not get pipeline jobs", "/pipeline")
 	})

-	t.Run("Retriggers pipeline", func(t *testing.T) {
-		request := makeRequest(t, http.MethodPost, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{retryPipelineBuild: retryPipelineBuild})
-		data := serveRequest(t, server, request, GetJobsResponse{})
-		assert(t, data.SuccessResponse.Message, "Pipeline retriggered")
-		assert(t, data.SuccessResponse.Status, http.StatusOK)
-	})
-
 	t.Run("Handles errors from Gitlab client", func(t *testing.T) {
-		request := makeRequest(t, http.MethodPost, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{retryPipelineBuild: retryPipelineBuildErr})
+		request := makeRequest(t, http.MethodPost, "/pipeline/trigger/1", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			retryPipelineBuild: retryPipelineBuildErr,
+			getLatestPipeline:  getLatestPipeline200,
+		})
 		data := serveRequest(t, server, request, ErrorResponse{})
 		checkErrorFromGitlab(t, *data, "Could not retrigger pipeline")
 	})

+	t.Run("Retriggers pipeline", func(t *testing.T) {
+		request := makeRequest(t, http.MethodPost, "/pipeline/trigger/1", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			retryPipelineBuild: retryPipelineBuild,
+			getLatestPipeline:  getLatestPipeline200,
+		})
+		data := serveRequest(t, server, request, GetPipelineAndJobsResponse{})
+		assert(t, data.SuccessResponse.Message, "Pipeline retriggered")
+		assert(t, data.SuccessResponse.Status, http.StatusOK)
+	})
+
 	t.Run("Handles non-200s from Gitlab client on retrigger", func(t *testing.T) {
-		request := makeRequest(t, http.MethodPost, "/pipeline/1", nil)
-		server, _ := createRouterAndApi(fakeClient{retryPipelineBuild: retryPipelineBuildNon200})
+		request := makeRequest(t, http.MethodPost, "/pipeline/trigger/1", nil)
+		server, _ := createRouterAndApi(fakeClient{
+			retryPipelineBuild: retryPipelineBuildNon200,
+			getLatestPipeline:  getLatestPipeline200,
+		})
 		data := serveRequest(t, server, request, ErrorResponse{})
 		checkNon200(t, *data, "Could not retrigger pipeline", "/pipeline")
 	})
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -132,11 +132,12 @@ func createRouterAndApi(client ClientInterface, optFuncs ...optFunc) (*http.Serv
 	m.HandleFunc("/mr/revoke", a.withMr(a.revokeHandler))
 	m.HandleFunc("/mr/awardable/note/", a.withMr(a.emojiNoteHandler))

+	m.HandleFunc("/pipeline", a.pipelineHandler)
+	m.HandleFunc("/pipeline/trigger/", a.pipelineHandler)
 	m.HandleFunc("/users/me", a.meHandler)
 	m.HandleFunc("/attachment", a.attachmentHandler)
 	m.HandleFunc("/create_mr", a.createMr)
 	m.HandleFunc("/job", a.jobHandler)
-	m.HandleFunc("/pipeline/", a.pipelineHandler)
 	m.HandleFunc("/project/members", a.projectMembersHandler)
 	m.HandleFunc("/shutdown", a.shutdownHandler)

--- a/cmd/test.go
+++ b/cmd/test.go
@@ -35,6 +35,7 @@ type fakeClient struct {
 	listAllProjectMembers              func(pid interface{}, opt *gitlab.ListProjectMembersOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.ProjectMember, *gitlab.Response, error)
 	retryPipelineBuild                 func(pid interface{}, pipeline int, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error)
 	listPipelineJobs                   func(pid interface{}, pipelineID int, opts *gitlab.ListJobsOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.Job, *gitlab.Response, error)
+	getLatestPipeline                  func(pid interface{}, opt *gitlab.GetLatestPipelineOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error)
 	getTraceFile                       func(pid interface{}, jobID int, options ...gitlab.RequestOptionFunc) (*bytes.Reader, *gitlab.Response, error)
 	listLabels                         func(pid interface{}, opt *gitlab.ListLabelsOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.Label, *gitlab.Response, error)
 	listMergeRequestAwardEmojiOnNote   func(pid interface{}, mergeRequestIID, noteID int, opt *gitlab.ListAwardEmojiOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.AwardEmoji, *gitlab.Response, error)
@@ -120,6 +121,10 @@ func (f fakeClient) ListPipelineJobs(pid interface{}, pipelineID int, opts *gitl
 	return f.listPipelineJobs(pid, pipelineID, opts, options...)
 }

+func (f fakeClient) GetLatestPipeline(pid interface{}, opts *gitlab.GetLatestPipelineOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error) {
+	return f.getLatestPipeline(pid, opts, options...)
+}
+
 func (f fakeClient) GetTraceFile(pid interface{}, jobID int, options ...gitlab.RequestOptionFunc) (*bytes.Reader, *gitlab.Response, error) {
 	return f.getTraceFile(pid, jobID, options...)
 }
--- a/cmd/types.go
+++ b/cmd/types.go
@@ -53,6 +53,7 @@ type ClientInterface interface {
 	ListAllProjectMembers(pid interface{}, opt *gitlab.ListProjectMembersOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.ProjectMember, *gitlab.Response, error)
 	RetryPipelineBuild(pid interface{}, pipeline int, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error)
 	ListPipelineJobs(pid interface{}, pipelineID int, opts *gitlab.ListJobsOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.Job, *gitlab.Response, error)
+	GetLatestPipeline(pid interface{}, opt *gitlab.GetLatestPipelineOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Pipeline, *gitlab.Response, error)
 	GetTraceFile(pid interface{}, jobID int, options ...gitlab.RequestOptionFunc) (*bytes.Reader, *gitlab.Response, error)
 	ListLabels(pid interface{}, opt *gitlab.ListLabelsOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.Label, *gitlab.Response, error)
 	ListMergeRequestAwardEmojiOnNote(pid interface{}, mergeRequestIID int, noteID int, opt *gitlab.ListAwardEmojiOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.AwardEmoji, *gitlab.Response, error)