refactor: allow returning multiple actions on delete (#1393)

phm07 · web-flow · commit cca9bebcb7a7 · 2026-04-24T17:34:09.000+02:00
This PR allows returning multiple actions during delete.
diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
@@ -24,7 +24,7 @@ type DeleteCmd[T any] struct {
 	NameSuggestions      func(client hcapi2.Client) func() []string
 	AdditionalFlags      func(*cobra.Command)
 	Fetch                FetchFunc[T]
-	Delete               func(s state.State, cmd *cobra.Command, resource T) (*hcloud.Action, error)
+	Delete               func(s state.State, cmd *cobra.Command, resource T) ([]*hcloud.Action, error)
 
 	// FetchFunc is a factory function that produces [DeleteCmd.Fetch]. Should be set in case the resource has
 	// more than a single identifier that is used in the positional arguments.
@@ -115,7 +115,7 @@ func (dc *DeleteCmd[T]) Run(s state.State, cmd *cobra.Command, args []string) er
 
 	for batch := range slices.Chunk(toDelete, deleteBatchSize) {
 		results := make([]util.ResourceState, len(batch))
-		actions := make([]*hcloud.Action, 0, len(batch))
+		var actions []*hcloud.Action
 
 		for i, idOrName := range batch {
 			results[i] = util.ResourceState{IDOrName: idOrName}
@@ -130,14 +130,12 @@ func (dc *DeleteCmd[T]) Run(s state.State, cmd *cobra.Command, args []string) er
 				continue
 			}
 
-			action, err := dc.Delete(s, cmd, resource)
+			deleteActions, err := dc.Delete(s, cmd, resource)
 			if err != nil {
 				results[i].Error = err
 				continue
 			}
-			if action != nil {
-				actions = append(actions, action)
-			}
+			actions = append(actions, deleteActions...)
 		}
 
 		for _, result := range results {
diff --git a/internal/cmd/base/delete_test.go b/internal/cmd/base/delete_test.go
@@ -19,7 +19,7 @@ var mu = sync.Mutex{}
 var fakeDeleteCmd = &base.DeleteCmd[*fakeResource]{
 	ResourceNameSingular: "Fake resource",
 	ResourceNamePlural:   "Fake resources",
-	Delete: func(_ state.State, cmd *cobra.Command, _ *fakeResource) (*hcloud.Action, error) {
+	Delete: func(_ state.State, cmd *cobra.Command, _ *fakeResource) ([]*hcloud.Action, error) {
 		defer mu.Unlock()
 		cmd.Println("Deleting fake resource")
 		return nil, nil
diff --git a/internal/cmd/certificate/delete.go b/internal/cmd/certificate/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Certificate]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.Certificate, *hcloud.Response, error) {
 		return s.Client().Certificate().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, certificate *hcloud.Certificate) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, certificate *hcloud.Certificate) ([]*hcloud.Action, error) {
 		_, err := s.Client().Certificate().Delete(s, certificate)
 		return nil, err
 	},
diff --git a/internal/cmd/firewall/delete.go b/internal/cmd/firewall/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Firewall]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.Firewall, *hcloud.Response, error) {
 		return s.Client().Firewall().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, firewall *hcloud.Firewall) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, firewall *hcloud.Firewall) ([]*hcloud.Action, error) {
 		_, err := s.Client().Firewall().Delete(s, firewall)
 		return nil, err
 	},
diff --git a/internal/cmd/floatingip/delete.go b/internal/cmd/floatingip/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.FloatingIP]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.FloatingIP, *hcloud.Response, error) {
 		return s.Client().FloatingIP().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, floatingIP *hcloud.FloatingIP) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, floatingIP *hcloud.FloatingIP) ([]*hcloud.Action, error) {
 		_, err := s.Client().FloatingIP().Delete(s, floatingIP)
 		return nil, err
 	},
diff --git a/internal/cmd/image/delete.go b/internal/cmd/image/delete.go
@@ -24,7 +24,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Image]{
 		}
 		return s.Client().Image().GetByID(s, id)
 	},
-	Delete: func(s state.State, _ *cobra.Command, image *hcloud.Image) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, image *hcloud.Image) ([]*hcloud.Action, error) {
 		_, err := s.Client().Image().Delete(s, image)
 		return nil, err
 	},
diff --git a/internal/cmd/loadbalancer/delete.go b/internal/cmd/loadbalancer/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.LoadBalancer]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.LoadBalancer, *hcloud.Response, error) {
 		return s.Client().LoadBalancer().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, loadBalancer *hcloud.LoadBalancer) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, loadBalancer *hcloud.LoadBalancer) ([]*hcloud.Action, error) {
 		_, err := s.Client().LoadBalancer().Delete(s, loadBalancer)
 		return nil, err
 	},
diff --git a/internal/cmd/network/delete.go b/internal/cmd/network/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Network]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.Network, *hcloud.Response, error) {
 		return s.Client().Network().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, network *hcloud.Network) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, network *hcloud.Network) ([]*hcloud.Action, error) {
 		_, err := s.Client().Network().Delete(s, network)
 		return nil, err
 	},
diff --git a/internal/cmd/placementgroup/delete.go b/internal/cmd/placementgroup/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.PlacementGroup]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.PlacementGroup, *hcloud.Response, error) {
 		return s.Client().PlacementGroup().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, placementGroup *hcloud.PlacementGroup) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, placementGroup *hcloud.PlacementGroup) ([]*hcloud.Action, error) {
 		_, err := s.Client().PlacementGroup().Delete(s, placementGroup)
 		return nil, err
 	},
