From abd5580ea2d15a0ed29ebdde61305e078d93dc44 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 8 Mar 2024 14:14:02 -0500 Subject: [PATCH] fix(webhook): we don't care about the default branch if it's missing --- pkg/webhook/branch_tag.go | 5 +---- pkg/webhook/collaborator.go | 5 +---- pkg/webhook/push.go | 5 +---- pkg/webhook/repository.go | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkg/webhook/branch_tag.go b/pkg/webhook/branch_tag.go index 5e545879ee71749b6bd48f20d6b37723b09de570..4062b0ef0dfe5450afa08b399010d78d910b275c 100644 --- a/pkg/webhook/branch_tag.go +++ b/pkg/webhook/branch_tag.go @@ -77,10 +77,7 @@ func NewBranchTagEvent(ctx context.Context, user proto.User, repo proto.Reposito payload.Repository.Owner.ID = owner.ID payload.Repository.Owner.Username = owner.Username - payload.Repository.DefaultBranch, err = getDefaultBranch(repo) - if err != nil { - return BranchTagEvent{}, err - } + payload.Repository.DefaultBranch, _ = getDefaultBranch(repo) return payload, nil } diff --git a/pkg/webhook/collaborator.go b/pkg/webhook/collaborator.go index 67a42aed9cd634877370a3d816aa964a0da395cb..c375aef9514072ed73ad60f6b057330176e789b3 100644 --- a/pkg/webhook/collaborator.go +++ b/pkg/webhook/collaborator.go @@ -65,10 +65,7 @@ func NewCollaboratorEvent(ctx context.Context, user proto.User, repo proto.Repos payload.Repository.Owner.ID = owner.ID payload.Repository.Owner.Username = owner.Username - payload.Repository.DefaultBranch, err = getDefaultBranch(repo) - if err != nil { - return CollaboratorEvent{}, err - } + payload.Repository.DefaultBranch, _ = getDefaultBranch(repo) collab, err := datastore.GetCollabByUsernameAndRepo(ctx, dbx, collabUsername, repo.Name()) if err != nil { diff --git a/pkg/webhook/push.go b/pkg/webhook/push.go index a25d793797781e515bdf8cae883c86c81f9bce6c..985c75c3cac0ab93ebb5fdd90c2c1e43cbb33362 100644 --- a/pkg/webhook/push.go +++ b/pkg/webhook/push.go @@ -74,10 +74,7 @@ func NewPushEvent(ctx context.Context, user proto.User, repo proto.Repository, r return PushEvent{}, err } - payload.Repository.DefaultBranch, err = getDefaultBranch(repo) - if err != nil { - return PushEvent{}, err - } + payload.Repository.DefaultBranch, _ = getDefaultBranch(repo) rev := after if !git.IsZeroHash(before) { diff --git a/pkg/webhook/repository.go b/pkg/webhook/repository.go index 99fad6eec333ca883e459a56e3faccefe9260e92..30d1033a16b0df4a3386fdc4e9a1dd4db0f59167 100644 --- a/pkg/webhook/repository.go +++ b/pkg/webhook/repository.go @@ -76,10 +76,7 @@ func NewRepositoryEvent(ctx context.Context, user proto.User, repo proto.Reposit payload.Repository.Owner.ID = owner.ID payload.Repository.Owner.Username = owner.Username - payload.Repository.DefaultBranch, err = getDefaultBranch(repo) - if err != nil { - return RepositoryEvent{}, err - } + payload.Repository.DefaultBranch, _ = getDefaultBranch(repo) return payload, nil }