From 6074a0164e5aad9e1839e6fe13bcb1d2ec90b73a Mon Sep 17 00:00:00 2001 From: Ivan Chernov Date: Thu, 10 Aug 2017 09:24:35 +0300 Subject: [PATCH] Update gitlab API to version v4 --- remote/gitlab/client/project.go | 47 +++++++++++++----------------- remote/gitlab/client/types.go | 12 ++++++++ remote/gitlab/gitlab.go | 12 +------- remote/gitlab/helper.go | 2 +- remote/gitlab/testdata/testdata.go | 10 +++---- 5 files changed, 39 insertions(+), 44 deletions(-) diff --git a/remote/gitlab/client/project.go b/remote/gitlab/client/project.go index f21f1a48a..47565dd51 100644 --- a/remote/gitlab/client/project.go +++ b/remote/gitlab/client/project.go @@ -1,17 +1,16 @@ package client import ( + "encoding/base64" "encoding/json" "strconv" "strings" ) const ( - searchUrl = "/projects/search/:query" projectsUrl = "/projects" projectUrl = "/projects/:id" - repoUrlRawFile = "/projects/:id/repository/blobs/:sha" - repoUrlRawFileRef = "/projects/:id/repository/files" + repoUrlRawFileRef = "/projects/:id/repository/files/:filepath" commitStatusUrl = "/projects/:id/statuses/:sha" ) @@ -47,6 +46,7 @@ func (c *Client) Projects(page int, per_page int, hide_archives bool) ([]*Projec projectsOptions := QMap{ "page": strconv.Itoa(page), "per_page": strconv.Itoa(per_page), + "membership": "true", } if hide_archives { @@ -79,39 +79,31 @@ func (c *Client) Project(id string) (*Project, error) { return project, err } -// Get Raw file content -func (c *Client) RepoRawFile(id, sha, filepath string) ([]byte, error) { - url, opaque := c.ResourceUrl( - repoUrlRawFile, - QMap{ - ":id": id, - ":sha": sha, - }, - QMap{ - "filepath": filepath, - }, - ) - - contents, err := c.Do("GET", url, opaque, nil) - - return contents, err -} - func (c *Client) RepoRawFileRef(id, ref, filepath string) ([]byte, error) { + var fileRef FileRef url, opaque := c.ResourceUrl( repoUrlRawFileRef, QMap{ - ":id": id, + ":id": id, + ":filepath": filepath, }, QMap{ - "filepath": filepath, - "ref": ref, + "ref": ref, }, ) contents, err := c.Do("GET", url, opaque, nil) + if err != nil { + return nil, err + } - return contents, err + err = json.Unmarshal(contents, &fileRef) + if err != nil { + return nil, err + } + + fileRawContent, err := base64.StdEncoding.DecodeString(fileRef.Content) + return fileRawContent, err } // @@ -138,8 +130,9 @@ func (c *Client) SetStatus(id, sha, state, desc, ref, link string) error { // Get a list of projects by query owned by the authenticated user. func (c *Client) SearchProjectId(namespace string, name string) (id int, err error) { - url, opaque := c.ResourceUrl(searchUrl, nil, QMap{ - ":query": strings.ToLower(name), + url, opaque := c.ResourceUrl(projectsUrl, nil, QMap{ + "query": strings.ToLower(name), + "membership": "true", }) var projects []*Project diff --git a/remote/gitlab/client/types.go b/remote/gitlab/client/types.go index 0c6424e03..b950a6d77 100644 --- a/remote/gitlab/client/types.go +++ b/remote/gitlab/client/types.go @@ -136,3 +136,15 @@ type HookPayload struct { ObjectKind string `json:"object_kind,omitempty"` ObjectAttributes *HookObjAttr `json:"object_attributes,omitempty"` } + +type FileRef struct { + FileName string `json:"file_name,omitempty"` + FilePath string `json:"file_path,omitempty"` + Size int `json:"size,omitempty"` + Encoding string `json:"encoding,omitempty"` + Content string `json:"content"` + Ref string `json:"ref,omitempty"` + BlobId string `json:"blob_id,omitempty"` + CommitId string `json:"commit_id,omitempty"` + LastCommitId string `json:"last_commit_id,omitempty"` +} diff --git a/remote/gitlab/gitlab.go b/remote/gitlab/gitlab.go index 6b088b4da..a920ca432 100644 --- a/remote/gitlab/gitlab.go +++ b/remote/gitlab/gitlab.go @@ -311,17 +311,7 @@ func (g *Gitlab) Perm(u *model.User, owner, name string) (*model.Perm, error) { // File fetches a file from the remote repository and returns in string format. func (g *Gitlab) File(user *model.User, repo *model.Repo, build *model.Build, f string) ([]byte, error) { - var client = NewClient(g.URL, user.Token, g.SkipVerify) - id, err := GetProjectId(g, client, repo.Owner, repo.Name) - if err != nil { - return nil, err - } - - out, err := client.RepoRawFile(id, build.Commit, f) - if err != nil { - return nil, err - } - return out, err + return g.FileRef(user, repo, build.Commit, f) } // FileRef fetches the file from the GitHub repository and returns its contents. diff --git a/remote/gitlab/helper.go b/remote/gitlab/helper.go index 38b3bb88e..03c5092a5 100644 --- a/remote/gitlab/helper.go +++ b/remote/gitlab/helper.go @@ -18,7 +18,7 @@ const ( // NewClient is a helper function that returns a new GitHub // client using the provided OAuth token. func NewClient(url, accessToken string, skipVerify bool) *client.Client { - client := client.New(url, "/api/v3", accessToken, skipVerify) + client := client.New(url, "/api/v4", accessToken, skipVerify) return client } diff --git a/remote/gitlab/testdata/testdata.go b/remote/gitlab/testdata/testdata.go index 2fa2322b6..032d4d588 100644 --- a/remote/gitlab/testdata/testdata.go +++ b/remote/gitlab/testdata/testdata.go @@ -15,7 +15,7 @@ func NewServer() *httptest.Server { //println(r.URL.Path + " " + r.Method) // evaluate the path to serve a dummy data file switch r.URL.Path { - case "/api/v3/projects": + case "/api/v4/projects": if r.URL.Query().Get("archived") == "false" { w.Write(notArchivedProjectsPayload) } else { @@ -23,13 +23,13 @@ func NewServer() *httptest.Server { } return - case "/api/v3/projects/diaspora/diaspora-client": + case "/api/v4/projects/diaspora/diaspora-client": w.Write(project4Paylod) return - case "/api/v3/projects/brightbox/puppet": + case "/api/v4/projects/brightbox/puppet": w.Write(project6Paylod) return - case "/api/v3/projects/diaspora/diaspora-client/services/drone-ci": + case "/api/v4/projects/diaspora/diaspora-client/services/drone-ci": switch r.Method { case "PUT": if r.FormValue("token") == "" { @@ -45,7 +45,7 @@ func NewServer() *httptest.Server { case "/oauth/token": w.Write(accessTokenPayload) return - case "/api/v3/user": + case "/api/v4/user": w.Write(currentUserPayload) return }