Pass machine name through in MachineServiceContainer

cmd/uncloud/machine/rtt.go

@@ -48,6 +48,15 @@ func rtt(ctx context.Context, uncli *cli.CLI) error {
 	// Map machine IDs to names for display from the response.
 	machineNames := make(map[string]string)
 	for _, m := range resp.Machines {
+		// NOTE: Metadata should never be nil in practice. This is legacy fallback that will be removed.
+		if m.Metadata == nil {
+			tui.PrintWarning("metadata is missing in response from unknown server")
+			continue
+		}
+		if m.Metadata.Error != "" {
+			tui.PrintWarning(fmt.Sprintf("failed to inspect machine '%s': %s", m.Metadata.MachineName, m.Metadata.Error))
+			continue
+		}
 		if m.Machine == nil {
 			continue
 		}

cmd/uncloud/service/inspect.go

@@ -46,15 +46,6 @@ func inspect(ctx context.Context, uncli *cli.CLI, opts inspectOptions) error {
 		return fmt.Errorf("inspect service: %w", err)
 	}
 
-	machines, err := client.ListMachines(ctx, nil)
-	if err != nil {
-		return fmt.Errorf("list machines: %w", err)
-	}
-	machinesNamesByID := make(map[string]string)
-	for _, m := range machines {
-		machinesNamesByID[m.Machine.Id] = m.Machine.Name
-	}
-
 	fmt.Printf("Service ID: %s\n", svc.ID)
 	fmt.Printf("Name:       %s\n", svc.Name)
 	fmt.Printf("Mode:       %s\n", svc.Mode)
@@ -89,7 +80,7 @@ func inspect(ctx context.Context, uncli *cli.CLI, opts inspectOptions) error {
 	for _, ctr := range allContainers {
 		created := units.HumanDuration(now.Sub(createdTimes[ctr.Container.ID])) + " ago"
 
-		machine := machinesNamesByID[ctr.MachineID]
+		machine := ctr.MachineName
 		if machine == "" {
 			machine = ctr.MachineID
 		}

pkg/api/service.go

@@ -515,8 +515,9 @@ type Service struct {
 }
 
 type MachineServiceContainer struct {
-	MachineID string
-	Container ServiceContainer
+	MachineID   string
+	MachineName string
+	Container   ServiceContainer
 }
 
 // MachineIDs returns a list of unique machine IDs where the service containers are running.

pkg/client/service.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"slices"
 	"sync"
 
@@ -125,8 +124,8 @@ func (cli *Client) InspectService(ctx context.Context, nameOrID string) (api.Ser
 
 		if mc.Metadata.Error != "" {
 			// TODO: return failed machines in the response.
-			fmt.Printf("WARNING: failed to list containers on machine '%s': %s\n",
-				mc.Metadata.MachineAddr, mc.Metadata.Error)
+			tui.PrintWarning(fmt.Sprintf("failed to list containers on machine '%s': %s",
+				mc.Metadata.MachineName, mc.Metadata.Error))
 			continue
 		}
 
@@ -135,8 +134,9 @@ func (cli *Client) InspectService(ctx context.Context, nameOrID string) (api.Ser
 		// Collect both regular and hook containers for the service.
 		for _, ctr := range append(mc.Containers, mc.HookContainers...) {
 			containers = append(containers, api.MachineServiceContainer{
-				MachineID: machineID,
-				Container: ctr,
+				MachineID:   machineID,
+				MachineName: mc.Metadata.MachineName,
+				Container:   ctr,
 			})
 
 			if ctr.ServiceID() == nameOrID {
@@ -354,8 +354,8 @@ func (cli *Client) ListServices(ctx context.Context) ([]api.Service, error) {
 
 		if mc.Metadata.Error != "" {
 			// TODO: return failed machines in the response.
-			fmt.Fprintf(os.Stderr, "WARNING: failed to list containers on machine '%s': %s\n",
-				mc.Metadata.MachineAddr, mc.Metadata.Error)
+			tui.PrintWarning(fmt.Sprintf("failed to list containers on machine '%s': %s",
+				mc.Metadata.MachineName, mc.Metadata.Error))
 			continue
 		}