fix gitlab namepsace resolution

adelowo · Nov 13, 2018 · e4326a4 · e4326a4
1 parent ce73161
commit e4326a4
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 16 deletions.
diff --git a/scm/driver/gitlab/testdata/webhooks/branch_create.json.golden b/scm/driver/gitlab/testdata/webhooks/branch_create.json.golden
@@ -2,7 +2,7 @@
     "Ref": "refs/heads/feature",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_close.json.golden b/scm/driver/gitlab/testdata/webhooks/pull_request_close.json.golden
@@ -2,7 +2,7 @@
     "Action": "closed",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_create.json.golden b/scm/driver/gitlab/testdata/webhooks/pull_request_create.json.golden
@@ -2,7 +2,7 @@
     "Action": "opened",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_merge.json.golden b/scm/driver/gitlab/testdata/webhooks/pull_request_merge.json.golden
@@ -2,7 +2,7 @@
     "Action": "merged",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_reopen.json.golden b/scm/driver/gitlab/testdata/webhooks/pull_request_reopen.json.golden
@@ -2,7 +2,7 @@
     "Action": "reopened",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/push.json.golden b/scm/driver/gitlab/testdata/webhooks/push.json.golden
@@ -2,7 +2,7 @@
     "Ref": "refs/heads/master",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/tag_create.json.golden b/scm/driver/gitlab/testdata/webhooks/tag_create.json.golden
@@ -2,7 +2,7 @@
     "Ref": "refs/tags/v1.0.0",
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/testdata/webhooks/tag_delete.json.golden b/scm/driver/gitlab/testdata/webhooks/tag_delete.json.golden
@@ -5,7 +5,7 @@
     },
     "Repo": {
         "ID": "4861503",
-        "Namespace": "sytses",
+        "Namespace": "gitlab-org",
         "Name": "hello-world",
         "Perm": null,
         "Branch": "master",

diff --git a/scm/driver/gitlab/webhook.go b/scm/driver/gitlab/webhook.go
@@ -104,12 +104,13 @@ func parsePullRequestHook(data []byte) (scm.Webhook, error) {
 }
 
 func convertPushHook(src *pushHook) *scm.PushHook {
+	namespace, name := scm.Split(src.Project.PathWithNamespace)
 	dst := &scm.PushHook{
 		Ref: scm.ExpandRef(src.Ref, "refs/heads/"),
 		Repo: scm.Repository{
 			ID:        strconv.Itoa(src.Project.ID),
-			Namespace: src.Project.Namespace,
-			Name:      src.Project.Name,
+			Namespace: namespace,
+			Name:      name,
 			Clone:     src.Project.GitHTTPURL,
 			CloneSSH:  src.Project.GitSSHURL,
 			Link:      src.Project.WebURL,
@@ -154,6 +155,7 @@ func converBranchHook(src *pushHook) *scm.BranchHook {
 		action = scm.ActionDelete
 		commit = src.Before
 	}
+	namespace, name := scm.Split(src.Project.PathWithNamespace)
 	return &scm.BranchHook{
 		Action: action,
 		Ref: scm.Reference{
@@ -162,8 +164,8 @@ func converBranchHook(src *pushHook) *scm.BranchHook {
 		},
 		Repo: scm.Repository{
 			ID:        strconv.Itoa(src.Project.ID),
-			Namespace: src.Project.Namespace,
-			Name:      src.Project.Name,
+			Namespace: namespace,
+			Name:      name,
 			Clone:     src.Project.GitHTTPURL,
 			CloneSSH:  src.Project.GitSSHURL,
 			Link:      src.Project.WebURL,
@@ -186,6 +188,7 @@ func convertTagHook(src *pushHook) *scm.TagHook {
 		action = scm.ActionDelete
 		commit = src.Before
 	}
+	namespace, name := scm.Split(src.Project.PathWithNamespace)
 	return &scm.TagHook{
 		Action: action,
 		Ref: scm.Reference{
@@ -194,8 +197,8 @@ func convertTagHook(src *pushHook) *scm.TagHook {
 		},
 		Repo: scm.Repository{
 			ID:        strconv.Itoa(src.Project.ID),
-			Namespace: src.Project.Namespace,
-			Name:      src.Project.Name,
+			Namespace: namespace,
+			Name:      name,
 			Clone:     src.Project.GitHTTPURL,
 			CloneSSH:  src.Project.GitSSHURL,
 			Link:      src.Project.WebURL,
@@ -229,6 +232,7 @@ func convertPullRequestHook(src *pullRequestHook) *scm.PullRequestHook {
 		src.ObjectAttributes.Source.Namespace,
 		src.ObjectAttributes.Source.Name,
 	)
+	namespace, name := scm.Split(src.Project.PathWithNamespace)
 	return &scm.PullRequestHook{
 		Action: action,
 		PullRequest: scm.PullRequest{
@@ -254,8 +258,8 @@ func convertPullRequestHook(src *pullRequestHook) *scm.PullRequestHook {
 		},
 		Repo: scm.Repository{
 			ID:        strconv.Itoa(src.Project.ID),
-			Namespace: src.Project.Namespace,
-			Name:      src.Project.Name,
+			Namespace: namespace,
+			Name:      name,
 			Clone:     src.Project.GitHTTPURL,
 			CloneSSH:  src.Project.GitSSHURL,
 			Link:      src.Project.WebURL,