More coverage for gitlab hooks

remote/gitlab/gitlab.go

@@ -384,12 +384,15 @@ func mergeRequest(parsed *client.HookPayload, req *http.Request) (*model.Repo, *
 
 func push(parsed *client.HookPayload, req *http.Request) (*model.Repo, *model.Build, error) {
 	repo := &model.Repo{}
-	repo.Owner = req.FormValue("owner")
-	repo.Name = req.FormValue("name")
 
 	// Since gitlab 8.5, used project instead repository key
 	// see https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/web_hooks/web_hooks.md#web-hooks
 	if project := parsed.Project; project != nil {
+		var err error
+		if repo.Owner, repo.Name, err = ExtractFromPath(project.PathWithNamespace); err != nil {
+			return nil, nil, err
+		}
+
 		repo.Avatar = project.AvatarUrl
 		repo.Link = project.WebUrl
 		repo.Clone = project.GitHttpUrl
@@ -405,6 +408,8 @@ func push(parsed *client.HookPayload, req *http.Request) (*model.Repo, *model.Bu
 			repo.IsPrivate = false
 		}
 	} else if repository := parsed.Repository; repository != nil {
+		repo.Owner = req.FormValue("owner")
+		repo.Name = req.FormValue("name")
 		repo.Link = repository.URL
 		repo.Clone = repository.GitHttpUrl
 		repo.Branch = "master"

remote/gitlab/gitlab_test.go

@@ -115,36 +115,78 @@ func Test_Gitlab(t *testing.T) {
 
 		// Test hook method
 		g.Describe("Hook", func() {
-			g.It("Should parse push hoook", func() {
+			g.Describe("Push hook", func() {
-				req, _ := http.NewRequest(
+				g.It("Should parse actual push hoook", func() {
-					"POST",
+					req, _ := http.NewRequest(
-					"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+						"POST",
-					bytes.NewReader(testdata.PushHook),
+						"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
-				)
+						bytes.NewReader(testdata.PushHook),
+					)
 
-				repo, build, err := gitlab.Hook(req)
+					repo, build, err := gitlab.Hook(req)
 
-				g.Assert(err == nil).IsTrue()
+					g.Assert(err == nil).IsTrue()
-				g.Assert(repo.Owner).Equal("diaspora")
+					g.Assert(repo.Owner).Equal("mike")
-				g.Assert(repo.Name).Equal("diaspora-client")
+					g.Assert(repo.Name).Equal("diaspora")
-				g.Assert(build.Ref).Equal("refs/heads/master")
+					g.Assert(repo.Avatar).Equal("http://example.com/uploads/project/avatar/555/Outh-20-Logo.jpg")
+					g.Assert(repo.Branch).Equal("develop")
+					g.Assert(build.Ref).Equal("refs/heads/master")
 
+				})
+
+				g.It("Should parse legacy push hoook", func() {
+					req, _ := http.NewRequest(
+						"POST",
+						"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+						bytes.NewReader(testdata.LegacyPushHook),
+					)
+
+					repo, build, err := gitlab.Hook(req)
+
+					g.Assert(err == nil).IsTrue()
+					g.Assert(repo.Owner).Equal("diaspora")
+					g.Assert(repo.Name).Equal("diaspora-client")
+					g.Assert(repo.Avatar).Equal("")
+					g.Assert(repo.Branch).Equal("master")
+					g.Assert(build.Ref).Equal("refs/heads/master")
+
+				})
 			})
 
-			g.It("Should parse tag push hook", func() {
+			g.Describe("Tag push hook", func() {
-				req, _ := http.NewRequest(
+				g.It("Should parse tag push hook", func() {
-					"POST",
+					req, _ := http.NewRequest(
-					"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+						"POST",
-					bytes.NewReader(testdata.TagHook),
+						"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
-				)
+						bytes.NewReader(testdata.TagHook),
+					)
 
-				repo, build, err := gitlab.Hook(req)
+					repo, build, err := gitlab.Hook(req)
 
-				g.Assert(err == nil).IsTrue()
+					g.Assert(err == nil).IsTrue()
-				g.Assert(repo.Owner).Equal("diaspora")
+					g.Assert(repo.Owner).Equal("jsmith")
-				g.Assert(repo.Name).Equal("diaspora-client")
+					g.Assert(repo.Name).Equal("example")
-				g.Assert(build.Ref).Equal("refs/tags/v1.0.0")
+					g.Assert(repo.Avatar).Equal("http://example.com/uploads/project/avatar/555/Outh-20-Logo.jpg")
+					g.Assert(repo.Branch).Equal("develop")
+					g.Assert(build.Ref).Equal("refs/tags/v1.0.0")
 
+				})
+
+				g.It("Should parse legacy tag push hook", func() {
+					req, _ := http.NewRequest(
+						"POST",
+						"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+						bytes.NewReader(testdata.LegacyTagHook),
+					)
+
+					repo, build, err := gitlab.Hook(req)
+
+					g.Assert(err == nil).IsTrue()
+					g.Assert(repo.Owner).Equal("diaspora")
+					g.Assert(repo.Name).Equal("diaspora-client")
+					g.Assert(build.Ref).Equal("refs/tags/v1.0.0")
+
+				})
 			})
 
 			g.It("Should parse merge request hook", func() {

remote/gitlab/helper.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"github.com/drone/drone/remote/gitlab/client"
 )
@@ -97,6 +98,14 @@ func GetUserAvatar(email string) string {
 	)
 }
 
+func ExtractFromPath(str string) (string, string, error) {
+	s := strings.Split(str, "/")
+	if len(s) < 2 {
+		return "", "", fmt.Errorf("Minimum match not found")
+	}
+	return s[0], s[1], nil
+}
+
 func GetUserEmail(c *client.Client, defaultURL string) (*client.Client, error) {
 	return c, nil
 }

remote/gitlab/testdata/hooks.go

@@ -1,6 +1,46 @@
 package testdata
 
 var TagHook = []byte(`
+{
+  "object_kind": "tag_push",
+  "ref": "refs/tags/v1.0.0",
+  "before": "0000000000000000000000000000000000000000",
+  "after": "82b3d5ae55f7080f1e6022629cdb57bfae7cccc7",
+  "user_id": 1,
+  "user_name": "John Smith",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s=80",
+  "project_id": 1,
+  "project":{
+    "name":"Example",
+    "description":"",
+    "web_url":"http://example.com/jsmith/example",
+    "avatar_url":"http://example.com/uploads/project/avatar/555/Outh-20-Logo.jpg",
+    "git_ssh_url":"git@example.com:jsmith/example.git",
+    "git_http_url":"http://example.com/jsmith/example.git",
+    "namespace":"Jsmith",
+    "visibility_level":0,
+    "path_with_namespace":"jsmith/example",
+    "default_branch":"develop",
+    "homepage":"http://example.com/jsmith/example",
+    "url":"git@example.com:jsmith/example.git",
+    "ssh_url":"git@example.com:jsmith/example.git",
+    "http_url":"http://example.com/jsmith/example.git"
+  },
+  "repository":{
+    "name": "jsmith",
+    "url": "ssh://git@example.com/jsmith/example.git",
+    "description": "",
+    "homepage": "http://example.com/jsmith/example",
+    "git_http_url":"http://example.com/jsmith/example.git",
+    "git_ssh_url":"git@example.com:jsmith/example.git",
+    "visibility_level":0
+  },
+  "commits": [],
+  "total_commits_count": 0
+}
+`)
+
+var LegacyTagHook = []byte(`
 {
   "object_kind": "tag_push",
   "ref": "refs/tags/v1.0.0",
@@ -101,6 +141,74 @@ var MergeRequestHook = []byte(`
 `)
 
 var PushHook = []byte(`
+{
+  "object_kind": "push",
+  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
+  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+  "ref": "refs/heads/master",
+  "user_id": 4,
+  "user_name": "John Smith",
+  "user_email": "john@example.com",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
+  "project_id": 15,
+  "project":{
+    "name":"Diaspora",
+    "description":"",
+    "web_url":"http://example.com/mike/diaspora",
+    "avatar_url":"http://example.com/uploads/project/avatar/555/Outh-20-Logo.jpg",
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "namespace":"Mike",
+    "visibility_level":0,
+    "path_with_namespace":"mike/diaspora",
+    "default_branch":"develop",
+    "homepage":"http://example.com/mike/diaspora",
+    "url":"git@example.com:mike/diasporadiaspora.git",
+    "ssh_url":"git@example.com:mike/diaspora.git",
+    "http_url":"http://example.com/mike/diaspora.git"
+  },
+  "repository":{
+    "name": "Diaspora",
+    "url": "git@example.com:mike/diasporadiaspora.git",
+    "description": "",
+    "homepage": "http://example.com/mike/diaspora",
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "visibility_level":0
+  },
+  "commits": [
+    {
+      "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "message": "Update Catalan translation to e38cb41.",
+      "timestamp": "2011-12-12T14:27:31+02:00",
+      "url": "http://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "author": {
+        "name": "Jordi Mallach",
+        "email": "jordi@softcatala.org"
+      },
+      "added": ["CHANGELOG"],
+      "modified": ["app/controller/application.rb"],
+      "removed": []
+    },
+    {
+      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "message": "fixed readme",
+      "timestamp": "2012-01-03T23:36:29+02:00",
+      "url": "http://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "author": {
+        "name": "GitLab dev user",
+        "email": "gitlabdev@dv6700.(none)"
+      },
+      "added": ["CHANGELOG"],
+      "modified": ["app/controller/application.rb"],
+      "removed": []
+    }
+  ],
+  "total_commits_count": 4
+}
+`)
+
+var LegacyPushHook = []byte(`
 {
   "object_kind": "push",
   "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
@@ -114,7 +222,7 @@ var PushHook = []byte(`
     "name": "Diaspora",
     "url": "git@example.com:mike/diasporadiaspora.git",
     "description": "",
-    "homepage": "http://example.com/mike/diaspora", 
+    "homepage": "http://example.com/mike/diaspora",
     "git_http_url":"http://example.com/mike/diaspora.git",
     "git_ssh_url":"git@example.com:mike/diaspora.git",
     "visibility_level":0