move generic docker types to top level docker package

internal/machine/docker/container/container.go

@@ -1,47 +0,0 @@
-package container
-
-import (
-	"github.com/docker/docker/api/types"
-	"regexp"
-)
-
-const (
-	LabelServiceID   = "uncloud.service.id"
-	LabelServiceName = "uncloud.service.name"
-)
-
-type Container struct {
-	types.Container
-}
-
-// runningStatusRegex matches the status string of a running container.
-// - "Up 3 minutes (healthy)" -> groups: ["Up 3 minutes (healthy)", "healthy"]
-// - "Up 5 seconds" -> groups: ["Up 5 seconds", ""]
-// - "Up 2 hours (unhealthy)" -> groups: ["Up 2 hours (unhealthy)", "unhealthy"]
-// - "Up 1 minute (health: starting)" -> groups: ["Up 1 minute (health: starting)", "health: starting"]
-// - "Restarting (0) 5 seconds ago" -> no match
-// See https://github.com/moby/moby/blob/c130ce1f5d1e38b98a97044a39557de43bc0d58f/container/state.go#L77-L90
-// for more details on how the status string for a running container is formatted.
-var runningStatusRegex = regexp.MustCompile(`^Up [^(]+(?:\(([^)]+)\))?$`)
-
-// Healthy determines if the container is running and healthy based on its status string.
-// A running container with no health check configured is considered healthy.
-func (c *Container) Healthy() bool {
-	if c.State != "running" {
-		return false
-	}
-
-	matches := runningStatusRegex.FindStringSubmatch(c.Status)
-	// Not "Up" or invalid format.
-	if matches == nil {
-		return false
-	}
-
-	// If there's no health status (no health check configured so no parentheses), container is considered healthy.
-	if matches[1] == "" {
-		return true
-	}
-
-	// If the health status in parentheses is "healthy", the container is considered healthy.
-	return matches[1] == types.Healthy
-}

internal/machine/docker/container/container_test.go

@@ -1,92 +0,0 @@
-package container
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestContainer_Healthy(t *testing.T) {
-	t.Parallel()
-
-	t.Run("exited", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "exited",
-			Status: "Exited (0) 2 minutes ago",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("running with no health check", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up 5 minutes",
-		}}
-		assert.True(t, c.Healthy())
-	})
-
-	t.Run("running and healthy", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up 3 minutes (healthy)",
-		}}
-		assert.True(t, c.Healthy())
-	})
-
-	t.Run("running but unhealthy", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up 2 hours (unhealthy)",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("running with health starting", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up 1 minute (health: starting)",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("invalid up format no time", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("invalid up format empty parentheses", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Up 5 minutes ()",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("malformed status", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Invalid status",
-		}}
-		assert.False(t, c.Healthy())
-	})
-
-	t.Run("restarting", func(t *testing.T) {
-		t.Parallel()
-		c := &Container{Container: types.Container{
-			State:  "running",
-			Status: "Restarting (0) 5 seconds ago",
-		}}
-		assert.False(t, c.Healthy())
-	})
-}

internal/machine/docker/manager.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/client"
 	"log/slog"
 	"time"
-	"uncloud/internal/machine/docker/container"
+	"uncloud/internal/docker"
 	"uncloud/internal/machine/store"
 )
 
@@ -152,8 +152,8 @@ func (m *Manager) syncContainersToStore(ctx context.Context) error {
 	// List only Uncloud service containers identified by their labels.
 	containers, err := m.client.ContainerList(ctx, dockercontainer.ListOptions{
 		Filters: filters.NewArgs(
-			filters.Arg("label", container.LabelServiceID),
-			filters.Arg("label", container.LabelServiceName),
+			filters.Arg("label", docker.LabelServiceID),
+			filters.Arg("label", docker.LabelServiceName),
 		),
 	})
 	if err != nil {
@@ -185,7 +185,7 @@ func (m *Manager) syncContainersToStore(ctx context.Context) error {
 
 	// Create or update the current Docker containers in the store.
 	for _, dc := range containers {
-		c := &container.Container{Container: dc}
+		c := &docker.Container{Container: dc}
 		if err = m.store.CreateOrUpdateContainer(ctx, c, m.machineID); err != nil {
 			storeErr = errors.Join(storeErr, fmt.Errorf("create or update container %q: %w", c.ID, err))
 		}