Skip to content

feat(bitbucketserver): get changes from all commits in a single push event #5748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qwerty287 merged 5 commits into from
Nov 18, 2025
Merged

feat(bitbucketserver): get changes from all commits in a single push event #5748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dae5d89
feat: get changes from all commits in a single push event
hhamalai Nov 12, 2025
45d06be
refactor: remove unnecessary named returns
hhamalai Nov 13, 2025
21a67a6
fmt: gofmpt
hhamalai Nov 13, 2025
7af56c4
chore: bump go-bitbucket version
hhamalai Nov 18, 2025
e551ed8
Merge branch 'main' into bitbucketdc_push_event_with_all_changes
qwerty287 Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/migueleliasweb/go-github-mock v1.5.0
github.com/moby/term v0.5.2
github.com/muesli/termenv v0.16.0
github.com/neticdk/go-bitbucket v1.0.4
github.com/neticdk/go-bitbucket v1.0.5
github.com/oklog/ulid/v2 v2.1.1
github.com/prometheus/client_golang v1.23.2
github.com/rs/zerolog v1.34.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
github.com/neticdk/go-bitbucket v1.0.4 h1:Nl7LtB+YuMSIupJ4m2RH7AG50yEJm9HeheqnZRWxy7A=
github.com/neticdk/go-bitbucket v1.0.4/go.mod h1:4ZMxzmr5hi/EoLdydtR7h4dd4DpqK8tbnVLbAkscRc8=
github.com/neticdk/go-bitbucket v1.0.5 h1:H/++KM+O0EXVDbgMadbAsKwqjLKi0vDwa+vGU9lMChg=
github.com/neticdk/go-bitbucket v1.0.5/go.mod h1:4ZMxzmr5hi/EoLdydtR7h4dd4DpqK8tbnVLbAkscRc8=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down
16 changes: 11 additions & 5 deletions server/forge/bitbucketdatacenter/bitbucketdatacenter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ func (c *client) Deactivate(ctx context.Context, u *model.User, r *model.Repo, l
}

