From bc135c265594629d5a0ec4640bf2b3deb4076c67 Mon Sep 17 00:00:00 2001
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Date: Sat, 11 Oct 2025 20:38:00 +0200
Subject: [PATCH] Add branch filter to cli pipeline purge (#5616)

Signed-off-by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Co-authored-by: Robert Kaussow <mail@thegeeklab.de>
---
 cli/pipeline/purge.go      | 30 +++++++++++++++++++-----------
 cli/pipeline/purge_test.go | 10 ++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/cli/pipeline/purge.go b/cli/pipeline/purge.go
index 6fff2e07a..c6f2efb5a 100644
--- a/cli/pipeline/purge.go
+++ b/cli/pipeline/purge.go
@@ -37,6 +37,10 @@ var pipelinePurgeCmd = &cli.Command{
 	Action:    Purge,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
+			Name:  "branch",
+			Usage: "remove pipelines of this branch only",
+		},
+		&cli.DurationFlag{
 			Name:     "older-than",
 			Usage:    "remove pipelines older than the specified time limit",
 			Required: true,
@@ -55,14 +59,15 @@ var pipelinePurgeCmd = &cli.Command{
 }
 
 func Purge(ctx context.Context, c *cli.Command) error {
+	start := time.Now()
 	client, err := internal.NewClient(ctx, c)
 	if err != nil {
 		return err
 	}
-	return pipelinePurge(c, client)
+	return pipelinePurge(c, client, start)
 }
 
-func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) {
+func pipelinePurge(c *cli.Command, client woodpecker.Client, start time.Time) (err error) {
 	repoIDOrFullName := c.Args().First()
 	if len(repoIDOrFullName) == 0 {
 		return fmt.Errorf("missing required argument repo-id / repo-full-name")
@@ -72,25 +77,26 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) {
 		return fmt.Errorf("invalid repo '%s': %w", repoIDOrFullName, err)
 	}
 
-	olderThan := c.String("older-than")
+	branch := c.String("branch")
+	olderThan := c.Duration("older-than")
 	keepMin := c.Int64("keep-min")
 	dryRun := c.Bool("dry-run")
 
-	duration, err := time.ParseDuration(olderThan)
-	if err != nil {
-		return err
+	var before time.Time
+	if !start.IsZero() {
+		before = start.Add(-olderThan)
 	}
 
 	var pipelinesKeep []*woodpecker.Pipeline
 
 	if keepMin > 0 {
-		pipelinesKeep, err = fetchPipelinesToKeep(client, repoID, int(keepMin))
+		pipelinesKeep, err = fetchPipelinesToKeep(client, repoID, branch, int(keepMin))
 		if err != nil {
 			return err
 		}
 	}
 
-	pipelines, err := fetchPipelines(client, repoID, duration)
+	pipelines, err := fetchPipelines(client, repoID, branch, before)
 	if err != nil {
 		return err
 	}
@@ -135,7 +141,7 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) {
 	return nil
 }
 
-func fetchPipelinesToKeep(client woodpecker.Client, repoID int64, keepMin int) ([]*woodpecker.Pipeline, error) {
+func fetchPipelinesToKeep(client woodpecker.Client, repoID int64, branch string, keepMin int) ([]*woodpecker.Pipeline, error) {
 	if keepMin <= 0 {
 		return nil, nil
 	}
@@ -145,19 +151,21 @@ func fetchPipelinesToKeep(client woodpecker.Client, repoID int64, keepMin int) (
 				ListOptions: woodpecker.ListOptions{
 					Page: page,
 				},
+				Branch: branch,
 			},
 		)
 	}, keepMin)
 }
 
-func fetchPipelines(client woodpecker.Client, repoID int64, duration time.Duration) ([]*woodpecker.Pipeline, error) {
+func fetchPipelines(client woodpecker.Client, repoID int64, branch string, before time.Time) ([]*woodpecker.Pipeline, error) {
 	return shared_utils.Paginate(func(page int) ([]*woodpecker.Pipeline, error) {
 		return client.PipelineList(repoID,
 			woodpecker.PipelineListOptions{
 				ListOptions: woodpecker.ListOptions{
 					Page: page,
 				},
-				Before: time.Now().Add(-duration),
+				Before: before,
+				Branch: branch,
 			},
 		)
 	}, -1)
diff --git a/cli/pipeline/purge_test.go b/cli/pipeline/purge_test.go
index c3bc73ae8..72a1e91a7 100644
--- a/cli/pipeline/purge_test.go
+++ b/cli/pipeline/purge_test.go
@@ -2,9 +2,9 @@ package pipeline
 
 import (
 	"context"
-	"errors"
 	"io"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -48,12 +48,6 @@ func TestPipelinePurge(t *testing.T) {
 			},
 			wantDelete: 2,
 		},
-		{
-			name:    "error on invalid duration",
-			repoID:  1,
-			args:    []string{"purge", "--older-than", "invalid", "repo/name"},
-			wantErr: errors.New("time: invalid duration \"invalid\""),
-		},
 		{
 			name:   "continue on 422 error",
 			repoID: 1,
@@ -108,7 +102,7 @@ func TestPipelinePurge(t *testing.T) {
 			command := pipelinePurgeCmd
 			command.Writer = io.Discard
 			command.Action = func(_ context.Context, c *cli.Command) error {
-				err := pipelinePurge(c, mockClient)
+				err := pipelinePurge(c, mockClient, time.Unix(1, 1))
 
 				if tt.wantErr != nil {
 					assert.EqualError(t, err, tt.wantErr.Error())