mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-09-25 21:20:12 +00:00
rm workaround for gitlab webhook parsing (#601)
upstream got merged: https://github.com/xanzy/go-gitlab/pull/1282 possible because of #599
This commit is contained in:
parent
70fcc173b9
commit
0e89923854
1 changed files with 1 additions and 21 deletions
|
@ -17,7 +17,6 @@ package gitlab
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net"
|
"net"
|
||||||
|
@ -467,26 +466,7 @@ func (g *Gitlab) Hook(req *http.Request) (*model.Repo, *model.Build, error) {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
eventType := gitlab.WebhookEventType(req)
|
parsed, err := gitlab.ParseWebhook(gitlab.WebhookEventType(req), payload)
|
||||||
// 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)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue