fix(daemon): reconcile and merge tasks whose PR was merged on the forge (#1872)
ListOpenPRs dropped org_id, so the reconciler resolved the forge and worktrees in the default org instead of the task's own and skipped the task silently. Select the org, log a skipped task, and let the Merge action succeed when the forge reports the PR already merged.
This commit is contained in:
7 files changed
+80
-5
No files matched your search
@@ -6,6 +6,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/domain/taskactions"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/events"
|
||||
"github.com/samcharles93/archie-core/internal/forge"
|
||||
taskactionstore "github.com/samcharles93/archie-core/internal/infrastructure/taskactions"
|
||||
)
|
||||
|
||||
@@ -56,7 +57,7 @@ func (b *boot) mergePR(ctx context.Context, owner, repo string, number int) erro
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return f.MergePR(ctx, owner, repo, number)
|
||||
return forge.MergeOrConfirm(ctx, f, owner, repo, number)
|
||||
}
|
||||
|
||||
func (b *boot) removeTaskLogs(id int64) error {
|
||||
|
||||
@@ -264,6 +264,7 @@ func (s *ReviewScanner) reconcilePRs(ctx context.Context) error {
|
||||
for _, t := range tasks {
|
||||
fg := s.repos.forgeFor(ctx, &t)
|
||||
if _, unavailable := fg.(*forge.NoopForge); unavailable {
|
||||
s.log.WarnContext(ctx, "PR state check skipped: no forge for task", "task", t.ID, "pr", t.PRNumber)
|
||||
continue
|
||||
}
|
||||
trees := s.repos.treesFor(&t)
|
||||
@@ -279,7 +280,7 @@ func (s *ReviewScanner) reconcilePRs(ctx context.Context) error {
|
||||
}
|
||||
attempt := t.Attempt
|
||||
switch state {
|
||||
case "merged":
|
||||
case forge.PRStateMerged:
|
||||
if err := s.store.Transition(ctx, t.ID, workflow.StatusPROpen, workflow.StatusMerged, ""); err != nil {
|
||||
s.log.ErrorContext(ctx, "PR merged but task transition failed", "task", t.ID, "pr", t.PRNumber, "err", err)
|
||||
failed = append(failed, fmt.Sprintf("%s/%s#%d", t.Owner, t.Repo, t.PRNumber))
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package forge
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
)
|
||||
|
||||
// PRStateMerged is the state PRState reports for a merged pull request.
|
||||
const PRStateMerged = "merged"
|
||||
|
||||
// MergeOrConfirm merges a pull request and treats a refusal as success when
|
||||
// the forge reports the PR already merged: a merge outside Archie, or one that
|
||||
// raced the reconciler, leaves nothing to refuse.
|
||||
func MergeOrConfirm(ctx context.Context, f Forge, owner, repo string, number int) error {
|
||||
mergeErr := f.MergePR(ctx, owner, repo, number)
|
||||
if mergeErr == nil {
|
||||
return nil
|
||||
}
|
||||
state, err := f.PRState(ctx, owner, repo, number)
|
||||
if err == nil && state == PRStateMerged {
|
||||
return nil
|
||||
}
|
||||
return errors.Join(mergeErr, err)
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package forge
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type mergeForge struct {
|
||||
Forge
|
||||
mergeErr, stateErr error
|
||||
state string
|
||||
}
|
||||
|
||||
func (f mergeForge) MergePR(context.Context, string, string, int) error { return f.mergeErr }
|
||||
|
||||
func (f mergeForge) PRState(context.Context, string, string, int) (string, error) {
|
||||
return f.state, f.stateErr
|
||||
}
|
||||
|
||||
// TestMergeOrConfirm guards the Merge action returning a conflict for a pull
|
||||
// request that was already merged on the forge, leaving the task In review.
|
||||
func TestMergeOrConfirm(t *testing.T) {
|
||||
refused := errors.New("forge did not merge it")
|
||||
tests := []struct {
|
||||
name string
|
||||
give mergeForge
|
||||
wantErr bool
|
||||
}{
|
||||
{name: "merge succeeds", give: mergeForge{}},
|
||||
{name: "refused but already merged", give: mergeForge{mergeErr: refused, state: "merged"}},
|
||||
{name: "refused and still open", give: mergeForge{mergeErr: refused, state: "open"}, wantErr: true},
|
||||
{name: "refused and closed", give: mergeForge{mergeErr: refused, state: "closed"}, wantErr: true},
|
||||
{name: "refused and state unreadable", give: mergeForge{mergeErr: refused, stateErr: errors.New("down")}, wantErr: true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := MergeOrConfirm(t.Context(), tt.give, "o", "r", 1)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Fatalf("err = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
if tt.wantErr && !errors.Is(err, refused) {
|
||||
t.Fatalf("err = %v, want it to wrap the refusal", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -651,12 +651,13 @@ func (q *Queries) InsertTransition(ctx context.Context, arg InsertTransitionPara
|
||||
}
|
||||
|
||||
const listOpenPRs = `-- name: ListOpenPRs :many
|
||||
SELECT id, owner, repo, issue_number, pr_number, status, source, identity, attempt, review_cursor, watch_comment_id, outputs
|
||||
SELECT id, org_id, owner, repo, issue_number, pr_number, status, source, identity, attempt, review_cursor, watch_comment_id, outputs
|
||||
FROM tasks WHERE status = 'pr_open' AND ($1::text IS NULL OR org_id = $1)
|
||||
`
|
||||
|
||||
type ListOpenPRsRow struct {
|
||||
ID int64
|
||||
OrgID string
|
||||
Owner string
|
||||
Repo string
|
||||
IssueNumber int64
|
||||
@@ -681,6 +682,7 @@ func (q *Queries) ListOpenPRs(ctx context.Context, scopeOrg pgtype.Text) ([]List
|
||||
var i ListOpenPRsRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.OrgID,
|
||||
&i.Owner,
|
||||
&i.Repo,
|
||||
&i.IssueNumber,
|
||||
|
||||
@@ -308,7 +308,7 @@ WHERE id = @id AND status = @from_status
|
||||
DELETE FROM tasks WHERE id = $1 AND status = $2;
|
||||
|
||||
-- name: ListOpenPRs :many
|
||||
SELECT id, owner, repo, issue_number, pr_number, status, source, identity, attempt, review_cursor, watch_comment_id, outputs
|
||||
SELECT id, org_id, owner, repo, issue_number, pr_number, status, source, identity, attempt, review_cursor, watch_comment_id, outputs
|
||||
FROM tasks WHERE status = 'pr_open' AND (sqlc.narg(scope_org)::text IS NULL OR org_id = sqlc.narg(scope_org));
|
||||
|
||||
-- name: NextTaskID :one
|
||||
|
||||
@@ -802,7 +802,7 @@ func (s *Store) OpenPRs(ctx context.Context) ([]workflow.Task, error) {
|
||||
for _, r := range rows {
|
||||
outputs, _ := task.DecodeOutputs(r.Outputs)
|
||||
tasks = append(tasks, workflow.Task{
|
||||
ID: r.ID, Owner: r.Owner, Repo: r.Repo, IssueNumber: int(r.IssueNumber),
|
||||
ID: r.ID, Org: org.OrgID(r.OrgID), Owner: r.Owner, Repo: r.Repo, IssueNumber: int(r.IssueNumber),
|
||||
PRNumber: int(r.PrNumber), Status: r.Status, Source: r.Source,
|
||||
Identity: r.Identity, Attempt: int(r.Attempt),
|
||||
ReviewCursor: r.ReviewCursor, WatchCommentID: r.WatchCommentID,
|
||||
|
||||
Reference in new issue
Block a user