From 7ab336622012e55786996e148113e05a6aa38605 Mon Sep 17 00:00:00 2001 From: Alain Thiffault Date: Sun, 25 Jan 2026 23:36:42 +0000 Subject: [PATCH] fix(labels): improve delete command and fix --id flag type (#865) ## Summary Fix the `tea labels delete` and `tea labels update` commands which were silently ignoring the `--id` flag. ## Problem Both commands used `IntFlag` for the `--id` parameter but called `ctx.Int64("id")` to retrieve the value. This type mismatch caused the ID to always be read as `0`, making the commands useless. **Before (bug):** ```bash $ tea labels delete --id 36 --debug DELETE: .../labels/0 # Wrong! ID ignored ``` **After (fix):** ```bash $ tea labels delete --id 36 --debug GET: .../labels/36 # Verify exists DELETE: .../labels/36 # Correct ID Label 'my-label' (id: 36) deleted successfully ``` ## Changes ### labels/delete.go - Change `IntFlag` to `Int64Flag` to match `ctx.Int64()` usage - Make `--id` flag required - Verify label exists before attempting deletion - Provide clear error messages with label name and ID context - Print success message after deletion ### labels/update.go - Change `IntFlag` to `Int64Flag` to fix the same bug ## Test plan - [x] `go test ./...` passes - [x] `go vet ./...` passes - [x] `gofmt` check passes - [x] Manual testing confirms ID is now correctly passed to API - [ ] CI passes Reviewed-on: https://gitea.com/gitea/tea/pulls/865 Reviewed-by: Lunny Xiao Co-authored-by: Alain Thiffault Co-committed-by: Alain Thiffault --- cmd/labels/delete.go | 26 +++++++++++++++++++++----- cmd/labels/update.go | 2 +- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cmd/labels/delete.go b/cmd/labels/delete.go index 0719fef..cc72e39 100644 --- a/cmd/labels/delete.go +++ b/cmd/labels/delete.go @@ -5,6 +5,7 @@ package labels import ( stdctx "context" + "fmt" "code.gitea.io/tea/cmd/flags" "code.gitea.io/tea/modules/context" @@ -21,9 +22,10 @@ var CmdLabelDelete = cli.Command{ ArgsUsage: " ", // command does not accept arguments Action: runLabelDelete, Flags: append([]cli.Flag{ - &cli.IntFlag{ - Name: "id", - Usage: "label id", + &cli.Int64Flag{ + Name: "id", + Usage: "label id", + Required: true, }, }, flags.AllDefaultFlags...), } @@ -32,6 +34,20 @@ func runLabelDelete(_ stdctx.Context, cmd *cli.Command) error { ctx := context.InitCommand(cmd) ctx.Ensure(context.CtxRequirement{RemoteRepo: true}) - _, err := ctx.Login.Client().DeleteLabel(ctx.Owner, ctx.Repo, ctx.Int64("id")) - return err + labelID := ctx.Int64("id") + client := ctx.Login.Client() + + // Verify the label exists first + label, _, err := client.GetRepoLabel(ctx.Owner, ctx.Repo, labelID) + if err != nil { + return fmt.Errorf("failed to get label %d: %w", labelID, err) + } + + _, err = client.DeleteLabel(ctx.Owner, ctx.Repo, labelID) + if err != nil { + return fmt.Errorf("failed to delete label '%s' (id: %d): %w", label.Name, labelID, err) + } + + fmt.Printf("Label '%s' (id: %d) deleted successfully\n", label.Name, labelID) + return nil } diff --git a/cmd/labels/update.go b/cmd/labels/update.go index 3f20862..1b55a90 100644 --- a/cmd/labels/update.go +++ b/cmd/labels/update.go @@ -21,7 +21,7 @@ var CmdLabelUpdate = cli.Command{ ArgsUsage: " ", // command does not accept arguments Action: runLabelUpdate, Flags: append([]cli.Flag{ - &cli.IntFlag{ + &cli.Int64Flag{ Name: "id", Usage: "label id", },