feat: return host task from remove-host

api/apiv1/design/host.go

@@ -253,9 +253,12 @@ var ListHostsResponseExample = map[string]any{
 }
 
 var RemoveHostResponse = g.Type("RemoveHostResponse", func() {
+	g.Attribute("task", Task, func() {
+		g.Description("The task that tracks the overall host removal operation.")
+	})
 	g.Attribute("update_database_tasks", g.ArrayOf(Task), func() {
 		g.Description("The tasks that will update databases affected by the host removal.")
 	})
 
-	g.Required("update_database_tasks")
+	g.Required("task", "update_database_tasks")
 })

changes/unreleased/Changed-20260114-163406.yaml

@@ -0,0 +1,3 @@
+kind: Changed
+body: The `remove-host` API response now includes a `task` that tracks the progress of the entire remove host operation.
+time: 2026-01-14T16:34:06.805619-05:00

clustertest/cluster_test.go

@@ -101,8 +101,15 @@ func (c *Cluster) Remove(t testing.TB, hostID string) {
 		HostID: controlplane.Identifier(hostID),
 	})
 	require.NoError(t, err)
-	require.NotNil(t, resp, "RemoveHost response should not be nil")
-	require.NotNil(t, resp.UpdateDatabaseTasks, "UpdateDatabaseTasks should always be present (empty slice if no databases)")
+	require.NotNil(t, resp)
+	require.NotNil(t, resp.Task)
+	require.NotNil(t, resp.UpdateDatabaseTasks)
+
+	_, err = c.client.WaitForHostTask(t.Context(), &controlplane.GetHostTaskPayload{
+		HostID: controlplane.Identifier(hostID),
+		TaskID: resp.Task.TaskID,
+	})
+	require.NoError(t, err)
 
 	delete(c.hosts, hostID)
 	c.client = hostsClient(t, c.hosts)

server/internal/api/apiv1/post_init_handlers.go

@@ -200,23 +200,19 @@ func (s *PostInitHandlers) RemoveHost(ctx context.Context, req *api.RemoveHostPa
 		return nil, apiErr(err)
 	}
 
-	updateDatabaseInputs, err := s.prepareDatabaseUpdates(ctx, hostID, dbs)
+	specs, err := s.prepareDatabaseUpdates(ctx, hostID, dbs)
 	if err != nil {
-		return nil, err
-	}
-
-	input := &workflows.RemoveHostInput{
-		HostID:               hostID,
-		UpdateDatabaseInputs: updateDatabaseInputs,
+		return nil, apiErr(err)
 	}
 
-	dbTasks, err := s.workflowSvc.RemoveHost(ctx, input)
+	output, err := s.workflowSvc.RemoveHost(ctx, hostID, specs...)
 	if err != nil {
 		return nil, apiErr(err)
 	}
 
 	return &api.RemoveHostResponse{
-		UpdateDatabaseTasks: tasksToAPI(dbTasks),
+		Task:                taskToAPI(output.Task),
+		UpdateDatabaseTasks: tasksToAPI(output.DatabaseTasks),
 	}, nil
 }
 
@@ -248,36 +244,22 @@ func (s *PostInitHandlers) validateHostRemoval(ctx context.Context, hostID strin
 }
 
 // prepareDatabaseUpdates prepares workflow inputs for all databases affected by host removal.
-func (s *PostInitHandlers) prepareDatabaseUpdates(ctx context.Context, hostID string, dbs []*database.Database) ([]*workflows.UpdateDatabaseInput, error) {
-	updateInputs := make([]*workflows.UpdateDatabaseInput, 0, len(dbs))
-
+func (s *PostInitHandlers) prepareDatabaseUpdates(ctx context.Context, hostID string, dbs []*database.Database) ([]*database.Spec, error) {
+	specs := make([]*database.Spec, 0, len(dbs))
 	for _, db := range dbs {
-		if err := s.updateDatabaseForHostRemoval(ctx, db, hostID); err != nil {
-			return nil, err
+		if ok := db.Spec.RemoveHost(hostID); !ok {
+			return nil, fmt.Errorf("%s host id not found/removed", hostID)
 		}
 
-		updateInputs = append(updateInputs, &workflows.UpdateDatabaseInput{
-			Spec:        db.Spec,
-			ForceUpdate: false,
-			RemoveHosts: []string{hostID},
-		})
-	}
-
-	return updateInputs, nil
-}
+		_, err := s.dbSvc.UpdateDatabase(ctx, database.DatabaseStateModifying, db.Spec)
+		if err != nil {
+			return nil, fmt.Errorf("failed to update database: %w", err)
+		}
 
-// updateDatabaseForHostRemoval removes the host from a database spec and updates the database state.
-func (s *PostInitHandlers) updateDatabaseForHostRemoval(ctx context.Context, db *database.Database, hostID string) error {
-	if ok := db.Spec.RemoveHost(hostID); !ok {
-		return apiErr(fmt.Errorf("%s host id not found/removed", hostID))
+		specs = append(specs, db.Spec)
 	}
 
-	_, err := s.dbSvc.UpdateDatabase(ctx, database.DatabaseStateModifying, db.Spec)
-	if err != nil {
-		return apiErr(err)
-	}
-
-	return nil
+	return specs, nil
 }
 
 // ListDatabases fetches all databases from the database service and converts them to API format.