func (c *client) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model.Pipeline, error) {
hook, err := parseHook(r, c.url)
hook, currCommit, prevCommit, err := parseHook(r, c.url)
if err != nil {
return nil, nil, fmt.Errorf("unable to parse hook: %w", err)
}
Expand All @@ -518,7 +518,7 @@ func (c *client) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model

switch e := hook.Event.(type) {
case *bb.RepositoryPushEvent:
pipe, err = c.updatePipelineFromCommit(ctx, user, repo, hook.Pipeline)
pipe, err = c.updatePipelineFromCommits(ctx, user, repo, hook.Pipeline, currCommit, prevCommit)
case *bb.PullRequestEvent:
pipe, err = c.updatePipelineFromPullRequest(ctx, user, repo, hook.Pipeline, e.PullRequest.ID)
}
Expand Down Expand Up @@ -558,7 +558,7 @@ func (c *client) getUserAndRepo(ctx context.Context, r *model.Repo) (*model.User
return user, repo, nil
}

func (c *client) updatePipelineFromCommit(ctx context.Context, u *model.User, r *model.Repo, p *model.Pipeline) (*model.Pipeline, error) {
func (c *client) updatePipelineFromCommits(ctx context.Context, u *model.User, r *model.Repo, p *model.Pipeline, currCommit, prevCommit string) (*model.Pipeline, error) {
if p == nil {
return nil, nil
}
Expand All @@ -574,9 +574,15 @@ func (c *client) updatePipelineFromCommit(ctx context.Context, u *model.User, r
}
p.Message = commit.Message

opts := &bb.ListOptions{}
opts := &bb.CompareChangesOptions{}
if currCommit != "" {
opts.From = currCommit
}
if prevCommit != "" {
opts.To = prevCommit
}
for {
changes, resp, err := bc.Projects.ListChanges(ctx, r.Owner, r.Name, p.Commit, opts)
changes, resp, err := bc.Projects.CompareChanges(ctx, r.Owner, r.Name, opts)
if err != nil {
return nil, fmt.Errorf("unable to list commit changes: %w", err)
}
Expand Down
13 changes: 13 additions & 0 deletions server/forge/bitbucketdatacenter/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,19 @@ func convertRepositoryPushEvent(ev *bb.RepositoryPushEvent, baseURL string) *mod
return pipeline
}

func convertGetCommitRange(ev *bb.RepositoryPushEvent) (currCommit, prevCommit string) {
if len(ev.Changes) == 0 {
return "", ""
}
change := ev.Changes[0]
if change.FromHash == "0000000000000000000000000000000000000000" {
return change.ToHash, ""
} else if change.ToHash == "0000000000000000000000000000000000000000" {
return "", change.FromHash
}
return change.ToHash, change.FromHash
}

func convertPullRequestEvent(ev *bb.PullRequestEvent, baseURL string) *model.Pipeline {
pipeline := &model.Pipeline{
Commit: ev.PullRequest.Source.Latest,
Expand Down
11 changes: 6 additions & 5 deletions server/forge/bitbucketdatacenter/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ type HookResult struct {
Payload []byte
}

func parseHook(r *http.Request, baseURL string) (*HookResult, error) {
func parseHook(r *http.Request, baseURL string) (*HookResult, string, string, error) {
ev, payload, err := bb.ParsePayloadWithoutSignature(r)
if err != nil {
return nil, fmt.Errorf("unable to parse payload from webhook invocation: %w", err)
return nil, "", "", fmt.Errorf("unable to parse payload from webhook invocation: %w", err)
}

result := &HookResult{
Expand All @@ -32,12 +32,13 @@ func parseHook(r *http.Request, baseURL string) (*HookResult, error) {
case *bb.RepositoryPushEvent:
result.Repo = convertRepo(&e.Repository, nil, "")
result.Pipeline = convertRepositoryPushEvent(e, baseURL)
currCommit, prevCommit := convertGetCommitRange(e)
return result, currCommit, prevCommit, nil
case *bb.PullRequestEvent:
result.Repo = convertRepo(&e.PullRequest.Target.Repository, nil, "")
result.Pipeline = convertPullRequestEvent(e, baseURL)
return result, "", "", nil
default:
return nil, &types.ErrIgnoreEvent{Event: fmt.Sprintf("%T", e), Reason: "unsupported webhook event type"}
return nil, "", "", &types.ErrIgnoreEvent{Event: fmt.Sprintf("%T", e), Reason: "unsupported webhook event type"}
}

return result, nil
}
16 changes: 12 additions & 4 deletions server/forge/bitbucketdatacenter/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ func Test_parseHook(t *testing.T) {
req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-Event-Key", "pr:opened")

result, err := parseHook(req, "https://bitbucket.example.com")
result, curCommit, prevCommit, err := parseHook(req, "https://bitbucket.example.com")

assert.NoError(t, err)
assert.NotNil(t, result)
assert.Empty(t, curCommit)
assert.Empty(t, prevCommit)
assert.IsType(t, &bb.PullRequestEvent{}, result.Event)
assert.NotNil(t, result.Repo)
assert.NotNil(t, result.Pipeline)
Expand All @@ -40,10 +42,12 @@ func Test_parseHook(t *testing.T) {
req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-Event-Key", "pr:opened")

result, err := parseHook(req, "https://bitbucket.example.com")
result, curCommit, prevCommit, err := parseHook(req, "https://bitbucket.example.com")

assert.NoError(t, err)
assert.NotNil(t, result)
assert.Empty(t, curCommit)
assert.Empty(t, prevCommit)
assert.IsType(t, &bb.PullRequestEvent{}, result.Event)
assert.NotNil(t, result.Repo)
assert.NotNil(t, result.Pipeline)
Expand All @@ -60,14 +64,16 @@ func Test_parseHook(t *testing.T) {
req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-Event-Key", "repo:refs_changed")

result, err := parseHook(req, "https://bitbucket.example.com")
result, curCommit, prevCommit, err := parseHook(req, "https://bitbucket.example.com")

assert.NoError(t, err)
assert.NotNil(t, result)
assert.IsType(t, &bb.RepositoryPushEvent{}, result.Event)
assert.NotNil(t, result.Repo)
assert.NotNil(t, result.Pipeline)
assert.NotNil(t, result.Payload)
assert.Equal(t, curCommit, "76797d54bca87db6d1e3e82ee40622c7908aa514")
assert.Equal(t, prevCommit, "e0e15221b987fd8296141c0faa6a79f7c86ca4ce")
assert.Equal(t, "DEV/deployment-automation", result.Repo.FullName)
assert.Equal(t, "76797d54bca87db6d1e3e82ee40622c7908aa514", result.Pipeline.Commit)
assert.Equal(t, model.EventPush, result.Pipeline.Event)
Expand All @@ -80,10 +86,12 @@ func Test_parseHook(t *testing.T) {
req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-Event-Key", "pr:merged")

result, err := parseHook(req, "https://bitbucket.example.com")
result, curCommit, prevCommit, err := parseHook(req, "https://bitbucket.example.com")

assert.NoError(t, err)
assert.NotNil(t, result)
assert.Empty(t, curCommit)
assert.Empty(t, prevCommit)
assert.IsType(t, &bb.PullRequestEvent{}, result.Event)
assert.NotNil(t, result.Repo)
assert.NotNil(t, result.Pipeline)
Expand Down