diff --git a/internal/cmd/primaryip/delete.go b/internal/cmd/primaryip/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.PrimaryIP]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.PrimaryIP, *hcloud.Response, error) {
 		return s.Client().PrimaryIP().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, primaryIP *hcloud.PrimaryIP) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, primaryIP *hcloud.PrimaryIP) ([]*hcloud.Action, error) {
 		_, err := s.Client().PrimaryIP().Delete(s, primaryIP)
 		return nil, err
 	},
diff --git a/internal/cmd/server/delete.go b/internal/cmd/server/delete.go
@@ -17,11 +17,11 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Server]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.Server, *hcloud.Response, error) {
 		return s.Client().Server().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, server *hcloud.Server) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, server *hcloud.Server) ([]*hcloud.Action, error) {
 		result, _, err := s.Client().Server().DeleteWithResult(s, server)
 		if err != nil {
 			return nil, err
 		}
-		return result.Action, nil
+		return []*hcloud.Action{result.Action}, nil
 	},
 }
diff --git a/internal/cmd/sshkey/delete.go b/internal/cmd/sshkey/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.SSHKey]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.SSHKey, *hcloud.Response, error) {
 		return s.Client().SSHKey().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, sshKey *hcloud.SSHKey) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, sshKey *hcloud.SSHKey) ([]*hcloud.Action, error) {
 		_, err := s.Client().SSHKey().Delete(s, sshKey)
 		return nil, err
 	},
diff --git a/internal/cmd/storagebox/delete.go b/internal/cmd/storagebox/delete.go
@@ -17,8 +17,8 @@ var DeleteCmd = base.DeleteCmd[*hcloud.StorageBox]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.StorageBox, *hcloud.Response, error) {
 		return s.Client().StorageBox().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, storageBox *hcloud.StorageBox) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, storageBox *hcloud.StorageBox) ([]*hcloud.Action, error) {
 		result, _, err := s.Client().StorageBox().Delete(s, storageBox)
-		return result.Action, err
+		return []*hcloud.Action{result.Action}, err
 	},
 }
diff --git a/internal/cmd/storagebox/snapshot/delete.go b/internal/cmd/storagebox/snapshot/delete.go
@@ -37,8 +37,8 @@ var DeleteCmd = base.DeleteCmd[*hcloud.StorageBoxSnapshot]{
 		}, nil
 	},
 
-	Delete: func(s state.State, _ *cobra.Command, snapshot *hcloud.StorageBoxSnapshot) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, snapshot *hcloud.StorageBoxSnapshot) ([]*hcloud.Action, error) {
 		result, _, err := s.Client().StorageBox().DeleteSnapshot(s, snapshot)
-		return result.Action, err
+		return []*hcloud.Action{result.Action}, err
 	},
 }
diff --git a/internal/cmd/storagebox/subaccount/delete.go b/internal/cmd/storagebox/subaccount/delete.go
@@ -37,8 +37,8 @@ var DeleteCmd = base.DeleteCmd[*hcloud.StorageBoxSubaccount]{
 		}, nil
 	},
 
-	Delete: func(s state.State, _ *cobra.Command, subaccount *hcloud.StorageBoxSubaccount) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, subaccount *hcloud.StorageBoxSubaccount) ([]*hcloud.Action, error) {
 		result, _, err := s.Client().StorageBox().DeleteSubaccount(s, subaccount)
-		return result.Action, err
+		return []*hcloud.Action{result.Action}, err
 	},
 }
diff --git a/internal/cmd/volume/delete.go b/internal/cmd/volume/delete.go
@@ -17,7 +17,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Volume]{
 	Fetch: func(s state.State, _ *cobra.Command, idOrName string) (*hcloud.Volume, *hcloud.Response, error) {
 		return s.Client().Volume().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, volume *hcloud.Volume) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, volume *hcloud.Volume) ([]*hcloud.Action, error) {
 		_, err := s.Client().Volume().Delete(s, volume)
 		return nil, err
 	},
diff --git a/internal/cmd/zone/delete.go b/internal/cmd/zone/delete.go
@@ -25,11 +25,11 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Zone]{
 
 		return s.Client().Zone().Get(s, idOrName)
 	},
-	Delete: func(s state.State, _ *cobra.Command, zone *hcloud.Zone) (*hcloud.Action, error) {
+	Delete: func(s state.State, _ *cobra.Command, zone *hcloud.Zone) ([]*hcloud.Action, error) {
 		res, _, err := s.Client().Zone().Delete(s, zone)
 		if err != nil {
 			return nil, err
 		}
-		return res.Action, nil
+		return []*hcloud.Action{res.Action}, nil
 	},
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ var DeleteCmd = base.DeleteCmd[*hcloud.Image]{`
`24`	`24`	`}`
`25`	`25`	`return s.Client().Image().GetByID(s, id)`
`26`	`26`	`},`
`27`		`- Delete: func(s state.State, _ cobra.Command, image hcloud.Image) (*hcloud.Action, error) {`
	`27`	`+ Delete: func(s state.State, _ cobra.Command, image hcloud.Image) ([]*hcloud.Action, error) {`
`28`	`28`	`_, err := s.Client().Image().Delete(s, image)`
`29`	`29`	`return nil, err`
`30`	`30`	`},`