add support for deleting all ephemeral devices

Signed-off-by: Lee Briggs <[email protected]>

Author: jaxxstorm

cmd/tscli/delete/devices/cli.go

@@ -44,6 +44,7 @@ func Command() *cobra.Command {
 		lastSeenDuration time.Duration
 		exclude          []string
 		confirm          bool
+		ephemeral        bool
 	)
 
 	cmd := &cobra.Command{
@@ -62,6 +63,9 @@ Examples:
   # Show devices that would be deleted (default behavior)
   tscli delete devices --last-seen 15m
 
+  # Delete only ephemeral devices not seen for 1 hour
+  tscli delete devices --last-seen 1h --ephemeral --confirm
+
   # Delete devices not seen for 24 hours, excluding specific patterns
   tscli delete devices --last-seen 24h --exclude server --exclude prod --confirm
 
@@ -74,7 +78,7 @@ Examples:
 				return fmt.Errorf("failed to create client: %w", err)
 			}
 
-			summary, err := deleteDisconnectedDevices(cmd.Context(), client, lastSeenDuration, exclude, confirm)
+			summary, err := deleteDisconnectedDevices(cmd.Context(), client, lastSeenDuration, exclude, ephemeral, confirm)
 			if err != nil {
 				return fmt.Errorf("failed to delete devices: %w", err)
 			}
@@ -94,13 +98,15 @@ Examples:
 		"Duration to consider a device disconnected (e.g., 15m, 1h, 24h)")
 	cmd.Flags().StringSliceVar(&exclude, "exclude", nil,
 		"Device names to exclude by partial match (can be specified multiple times)")
+	cmd.Flags().BoolVar(&ephemeral, "ephemeral", false,
+		"Only delete ephemeral devices")
 	cmd.Flags().BoolVar(&confirm, "confirm", false,
 		"Actually delete devices (default is a dry run)")
 
 	return cmd
 }
 
-func deleteDisconnectedDevices(ctx context.Context, client *tsapi.Client, lastSeenTimeout time.Duration, excludedDevices []string, confirm bool) (*DeletionSummary, error) {
+func deleteDisconnectedDevices(ctx context.Context, client *tsapi.Client, lastSeenTimeout time.Duration, excludedDevices []string, ephemeralOnly bool, confirm bool) (*DeletionSummary, error) {
 	// List all devices with full details to get ephemeral status
 	devices, err := client.Devices().ListWithAllFields(ctx)
 	if err != nil {
@@ -119,6 +125,12 @@ func deleteDisconnectedDevices(ctx context.Context, client *tsapi.Client, lastSe
 			continue
 		}
 
+		// Check if we should only process ephemeral devices
+		if ephemeralOnly && !device.IsEphemeral {
+			skippedDevices = append(skippedDevices, fmt.Sprintf("%s (not ephemeral)", device.Name))
+			continue
+		}
+
 		// Calculate time since the device was last seen
 		timeSinceLastSeen := now.Sub(device.LastSeen.Time)
 		if timeSinceLastSeen > lastSeenTimeout {

go.mod

@@ -15,7 +15,7 @@ require (
 	golang.org/x/oauth2 v0.30.0
 	golang.org/x/term v0.33.0
 	gopkg.in/yaml.v3 v3.0.1
-	tailscale.com/client/tailscale/v2 v2.0.0-20250714184745-d692cd62b191
+	tailscale.com/client/tailscale/v2 v2.0.0-20250721135607-5f581daaece7
 )
 
 require (

go.sum

@@ -201,3 +201,5 @@ tailscale.com/client/tailscale/v2 v2.0.0-20250616154411-35b8e02bd63e h1:X9wV8C5X
 tailscale.com/client/tailscale/v2 v2.0.0-20250616154411-35b8e02bd63e/go.mod h1:4akEJPbysqHWAP+t7CZLQ5ZH8/vZWeH6+Hv+fEJUMp0=
 tailscale.com/client/tailscale/v2 v2.0.0-20250714184745-d692cd62b191 h1:JE+IQOoOBQoli/OImRsEZt21/KMcA3komumwqINIUsc=
 tailscale.com/client/tailscale/v2 v2.0.0-20250714184745-d692cd62b191/go.mod h1:4akEJPbysqHWAP+t7CZLQ5ZH8/vZWeH6+Hv+fEJUMp0=
+tailscale.com/client/tailscale/v2 v2.0.0-20250721135607-5f581daaece7 h1:9rTFcSAHUmfMaOh8tO2+M3fgIumsPSDx61BoQtHZsqA=
+tailscale.com/client/tailscale/v2 v2.0.0-20250721135607-5f581daaece7/go.mod h1:4akEJPbysqHWAP+t7CZLQ5ZH8/vZWeH6+Hv+fEJUMp0=