feat(join secrets and services views)

Author: jr-k

internal/dao/docker.go

@@ -314,6 +314,10 @@ func (d *DockerClient) RemoveSecret(id string) error {
 	return d.Secret.Remove(id)
 }
 
+func (d *DockerClient) CreateSecret(name string, data []byte) error {
+	return d.Secret.Create(name, data)
+}
+
 func (d *DockerClient) StopComposeProject(projectName string) error {
 	return d.Compose.Stop(projectName)
 }
@@ -367,6 +371,34 @@ func (d *DockerClient) GetServiceSecrets(id string) ([]*swarm.SecretReference, e
 	return d.Service.GetSecrets(id)
 }
 
+func (d *DockerClient) SetServiceSecrets(id string, secretRefs []*swarm.SecretReference) error {
+	return d.Service.SetSecrets(id, secretRefs)
+}
+
+
+func (d *DockerClient) ListServicesForSecret(secretID string) ([]common.Resource, error) {
+	services, err := d.Service.List()
+	if err != nil {
+		return nil, err
+	}
+
+	var filtered []common.Resource
+	for _, svc := range services {
+		// Check if this service uses the secret
+		secrets, err := d.Service.GetSecrets(svc.GetID())
+		if err == nil {
+			for _, s := range secrets {
+				if s.SecretID == secretID {
+					filtered = append(filtered, svc)
+					break
+				}
+			}
+		}
+	}
+
+	return filtered, nil
+}
+
 func (d *DockerClient) GetComposeLogs(projectName string, since string, tail string, timestamps bool) (io.ReadCloser, error) {
 	return d.Compose.Logs(projectName, since, tail, timestamps)
 }

internal/dao/docker/secret/secret.go

@@ -2,9 +2,11 @@ package secret
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/client"
 	"github.com/gdamore/tcell/v2"
 	"github.com/jr-k/d4s/internal/dao/common"
@@ -22,11 +24,12 @@ func NewManager(cli *client.Client, ctx context.Context) *Manager {
 
 // Secret Model
 type Secret struct {
-	ID      string
-	Name    string
-	Created string
-	Updated string
-	Labels  string
+	ID       string
+	Name     string
+	Services int
+	Created  string
+	Updated  string
+	Labels   string
 }
 
 func (s Secret) GetID() string { return s.ID }
@@ -35,7 +38,8 @@ func (s Secret) GetCells() []string {
 	if len(id) > 12 {
 		id = id[:12]
 	}
-	return []string{id, s.Name, s.Created, s.Updated, s.Labels}
+	servicesStr := fmt.Sprintf("%d", s.Services)
+	return []string{id, s.Name, servicesStr, s.Created, s.Updated, s.Labels}
 }
 
 func (s Secret) GetStatusColor() (tcell.Color, tcell.Color) {
@@ -48,6 +52,8 @@ func (s Secret) GetColumnValue(column string) string {
 		return s.ID
 	case "name":
 		return s.Name
+	case "services":
+		return fmt.Sprintf("%d", s.Services)
 	case "created":
 		return s.Created
 	case "updated":
@@ -72,16 +78,30 @@ func (m *Manager) List() ([]common.Resource, error) {
 		return nil, err
 	}
 
+	// Count services per secret
+	counts := make(map[string]int)
+	services, err := m.cli.ServiceList(m.ctx, types.ServiceListOptions{})
+	if err == nil {
+		for _, svc := range services {
+			if svc.Spec.TaskTemplate.ContainerSpec != nil {
+				for _, secretRef := range svc.Spec.TaskTemplate.ContainerSpec.Secrets {
+					counts[secretRef.SecretID]++
+				}
+			}
+		}
+	}
+
 	var res []common.Resource
 	for _, s := range list {
 		labels := formatLabels(s.Spec.Labels)
 
 		res = append(res, Secret{
-			ID:      s.ID,
-			Name:    s.Spec.Name,
-			Created: common.FormatTime(s.CreatedAt.Unix()),
-			Updated: common.FormatTime(s.UpdatedAt.Unix()),
-			Labels:  labels,
+			ID:       s.ID,
+			Name:     s.Spec.Name,
+			Services: counts[s.ID],
+			Created:  common.FormatTime(s.CreatedAt.Unix()),
+			Updated:  common.FormatTime(s.UpdatedAt.Unix()),
+			Labels:   labels,
 		})
 	}
 	return res, nil
@@ -91,6 +111,16 @@ func (m *Manager) Remove(id string) error {
 	return m.cli.SecretRemove(m.ctx, id)
 }
 
+func (m *Manager) Create(name string, data []byte) error {
+	_, err := m.cli.SecretCreate(m.ctx, swarm.SecretSpec{
+		Annotations: swarm.Annotations{
+			Name: name,
+		},
+		Data: data,
+	})
+	return err
+}
+
 func formatLabels(labels map[string]string) string {
 	if len(labels) == 0 {
 		return "-"

internal/dao/swarm/service/service.go

@@ -239,3 +239,19 @@ func (m *Manager) GetSecrets(id string) ([]*swarm.SecretReference, error) {
 
 	return service.Spec.TaskTemplate.ContainerSpec.Secrets, nil
 }
+
+func (m *Manager) SetSecrets(id string, secretRefs []*swarm.SecretReference) error {
+	service, _, err := m.cli.ServiceInspectWithRaw(m.ctx, id, swarm.ServiceInspectOptions{})
+	if err != nil {
+		return err
+	}
+
+	if service.Spec.TaskTemplate.ContainerSpec == nil {
+		return fmt.Errorf("service has no container spec")
+	}
+
+	service.Spec.TaskTemplate.ContainerSpec.Secrets = secretRefs
+
+	_, err = m.cli.ServiceUpdate(m.ctx, id, service.Version, service.Spec, swarm.ServiceUpdateOptions{})
+	return err
+}