mirror of
https://github.com/rcourtman/Pulse.git
synced 2026-04-28 11:30:15 +00:00
feat: Add Docker container update capability
- Add container update command handling to unified agent - Agent can now receive update_container commands from Pulse server - Pulls latest image, stops container, creates backup, starts new container - Automatic rollback on failure - Backup container cleaned up after 5 minutes - Added comprehensive test coverage for container update logic
This commit is contained in:
rcourtman
parent
3040800e7b
commit
2bf8e044df
14 changed files with 2434 additions and 20 deletions
309
internal/dockeragent/swarm_coverage_test.go
Normal file
309
internal/dockeragent/swarm_coverage_test.go
Normal file
|
|
@ -0,0 +1,309 @@
|
|||
package dockeragent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
swarmtypes "github.com/docker/docker/api/types/swarm"
|
||||
systemtypes "github.com/docker/docker/api/types/system"
|
||||
agentsdocker "github.com/rcourtman/pulse-go-rewrite/pkg/agents/docker"
|
||||
)
|
||||
|
||||
func TestMapSwarmService(t *testing.T) {
|
||||
now := time.Date(2024, 1, 2, 3, 4, 5, 0, time.UTC)
|
||||
updateAt := now.Add(2 * time.Minute)
|
||||
|
||||
svc := &swarmtypes.Service{
|
||||
ID: "svc1",
|
||||
Spec: swarmtypes.ServiceSpec{
|
||||
Annotations: swarmtypes.Annotations{
|
||||
Name: "web",
|
||||
Labels: map[string]string{
|
||||
"com.docker.stack.namespace": "stack",
|
||||
},
|
||||
},
|
||||
TaskTemplate: swarmtypes.TaskSpec{
|
||||
ContainerSpec: &swarmtypes.ContainerSpec{
|
||||
Image: "nginx:latest",
|
||||
},
|
||||
},
|
||||
},
|
||||
ServiceStatus: &swarmtypes.ServiceStatus{
|
||||
DesiredTasks: 3,
|
||||
RunningTasks: 2,
|
||||
CompletedTasks: 1,
|
||||
},
|
||||
UpdateStatus: &swarmtypes.UpdateStatus{
|
||||
State: swarmtypes.UpdateStateCompleted,
|
||||
Message: "done",
|
||||
CompletedAt: &updateAt,
|
||||
},
|
||||
Endpoint: swarmtypes.Endpoint{
|
||||
Ports: []swarmtypes.PortConfig{
|
||||
{Name: "http", Protocol: swarmtypes.PortConfigProtocolTCP, TargetPort: 80, PublishedPort: 8080, PublishMode: swarmtypes.PortConfigPublishModeIngress},
|
||||
},
|
||||
},
|
||||
Meta: swarmtypes.Meta{
|
||||
CreatedAt: now,
|
||||
UpdatedAt: updateAt,
|
||||
},
|
||||
}
|
||||
|
||||
got := mapSwarmService(svc)
|
||||
if got.ID != "svc1" || got.Name != "web" || got.Mode == "" {
|
||||
t.Fatalf("unexpected service mapping: %+v", got)
|
||||
}
|
||||
if got.Stack != "stack" {
|
||||
t.Fatalf("expected stack label to be mapped, got %q", got.Stack)
|
||||
}
|
||||
if got.Image != "nginx:latest" {
|
||||
t.Fatalf("expected image to be mapped, got %q", got.Image)
|
||||
}
|
||||
if got.DesiredTasks != 3 || got.RunningTasks != 2 || got.CompletedTasks != 1 {
|
||||
t.Fatalf("unexpected task counts: %+v", got)
|
||||
}
|
||||
if got.UpdateStatus == nil || got.UpdateStatus.State != string(swarmtypes.UpdateStateCompleted) {
|
||||
t.Fatalf("expected update status to be mapped, got %+v", got.UpdateStatus)
|
||||
}
|
||||
if got.EndpointPorts == nil || len(got.EndpointPorts) != 1 {
|
||||
t.Fatalf("expected endpoint ports to be mapped")
|
||||
}
|
||||
if got.CreatedAt == nil || got.UpdatedAt == nil {
|
||||
t.Fatalf("expected timestamps to be mapped")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMapSwarmTask(t *testing.T) {
|
||||
now := time.Date(2024, 2, 3, 4, 5, 6, 0, time.UTC)
|
||||
containerStart := now.Add(-2 * time.Minute)
|
||||
containerFinish := now.Add(-time.Minute)
|
||||
|
||||
containers := map[string]agentsdocker.Container{
|
||||
"container-full": {
|
||||
ID: "container-full",
|
||||
Name: "web.1",
|
||||
StartedAt: &containerStart,
|
||||
FinishedAt: func() *time.Time {
|
||||
val := containerFinish
|
||||
return &val
|
||||
}(),
|
||||
},
|
||||
}
|
||||
|
||||
t.Run("running task", func(t *testing.T) {
|
||||
task := &swarmtypes.Task{
|
||||
ID: "task1",
|
||||
ServiceID: "svc1",
|
||||
Slot: 1,
|
||||
NodeID: "node1",
|
||||
Status: swarmtypes.TaskStatus{
|
||||
State: swarmtypes.TaskStateRunning,
|
||||
Timestamp: now,
|
||||
ContainerStatus: &swarmtypes.ContainerStatus{
|
||||
ContainerID: "container-full",
|
||||
},
|
||||
},
|
||||
Meta: swarmtypes.Meta{
|
||||
CreatedAt: now.Add(-time.Minute),
|
||||
},
|
||||
}
|
||||
svc := &swarmtypes.Service{Spec: swarmtypes.ServiceSpec{Annotations: swarmtypes.Annotations{Name: "web"}}}
|
||||
|
||||
got := mapSwarmTask(task, svc, containers)
|
||||
if got.ServiceName != "web" {
|
||||
t.Fatalf("expected service name, got %q", got.ServiceName)
|
||||
}
|
||||
if got.ContainerName != "web.1" {
|
||||
t.Fatalf("expected container name, got %q", got.ContainerName)
|
||||
}
|
||||
if got.StartedAt == nil || !got.StartedAt.Equal(now) {
|
||||
t.Fatalf("expected started at timestamp from task")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("completed task uses container timestamps", func(t *testing.T) {
|
||||
task := &swarmtypes.Task{
|
||||
ID: "task2",
|
||||
ServiceID: "svc2",
|
||||
Status: swarmtypes.TaskStatus{
|
||||
State: swarmtypes.TaskStateCompleted,
|
||||
ContainerStatus: &swarmtypes.ContainerStatus{
|
||||
ContainerID: "container-full",
|
||||
},
|
||||
},
|
||||
Meta: swarmtypes.Meta{
|
||||
CreatedAt: now.Add(-time.Hour),
|
||||
},
|
||||
}
|
||||
|
||||
got := mapSwarmTask(task, nil, containers)
|
||||
if got.CompletedAt == nil || !got.CompletedAt.Equal(containerFinish) {
|
||||
t.Fatalf("expected completed at from container timestamp")
|
||||
}
|
||||
if got.StartedAt == nil || !got.StartedAt.Equal(containerStart) {
|
||||
t.Fatalf("expected started at from container timestamp")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestCollectSwarmDataFromManager(t *testing.T) {
|
||||
agent := &Agent{
|
||||
docker: &fakeDockerClient{
|
||||
serviceListFn: func(_ context.Context, _ swarmtypes.ServiceListOptions) ([]swarmtypes.Service, error) {
|
||||
return []swarmtypes.Service{
|
||||
{ID: "svc1", Spec: swarmtypes.ServiceSpec{Annotations: swarmtypes.Annotations{Name: "alpha"}}},
|
||||
{ID: "svc2", Spec: swarmtypes.ServiceSpec{Annotations: swarmtypes.Annotations{Name: "beta"}}},
|
||||
}, nil
|
||||
},
|
||||
taskListFn: func(_ context.Context, opts swarmtypes.TaskListOptions) ([]swarmtypes.Task, error) {
|
||||
if got := opts.Filters.Get("node"); len(got) != 1 || got[0] != "node1" {
|
||||
t.Fatalf("expected node filter to include node1, got %v", got)
|
||||
}
|
||||
return []swarmtypes.Task{
|
||||
{ID: "task1", ServiceID: "svc1", Status: swarmtypes.TaskStatus{State: swarmtypes.TaskStateRunning}},
|
||||
}, nil
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
info := systemtypes.Info{
|
||||
Swarm: systemtypes.SwarmInfo{
|
||||
NodeID: "node1",
|
||||
},
|
||||
}
|
||||
|
||||
services, tasks, err := agent.collectSwarmDataFromManager(context.Background(), info, swarmScopeNode, nil, true, true)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(tasks) != 1 {
|
||||
t.Fatalf("expected 1 task, got %d", len(tasks))
|
||||
}
|
||||
if len(services) != 1 {
|
||||
t.Fatalf("expected filtered services, got %d", len(services))
|
||||
}
|
||||
}
|
||||
|
||||
func TestCollectSwarmData(t *testing.T) {
|
||||
t.Run("unsupported swarm returns nils", func(t *testing.T) {
|
||||
agent := &Agent{supportsSwarm: false}
|
||||
services, tasks, info := agent.collectSwarmData(context.Background(), systemtypes.Info{}, nil)
|
||||
if services != nil || tasks != nil || info != nil {
|
||||
t.Fatal("expected nil outputs when swarm unsupported")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("inactive swarm returns info only", func(t *testing.T) {
|
||||
agent := &Agent{supportsSwarm: true, cfg: Config{SwarmScope: swarmScopeNode}}
|
||||
info := systemtypes.Info{
|
||||
Swarm: systemtypes.SwarmInfo{
|
||||
NodeID: "node1",
|
||||
LocalNodeState: swarmtypes.LocalNodeStatePending,
|
||||
},
|
||||
}
|
||||
|
||||
services, tasks, swarmInfo := agent.collectSwarmData(context.Background(), info, nil)
|
||||
if services != nil || tasks != nil {
|
||||
t.Fatal("expected nil services/tasks for inactive swarm")
|
||||
}
|
||||
if swarmInfo == nil || swarmInfo.NodeID != "node1" {
|
||||
t.Fatal("expected swarm info to be returned")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("manager error falls back to containers", func(t *testing.T) {
|
||||
agent := &Agent{
|
||||
supportsSwarm: true,
|
||||
cfg: Config{
|
||||
IncludeServices: true,
|
||||
IncludeTasks: true,
|
||||
SwarmScope: swarmScopeAuto,
|
||||
},
|
||||
docker: &fakeDockerClient{
|
||||
serviceListFn: func(context.Context, swarmtypes.ServiceListOptions) ([]swarmtypes.Service, error) {
|
||||
return nil, errors.New("boom")
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
containers := []agentsdocker.Container{
|
||||
{
|
||||
ID: "container1",
|
||||
Name: "web.1",
|
||||
Image: "nginx:latest",
|
||||
State: "running",
|
||||
Labels: map[string]string{
|
||||
"com.docker.swarm.service.id": "svc1",
|
||||
"com.docker.swarm.service.name": "web",
|
||||
"com.docker.swarm.task.id": "task1",
|
||||
"com.docker.swarm.task.slot": "1",
|
||||
"com.docker.swarm.task.message": "ok",
|
||||
"com.docker.swarm.task.error": "",
|
||||
"com.docker.stack.namespace": "stack",
|
||||
"com.docker.swarm.node.id": "node1",
|
||||
"com.docker.swarm.node.name": "node1",
|
||||
"com.docker.swarm.task.desired-state": "running",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
info := systemtypes.Info{
|
||||
Swarm: systemtypes.SwarmInfo{
|
||||
NodeID: "node1",
|
||||
ControlAvailable: true,
|
||||
LocalNodeState: swarmtypes.LocalNodeStateActive,
|
||||
},
|
||||
}
|
||||
|
||||
services, tasks, swarmInfo := agent.collectSwarmData(context.Background(), info, containers)
|
||||
if len(tasks) != 1 || len(services) != 1 {
|
||||
t.Fatalf("expected derived tasks/services, got %d/%d", len(tasks), len(services))
|
||||
}
|
||||
if swarmInfo == nil || swarmInfo.Scope != swarmScopeNode {
|
||||
t.Fatalf("expected effective scope node, got %+v", swarmInfo)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("manager success uses manager data", func(t *testing.T) {
|
||||
agent := &Agent{
|
||||
supportsSwarm: true,
|
||||
cfg: Config{
|
||||
IncludeServices: true,
|
||||
IncludeTasks: true,
|
||||
SwarmScope: swarmScopeCluster,
|
||||
},
|
||||
docker: &fakeDockerClient{
|
||||
serviceListFn: func(context.Context, swarmtypes.ServiceListOptions) ([]swarmtypes.Service, error) {
|
||||
return []swarmtypes.Service{
|
||||
{ID: "svc1", Spec: swarmtypes.ServiceSpec{Annotations: swarmtypes.Annotations{Name: "zeta"}}},
|
||||
{ID: "svc2", Spec: swarmtypes.ServiceSpec{Annotations: swarmtypes.Annotations{Name: "alpha"}}},
|
||||
}, nil
|
||||
},
|
||||
taskListFn: func(context.Context, swarmtypes.TaskListOptions) ([]swarmtypes.Task, error) {
|
||||
return []swarmtypes.Task{
|
||||
{ID: "task2", ServiceID: "svc2", Slot: 2},
|
||||
{ID: "task1", ServiceID: "svc2", Slot: 1},
|
||||
}, nil
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
info := systemtypes.Info{
|
||||
Swarm: systemtypes.SwarmInfo{
|
||||
NodeID: "node1",
|
||||
ControlAvailable: true,
|
||||
LocalNodeState: swarmtypes.LocalNodeStateActive,
|
||||
},
|
||||
}
|
||||
|
||||
services, tasks, swarmInfo := agent.collectSwarmData(context.Background(), info, nil)
|
||||
if len(tasks) != 2 || len(services) != 2 {
|
||||
t.Fatalf("expected manager tasks/services, got %d/%d", len(tasks), len(services))
|
||||
}
|
||||
if swarmInfo == nil || swarmInfo.Scope != swarmScopeCluster {
|
||||
t.Fatalf("unexpected swarm info: %+v", swarmInfo)
|
||||
}
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue