Merge pull request #51439 from thaJeztah/concrete_enums

api/types/container: make ContainerState, HealthStatus concrete types

daemon/container/health.go

@@ -23,7 +23,7 @@ func (s *Health) String() string {
 	case container.Starting:
 		return "health: starting"
 	default: // Healthy and Unhealthy are clear on their own
-		return status
+		return string(status)
 	}
 }
 

daemon/container/state.go

@@ -31,7 +31,7 @@ type State struct {
 	//
 	// In a similar fashion, [State.Running] and [State.Restarting] can both
 	// be true in a situation where a container is in process of being restarted.
-	// Refer to [State.StateString] for order of precedence.
+	// Refer to [State.State] for order of precedence.
 	Running           bool
 	Paused            bool
 	Restarting        bool
@@ -114,10 +114,10 @@ func (s *State) String() string {
 	return fmt.Sprintf("Exited (%d) %s ago", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
 }
 
-// StateString returns the container's current [ContainerState], based on the
+// State returns the container's current [container.ContainerState], based on the
 // [State.Running], [State.Paused], [State.Restarting], [State.RemovalInProgress],
 // [State.StartedAt] and [State.Dead] fields.
-func (s *State) StateString() container.ContainerState {
+func (s *State) State() container.ContainerState {
 	if s.Running {
 		if s.Paused {
 			return container.StatePaused
@@ -221,7 +221,7 @@ func (s *State) conditionAlreadyMet(condition container.WaitCondition) bool {
 //
 // In a similar fashion, [State.Running] and [State.Restarting] can both
 // be true in a situation where a container is in process of being restarted.
-// Refer to [State.StateString] for order of precedence.
+// Refer to [State.State] for order of precedence.
 func (s *State) IsRunning() bool {
 	s.Lock()
 	defer s.Unlock()
@@ -327,7 +327,7 @@ func (s *State) SetError(err error) {
 //
 // In a similar fashion, [State.Running] and [State.Restarting] can both
 // be true in a situation where a container is in process of being restarted.
-// Refer to [State.StateString] for order of precedence.
+// Refer to [State.State] for order of precedence.
 func (s *State) IsPaused() bool {
 	s.Lock()
 	defer s.Unlock()
@@ -346,7 +346,7 @@ func (s *State) IsPaused() bool {
 //
 // In a similar fashion, [State.Running] and [State.Restarting] can both
 // be true in a situation where a container is in process of being restarted.
-// Refer to [State.StateString] for order of precedence.
+// Refer to [State.State] for order of precedence.
 func (s *State) IsRestarting() bool {
 	s.Lock()
 	defer s.Unlock()

daemon/container/view.go

@@ -305,7 +305,7 @@ func (v *View) transform(ctr *Container) *Snapshot {
 			ImageID: ctr.ImageID.String(),
 			Ports:   []container.PortSummary{},
 			Mounts:  ctr.GetMountPoints(),
-			State:   ctr.State.StateString(),
+			State:   ctr.State.State(),
 			Status:  ctr.State.String(),
 			Health: &container.HealthSummary{
 				Status:        health,

daemon/container_operations.go

@@ -968,7 +968,7 @@ func (daemon *Daemon) getNetworkedContainer(containerID, connectedContainerPrefi
 		return nil, errdefs.System(errdefs.InvalidParameter(errors.New("cannot join own network namespace")))
 	}
 	if !nc.State.IsRunning() {
-		return nil, errdefs.Conflict(fmt.Errorf("cannot join network namespace of a non running container: container %s is %s", strings.TrimPrefix(nc.Name, "/"), nc.State.StateString()))
+		return nil, errdefs.Conflict(fmt.Errorf("cannot join network namespace of a non running container: container %s is %s", strings.TrimPrefix(nc.Name, "/"), nc.State.State()))
 	}
 	if nc.State.IsRestarting() {
 		return nil, fmt.Errorf("cannot join network namespace of container: %w", errContainerIsRestarting(connectedContainerPrefixOrName))

daemon/delete.go

@@ -92,7 +92,7 @@ func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.
 			if ctr.State.Paused {
 				return errdefs.Conflict(errors.New("container is paused and must be unpaused first"))
 			} else {
-				return errdefs.Conflict(fmt.Errorf("container is %s: stop the container before removing or force remove", ctr.State.StateString()))
+				return errdefs.Conflict(fmt.Errorf("container is %s: stop the container before removing or force remove", ctr.State.State()))
 			}
 		}
 		if err := daemon.Kill(ctr); err != nil && !isNotRunning(err) {

daemon/health.go

@@ -244,7 +244,7 @@ func handleProbeResult(d *Daemon, c *container.Container, result *containertypes
 
 	current := h.Status()
 	if oldStatus != current {
-		d.LogContainerEvent(c, events.Action(string(events.ActionHealthStatus)+": "+current))
+		d.LogContainerEvent(c, events.Action(string(events.ActionHealthStatus)+": "+string(current)))
 	}
 }
 

daemon/inspect.go

@@ -125,7 +125,7 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, ctr *container.Co
 		Path:    ctr.Path,
 		Args:    ctr.Args,
 		State: &containertypes.State{
-			Status:     ctr.State.StateString(),
+			Status:     ctr.State.State(),
 			Running:    ctr.State.Running,
 			Paused:     ctr.State.Paused,
 			Restarting: ctr.State.Restarting,

daemon/internal/metrics/metrics.go

@@ -91,6 +91,7 @@ func (ctr *StateCounter) Get() (running int, paused int, stopped int) {
 	ctr.mu.RLock()
 	defer ctr.mu.RUnlock()
 
+	// FIXME(thaJeztah): there's no "container.StateStopped"; should we align these states with actual states?
 	for _, state := range ctr.states {
 		switch state {
 		case "running":

daemon/list.go

@@ -281,7 +281,7 @@ func (daemon *Daemon) foldFilter(ctx context.Context, view *container.View, conf
 	}
 
 	err = psFilters.WalkValues("status", func(value string) error {
-		if err := containertypes.ValidateContainerState(value); err != nil {
+		if err := containertypes.ValidateContainerState(containertypes.ContainerState(value)); err != nil {
 			return errdefs.InvalidParameter(fmt.Errorf("invalid filter 'status=%s': %w", value, err))
 		}
 		config.All = true
@@ -298,7 +298,7 @@ func (daemon *Daemon) foldFilter(ctx context.Context, view *container.View, conf
 	}
 
 	err = psFilters.WalkValues("health", func(value string) error {
-		if err := containertypes.ValidateHealthStatus(value); err != nil {
+		if err := containertypes.ValidateHealthStatus(containertypes.HealthStatus(value)); err != nil {
 			return errdefs.InvalidParameter(fmt.Errorf("invalid filter 'health=%s': %w", value, err))
 		}
 		return nil
@@ -486,12 +486,12 @@ func includeContainerInList(container *container.Snapshot, filter *listContext)
 	}
 
 	// Do not include container if its status doesn't match the filter
-	if !filter.filters.Match("status", container.State) {
+	if !filter.filters.Match("status", string(container.State)) {
 		return excludeContainer
 	}
 
 	// Do not include container if its health doesn't match the filter
-	if !filter.filters.ExactMatch("health", container.Health) {
+	if !filter.filters.ExactMatch("health", string(container.Health)) {
 		return excludeContainer
 	}
 

daemon/monitor.go

@@ -8,6 +8,7 @@ import (
 
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
+	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/v2/daemon/config"
 	"github.com/moby/moby/v2/daemon/container"
@@ -19,10 +20,10 @@ import (
 )
 
 func (daemon *Daemon) setStateCounter(c *container.Container) {
-	switch c.State.StateString() {
-	case "paused":
+	switch c.State.State() {
+	case containertypes.StatePaused:
 		metrics.StateCtr.Set(c.ID, "paused")
-	case "running":
+	case containertypes.StateRunning:
 		metrics.StateCtr.Set(c.ID, "running")
 	default:
 		metrics.StateCtr.Set(c.ID, "stopped")