mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-05-23 10:48:10 +00:00
Code Issues Projects Releases Wiki Activity

rm workaround for gitlab webhook parsing (#601)

Browse source 
upstream got merged: https://github.com/xanzy/go-gitlab/pull/1282
possible because of #599
This commit is contained in:
6543 2021-12-12 21:40:36 +01:00 committed by GitHub
parent 70fcc173b9
commit 0e89923854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
server/remote/gitlab/gitlab.go
View file

@ -17,7 +17,6 @@ package gitlab
import (
"context"
"crypto/tls"
"encoding/json"
"fmt"
"io/ioutil"
"net"
@ -467,26 +466,7 @@ func (g *Gitlab) Hook(req *http.Request) (*model.Repo, *model.Build, error) {
return nil, nil, err
}
eventType := gitlab.WebhookEventType(req)
// TODO: Fix Upstream: We get `Service Hook` - which the library do not understand
if eventType == "Service Hook" {
e := struct {
ObjectKind string `json:"object_kind"`
}{}
if err := json.Unmarshal(payload, &e); err != nil {
return nil, nil, err
}
switch e.ObjectKind {
case "push":
eventType = gitlab.EventTypePush
case "tag_push":
eventType = gitlab.EventTypeTagPush
case "merge_request":
eventType = gitlab.EventTypeMergeRequest
}
}
parsed, err := gitlab.ParseWebhook(eventType, payload)
parsed, err := gitlab.ParseWebhook(gitlab.WebhookEventType(req), payload)
if err != nil {
return nil, nil, err
}