Skip to content

Commit d33a5a4

Browse files
weyfonkbigkevmcd
authored andcommitted
Remove vendored go-playground/webhooks code (rancher#2710)
Vendoring is no longer needed now that this PR [1] has been merged. This commit now relies on that merged logic. [1]: go-playground/webhooks#191
1 parent b8cc07d commit d33a5a4

File tree

5 files changed

+7
-120
lines changed

5 files changed

+7
-120
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/go-git/go-billy/v5 v5.5.1-0.20240701174852-839dcd3ad096
2121
github.com/go-git/go-git/v5 v5.12.1-0.20240629213349-b00c68ab7140
2222
github.com/go-logr/logr v1.4.2
23-
github.com/go-playground/webhooks/v6 v6.3.0
23+
github.com/go-playground/webhooks/v6 v6.4.0
2424
github.com/gobwas/glob v0.2.3
2525
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
2626
github.com/golang/mock v1.6.0

go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF
391391
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
392392
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
393393
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
394-
github.com/go-playground/webhooks/v6 v6.3.0 h1:zBLUxK1Scxwi97TmZt5j/B/rLlard2zY7P77FHg58FE=
395-
github.com/go-playground/webhooks/v6 v6.3.0/go.mod h1:GCocmfMtpJdkEOM1uG9p2nXzg1kY5X/LtvQgtPHUaaA=
394+
github.com/go-playground/webhooks/v6 v6.4.0 h1:KLa6y7bD19N48rxJDHM0DpE3T4grV7GxMy1b/aHMWPY=
395+
github.com/go-playground/webhooks/v6 v6.4.0/go.mod h1:5lBxopx+cAJiBI4+kyRbuHrEi+hYRDdRHuRR4Ya5Ums=
396396
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
397397
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
398398
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -408,7 +408,6 @@ github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XE
408408
github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc=
409409
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
410410
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
411-
github.com/gogits/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
412411
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:04sojTxgYxu1L4Hn7Tgf7UVtIosVa6CuHtvNY+7T1K4=
413412
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
414413
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

pkg/webhook/azuredevops/webhook.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

pkg/webhook/webhook.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/go-logr/logr"
13-
goPlaygroundAzuredevops "github.com/go-playground/webhooks/v6/azuredevops"
13+
"github.com/go-playground/webhooks/v6/azuredevops"
1414
gogsclient "github.com/gogits/go-gogs-client"
1515
"github.com/gorilla/mux"
1616
"gopkg.in/go-playground/webhooks.v5/bitbucket"
@@ -20,7 +20,6 @@ import (
2020
"gopkg.in/go-playground/webhooks.v5/gogs"
2121

2222
v1alpha1 "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
23-
"github.com/rancher/fleet/pkg/webhook/azuredevops"
2423

2524
corev1 "k8s.io/api/core/v1"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -171,7 +170,7 @@ func (w *Webhook) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
171170
case r.Header.Get("X-Event-Key") != "":
172171
payload, err = w.bitbucketServer.Parse(r, bitbucketserver.RepositoryReferenceChangedEvent)
173172
case r.Header.Get("X-Vss-Activityid") != "" || r.Header.Get("X-Vss-Subscriptionid") != "":
174-
payload, err = w.azureDevops.Parse(r, goPlaygroundAzuredevops.GitPushEventType)
173+
payload, err = w.azureDevops.Parse(r, azuredevops.GitPushEventType)
175174
default:
176175
w.log.V(1).Info("Ignoring unknown webhook event")
177176
return
@@ -366,7 +365,7 @@ func parsePayload(payload interface{}) (revision, branch, tag string, repoURLs [
366365
repoURLs = append(repoURLs, t.Repo.HTMLURL)
367366
branch, tag = getBranchTagFromRef(t.Ref)
368367
revision = t.After
369-
case goPlaygroundAzuredevops.GitPushEvent:
368+
case azuredevops.GitPushEvent:
370369
repoURLs = append(repoURLs, t.Resource.Repository.RemoteURL)
371370
for _, refUpdate := range t.Resource.RefUpdates {
372371
branch, tag = getBranchTagFromRef(refUpdate.Name)

pkg/webhook/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"k8s.io/apimachinery/pkg/types"
1010
"k8s.io/kubectl/pkg/scheme"
1111

12+
"github.com/go-playground/webhooks/v6/azuredevops"
1213
v1alpha1 "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
13-
"github.com/rancher/fleet/pkg/webhook/azuredevops"
1414
"gopkg.in/go-playground/webhooks.v5/github"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
cfake "sigs.k8s.io/controller-runtime/pkg/client/fake"

0 commit comments

Comments
 (0)