Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 14 additions & 11 deletions internal/apiclient/client.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions internal/cmd/lavaflow/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ func TestShowSaysWhereTheMergeIs(t *testing.T) {
status, reason, want string
}{
{"waiting_for_checks", "", "Merge: waiting for CI\n"},
{"waiting_for_approval", "", "Merge: waiting for required approval (merges automatically after approval and CI)\n"},
{"waiting_for_approval", "paused", "Merge: paused while merging is off\n"},
// A paused merge keeps its status, whose checks may have finished.
{"waiting_for_checks", "paused", "Merge: paused while merging is off\n"},
{"queued", "paused", "Merge: paused while merging is off\n"},
Expand Down
2 changes: 2 additions & 0 deletions internal/output/lavaflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,8 @@ func lavaflowMergeStatus(status apiclient.LavaflowMergeStatus) string {
switch status {
case apiclient.LavaflowMergeStatusWaitingForChecks:
return "waiting for CI"
case apiclient.LavaflowMergeStatusWaitingForApproval:
return "waiting for required approval (merges automatically after approval and CI)"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚪ P3: Companion volcano-docs PR isn't linked as AGENTS.md requires

This adds user-facing output in lavaflow show, a new merge status line. AGENTS.md asks for a companion PR in Kong/volcano-docs updating content/cli, with the two PRs linked. The description only says docs are "coordinated in volcano-docs" and gives no link, so this review can't confirm the docs change exists. Link the companion PR.

Found by claude-opus-5-5

case apiclient.LavaflowMergeStatusHeld:
return "held"
case apiclient.LavaflowMergeStatusQueued:
Expand Down
Loading
Loading