refactor: simplify and speed up plan output formatting by removing name resolver dependency

pkg/client/deploy/operation/container.go

@@ -17,6 +17,8 @@ type RunContainerOperation struct {
 	ServiceID string
 	Spec      api.ServiceSpec
 	MachineID string
+	// MachineName is used for formatting the operation as part of the deployment plan.
+	MachineName string
 	// SkipHealthMonitor skips the monitoring period and health checks after starting a container.
 	SkipHealthMonitor bool
 }
@@ -43,13 +45,12 @@ func (o *RunContainerOperation) Execute(ctx context.Context, cli Client) error {
 	return nil
 }
 
-func (o *RunContainerOperation) Format(resolver NameResolver) string {
-	machineName := resolver.MachineName(o.MachineID)
+func (o *RunContainerOperation) Format() string {
 	return tui.BoldGreen.Render("+") + "   " +
 		tui.Faint.Render("run container") + " " +
 		o.Spec.Name + " " +
 		tui.Faint.Render("on") + " " +
-		machineName
+		o.MachineName
 }
 
 func (o *RunContainerOperation) String() string {
@@ -59,9 +60,11 @@ func (o *RunContainerOperation) String() string {
 
 // StopContainerOperation stops a container on a specific machine.
 type StopContainerOperation struct {
-	ServiceID       string
-	ContainerID     string
-	MachineID       string
+	ServiceID   string
+	ContainerID string
+	MachineID   string
+	// MachineName is used for formatting the operation as part of the deployment plan.
+	MachineName     string
 	StopGracePeriod *time.Duration
 }
 
@@ -72,8 +75,7 @@ func (o *StopContainerOperation) Execute(ctx context.Context, cli Client) error
 	return nil
 }
 
-func (o *StopContainerOperation) Format(resolver NameResolver) string {
-	machineName := resolver.MachineName(o.MachineID)
+func (o *StopContainerOperation) Format() string {
 	// TODO: pass service name to format the display name consistently with other operations.
 	displayName := stringid.TruncateID(o.ContainerID)
 
@@ -81,7 +83,7 @@ func (o *StopContainerOperation) Format(resolver NameResolver) string {
 		tui.Faint.Render("stop container") + " " +
 		displayName + " " +
 		tui.Faint.Render("on") + " " +
-		machineName
+		o.MachineName
 }
 
 func (o *StopContainerOperation) String() string {
@@ -91,7 +93,9 @@ func (o *StopContainerOperation) String() string {
 
 // RemoveContainerOperation stops and removes a container from a specific machine.
 type RemoveContainerOperation struct {
-	MachineID       string
+	MachineID string
+	// MachineName is used for formatting the operation as part of the deployment plan.
+	MachineName     string
 	Container       api.ServiceContainer
 	StopGracePeriod *time.Duration
 }
@@ -112,15 +116,14 @@ func (o *RemoveContainerOperation) Execute(ctx context.Context, cli Client) erro
 	return nil
 }
 
-func (o *RemoveContainerOperation) Format(resolver NameResolver) string {
-	machineName := resolver.MachineName(o.MachineID)
+func (o *RemoveContainerOperation) Format() string {
 	displayName := o.Container.ServiceSpec.Name + tui.Faint.Render("/") + o.Container.ShortID()
 
 	return tui.BoldRed.Render("-") + "   " +
 		tui.Faint.Render("remove container") + " " +
 		displayName + " " +
 		tui.Faint.Render("on") + " " +
-		machineName
+		o.MachineName
 }
 
 func (o *RemoveContainerOperation) String() string {
@@ -132,9 +135,11 @@ func (o *RemoveContainerOperation) String() string {
 // For start-first: starts new container, then removes old container.
 // For stop-first: stops old container, starts new container, then removes old container.
 type ReplaceContainerOperation struct {
-	ServiceID    string
-	Spec         api.ServiceSpec
-	MachineID    string
+	ServiceID string
+	Spec      api.ServiceSpec
+	MachineID string
+	// MachineName is used for formatting the operation as part of the deployment plan.
+	MachineName  string
 	OldContainer api.ServiceContainer
 	// Order specifies the update order: "start-first" or "stop-first".
 	Order string
@@ -223,8 +228,7 @@ func (o *ReplaceContainerOperation) Execute(ctx context.Context, cli Client) err
 	return nil
 }
 
-func (o *ReplaceContainerOperation) Format(resolver NameResolver) string {
-	machineName := resolver.MachineName(o.MachineID)
+func (o *ReplaceContainerOperation) Format() string {
 	displayName := o.Spec.Name + tui.Faint.Render("/") + o.OldContainer.ShortID()
 
 	if o.Order == api.UpdateOrderStopFirst {
@@ -232,14 +236,14 @@ func (o *ReplaceContainerOperation) Format(resolver NameResolver) string {
 			tui.Faint.Render("replace container") + " " +
 			displayName + " " +
 			tui.Faint.Render("on") + " " +
-			machineName + " " +
+			o.MachineName + " " +
 			tui.Yellow.Render("(stop-first)")
 	}
 	return tui.BoldGreen.Render("+") + tui.Green.Render("/") + tui.BoldGreen.Render("-") + " " +
 		tui.Faint.Render("replace container") + " " +
 		displayName + " " +
 		tui.Faint.Render("on") + " " +
-		machineName
+		o.MachineName
 }
 
 func (o *ReplaceContainerOperation) String() string {

pkg/client/deploy/operation/operation.go

@@ -12,8 +12,7 @@ type Operation interface {
 	// Execute performs the operation using the provided client.
 	Execute(ctx context.Context, cli Client) error
 	// Format returns a human-readable representation of the operation.
-	// TODO: get rid of the resolver and assign the required names for formatting in the operation itself.
-	Format(resolver NameResolver) string
+	Format() string
 	String() string
 }
 
@@ -22,9 +21,3 @@ type Client interface {
 	api.ContainerClient
 	api.VolumeClient
 }
-
-// NameResolver resolves machine and container IDs to their names.
-type NameResolver interface {
-	MachineName(machineID string) string
-	ContainerName(containerID string) string
-}

pkg/client/deploy/operation/sequence.go

@@ -20,10 +20,10 @@ func (o *SequenceOperation) Execute(ctx context.Context, cli Client) error {
 	return nil
 }
 
-func (o *SequenceOperation) Format(resolver NameResolver) string {
+func (o *SequenceOperation) Format() string {
 	lines := make([]string, len(o.Operations))
 	for i, op := range o.Operations {
-		lines[i] = op.Format(resolver)
+		lines[i] = op.Format()
 	}
 
 	return strings.Join(lines, "\n")

pkg/client/deploy/operation/volume.go

@@ -13,7 +13,7 @@ import (
 type CreateVolumeOperation struct {
 	VolumeSpec api.VolumeSpec
 	MachineID  string
-	// MachineName is used for formatting the operation output only.
+	// MachineName is used for formatting the operation as part of the deployment plan.
 	MachineName string
 }
 
@@ -40,7 +40,7 @@ func (o *CreateVolumeOperation) Execute(ctx context.Context, cli Client) error {
 	return nil
 }
 
-func (o *CreateVolumeOperation) Format(_ NameResolver) string {
+func (o *CreateVolumeOperation) Format() string {
 	return fmt.Sprintf("%s create volume %s %s %s",
 		tui.BoldGreen.Render("+"),
 		tui.NameStyle.Render(o.VolumeSpec.DockerVolumeName()),