Support deleting by tag

Author: jacobwgillespie

pkg/cmd/image/list.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"os"
 	"sort"
-	"strings"
 	"time"
 
 	"connectrpc.com/connect"
@@ -160,14 +159,8 @@ func fetchAllImages(ctx context.Context, projectID, token string, client buildv1
 				t := img.PushedAt.AsTime()
 				pushedAt = &t
 			}
-			// The API returns tags in format: registry.depot.dev/PROJECT:TAG
-			// We want to show them as PROJECT:TAG
-			tag := img.Tag
-			if strings.HasPrefix(tag, "registry.depot.dev/") {
-				tag = strings.TrimPrefix(tag, "registry.depot.dev/")
-			}
 			allImages = append(allImages, DepotImage{
-				Tag:       tag,
+				Tag:       img.Tag,
 				Digest:    img.Digest,
 				SizeBytes: img.SizeBytes,
 				PushedAt:  pushedAt,

pkg/cmd/image/rm.go

@@ -1,10 +1,7 @@
 package image
 
 import (
-	"context"
 	"fmt"
-	"strings"
-	"time"
 
 	"connectrpc.com/connect"
 	"github.com/depot/cli/pkg/api"
@@ -16,46 +13,24 @@ import (
 
 func NewCmdRM() *cobra.Command {
 	var token string
-	var force bool
-	var digests []string
+	var projectID string
 
 	cmd := &cobra.Command{
-		Use:     "rm PROJECT --digest DIGEST [--digest DIGEST...]",
+		Use:     "rm <tag> [<tag>...]",
 		Aliases: []string{"remove", "delete"},
-		Short:   "Remove images from the registry by digest",
-		Long: `Remove images from the registry by digest.
-
-To find image digests, use 'depot image list --project PROJECT'.
-Images are referenced by their sha256 digest.`,
-		Example: `  # Delete a single image by digest
-  depot image rm myproject --digest sha256:abc123...
-  
-  # Delete multiple images
-  depot image rm myproject --digest sha256:abc123... --digest sha256:def456...
-  
-  # Force deletion without confirmation
-  depot image rm myproject --digest sha256:abc123... --force`,
-		Args: cobra.ExactArgs(1),
+		Short:   "Remove images from the registry by tag",
+		Args:    cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-			defer cancel()
-
-			projectID := args[0]
+			ctx := cmd.Context()
 
-			if len(digests) == 0 {
-				return errors.New("at least one --digest is required")
+			projectID = helpers.ResolveProjectID(projectID)
+			if projectID == "" {
+				return errors.New("please specify a project ID")
 			}
 
-			// Convert digests to the format ECR expects
-			var imageTags []string
-			for _, digest := range digests {
-				// The ECR API expects image tags in the format "sha256-<digest>" rather than the standard "sha256:<digest>".
-				// This transformation ensures compatibility with the ECR API by converting the prefix.
-				digest = strings.TrimPrefix(digest, "sha256:")
-				imageTags = append(imageTags, "sha256-"+digest)
-			}
+			imageTags := args
 
-			token, err := helpers.ResolveProjectAuth(context.Background(), token)
+			token, err := helpers.ResolveProjectAuth(ctx, token)
 			if err != nil {
 				return err
 			}
@@ -64,34 +39,16 @@ Images are referenced by their sha256 digest.`,
 				return fmt.Errorf("missing API token, please run `depot login`")
 			}
 
-			totalImages := len(digests)
-			if !force {
-				fmt.Printf("Are you sure you want to delete %d image(s)? [y/N]: ", totalImages)
-				var response string
-				if _, err := fmt.Scanln(&response); err != nil {
-					return fmt.Errorf("error reading input: %w", err)
-				}
-				if response != "y" && response != "Y" {
-					fmt.Println("Operation cancelled")
-					return nil
-				}
-			}
-
 			client := api.NewRegistryClient()
-
-			req := connect.NewRequest(&v1.DeleteImageRequest{
-				ProjectId: projectID,
-				ImageTags: imageTags,
-			})
-
-			req = api.WithAuthentication(req, token)
-			_, err = client.DeleteImage(ctx, req)
+			req := connect.NewRequest(&v1.DeleteImageRequest{ProjectId: projectID, ImageTags: imageTags})
+			_, err = client.DeleteImage(ctx, api.WithAuthentication(req, token))
 			if err != nil {
 				return fmt.Errorf("failed to delete images: %v", err)
 			}
 
+			totalImages := len(imageTags)
 			if totalImages == 1 {
-				fmt.Printf("Successfully deleted image with digest: %s\n", digests[0])
+				fmt.Printf("Successfully deleted image with tag: %s\n", imageTags[0])
 			} else {
 				fmt.Printf("Successfully deleted %d images\n", totalImages)
 			}
@@ -101,11 +58,8 @@ Images are referenced by their sha256 digest.`,
 	}
 
 	flags := cmd.Flags()
-	flags.StringSliceVar(&digests, "digest", []string{}, "Image digest(s) to delete (can be specified multiple times)")
+	flags.StringVar(&projectID, "project", "", "Depot project ID")
 	flags.StringVar(&token, "token", "", "Depot token")
-	flags.BoolVarP(&force, "force", "f", false, "Force deletion without confirmation")
-
-	cmd.MarkFlagRequired("digest")
 
 	return cmd
 }

proto/depot/build/v1/registry.proto

@@ -13,10 +13,10 @@ service RegistryService {
 
 message ListImagesRequest {
   string project_id = 1;
-  
+
   // The maximum number of results to return per page
   optional int32 page_size = 2;
-  
+
   // The page token indicating which page of results to return
   optional string page_token = 3;
 }
@@ -30,7 +30,7 @@ message Image {
 
 message ListImagesResponse {
   repeated Image images = 1;
-  
+
   // The next page token, if there are more results
   optional string next_page_token = 2;
 }
@@ -40,4 +40,4 @@ message DeleteImageRequest {
   repeated string image_tags = 2;
 }
 
-message DeleteImageResponse {}
+message DeleteImageResponse {}