Fix gitlab hooks (woodpecker-ci#2537)

qwerty287 · Oct 7, 2023 · 67f38de · 67f38de
1 parent 18ff561
commit 67f38de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go
@@ -447,7 +447,7 @@ func (g *GitLab) getTokenAndWebURL(link string) (token, webURL string, err error
 		return "", "", err
 	}
 	token = uri.Query().Get("access_token")
-	webURL = fmt.Sprintf("%s://%s/api/hook", uri.Scheme, uri.Host)
+	webURL = fmt.Sprintf("%s://%s/%s", uri.Scheme, uri.Host, strings.TrimPrefix(uri.Path, "/"))
 	return token, webURL, nil
 }
 

diff --git a/server/forge/gitlab/gitlab_test.go b/server/forge/gitlab/gitlab_test.go
@@ -110,12 +110,12 @@ func Test_GitLab(t *testing.T) {
 		// Test activate method
 		g.Describe("Activate", func() {
 			g.It("Should be success", func() {
-				err := client.Activate(ctx, &user, &repo, "http://example.com/api/hook/test/test?access_token=token")
+				err := client.Activate(ctx, &user, &repo, "http://example.com/api/hook?access_token=token")
 				assert.NoError(t, err)
 			})
 
 			g.It("Should be failed, when token not given", func() {
-				err := client.Activate(ctx, &user, &repo, "http://example.com/api/hook/test/test")
+				err := client.Activate(ctx, &user, &repo, "http://example.com/api/hook")
 
 				g.Assert(err).IsNotNil()
 			})
@@ -124,7 +124,7 @@ func Test_GitLab(t *testing.T) {
 		// Test deactivate method
 		g.Describe("Deactivate", func() {
 			g.It("Should be success", func() {
-				err := client.Deactivate(ctx, &user, &repo, "http://example.com/api/hook/test/test?access_token=token")
+				err := client.Deactivate(ctx, &user, &repo, "http://example.com/api/hook?access_token=token")
 
 				g.Assert(err).IsNil()
 			})