feat(mount on services)

Author: jr-k

internal/dao/docker.go

@@ -20,22 +20,23 @@ import (
 	clicontext "github.com/docker/cli/cli/context"
 	"github.com/docker/cli/cli/context/docker"
 	dcontainer "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/client"
 	"github.com/jr-k/d4s/internal/dao/common"
 	"github.com/jr-k/d4s/internal/dao/compose"
 	"github.com/jr-k/d4s/internal/dao/docker/container"
+	"github.com/jr-k/d4s/internal/dao/docker/dconfig"
 	"github.com/jr-k/d4s/internal/dao/docker/image"
 	"github.com/jr-k/d4s/internal/dao/docker/network"
-	"github.com/jr-k/d4s/internal/dao/docker/dconfig"
 	"github.com/jr-k/d4s/internal/dao/docker/secret"
 	"github.com/jr-k/d4s/internal/dao/docker/stack"
 	"github.com/jr-k/d4s/internal/dao/docker/volume"
 	"github.com/jr-k/d4s/internal/dao/swarm/node"
 	"github.com/jr-k/d4s/internal/dao/swarm/service"
+	"github.com/jr-k/d4s/internal/dao/swarm/task"
 	"github.com/jr-k/d4s/internal/secrets"
 	"github.com/jr-k/d4s/internal/sshutil"
-	"github.com/jr-k/d4s/internal/dao/swarm/task"
 )
 
 // Re-export types for backward compatibility / convenience
@@ -1002,6 +1003,14 @@ func (d *DockerClient) SetServiceNetworks(id string, networks []swarm.NetworkAtt
 	return d.Service.SetNetworks(id, networks)
 }
 
+func (d *DockerClient) GetServiceMounts(id string) ([]mount.Mount, error) {
+	return d.Service.GetMounts(id)
+}
+
+func (d *DockerClient) SetServiceMounts(id string, mounts []mount.Mount) error {
+	return d.Service.SetMounts(id, mounts)
+}
+
 func (d *DockerClient) ListServicesForSecret(secretID string) ([]common.Resource, error) {
 	services, err := d.Service.List()
 	if err != nil {

internal/dao/swarm/service/service.go

@@ -9,6 +9,7 @@ import (
 	dt "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/client"
 	"github.com/gdamore/tcell/v2"
@@ -147,7 +148,7 @@ func (m *Manager) List() ([]common.Resource, error) {
 		if idx := strings.LastIndex(imageName, "@"); idx != -1 {
 			imageName = imageName[:idx]
 		}
-		
+
 		// Style tag
 		if idx := strings.LastIndex(imageName, ":"); idx != -1 {
 			tag := imageName[idx:]
@@ -182,7 +183,7 @@ func (m *Manager) Scale(id string, replicas uint64) error {
 	}
 
 	service.Spec.Mode.Replicated.Replicas = &replicas
-	
+
 	// Update
 	_, err = m.cli.ServiceUpdate(m.ctx, id, service.Version, service.Spec, swarm.ServiceUpdateOptions{})
 	return err
@@ -333,6 +334,19 @@ func (m *Manager) GetNetworks(id string) ([]swarm.NetworkAttachmentConfig, error
 	return service.Spec.TaskTemplate.Networks, nil
 }
 
+func (m *Manager) GetMounts(id string) ([]mount.Mount, error) {
+	service, _, err := m.cli.ServiceInspectWithRaw(m.ctx, id, swarm.ServiceInspectOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	if service.Spec.TaskTemplate.ContainerSpec == nil {
+		return []mount.Mount{}, nil
+	}
+
+	return service.Spec.TaskTemplate.ContainerSpec.Mounts, nil
+}
+
 func (m *Manager) ListTasks(serviceID string) ([]swarm.Task, error) {
 	filter := filters.NewArgs()
 	filter.Add("service", serviceID)
@@ -351,3 +365,19 @@ func (m *Manager) SetNetworks(id string, networks []swarm.NetworkAttachmentConfi
 	_, err = m.cli.ServiceUpdate(m.ctx, id, service.Version, service.Spec, swarm.ServiceUpdateOptions{})
 	return err
 }
+
+func (m *Manager) SetMounts(id string, mounts []mount.Mount) 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.Mounts = mounts
+
+	_, err = m.cli.ServiceUpdate(m.ctx, id, service.Version, service.Spec, swarm.ServiceUpdateOptions{})
+	return err
+}

internal/ui/app.go

@@ -485,7 +485,7 @@ func (a *App) initUI() {
 		// Don't intercept global keys if a modal/dialog is open
 		frontPage, _ := a.Pages.GetFrontPage()
 		switch frontPage {
-		case "input", "confirm", "form", "picker", "env_editor", "textview", "result", "portforward":
+		case "input", "confirm", "form", "picker", "env_editor", "secret_editor", "mount_editor", "mount_type_picker", "textview", "result", "portforward":
 			return event
 		}
 

internal/ui/dialogs/env_editor.go

@@ -121,6 +121,7 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 			content += fmt.Sprintf("%s%s %s[-]\n", color, checkbox, display)
 		}
 		list.SetText(content)
+		list.ScrollTo(currentIndex, 0)
 	}
 	updateList()
 
@@ -139,7 +140,7 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 	// Separator
 	separator := tview.NewTextView().
 		SetDynamicColors(true).
-		SetText("[" + styles.TagDim + "]" + strings.Repeat("─", 66) + "[-]").
+		SetText("[" + styles.TagDim + "]" + strings.Repeat("─", 50) + "[-]").
 		SetTextAlign(tview.AlignCenter)
 	separator.SetBackgroundColor(styles.ColorBlack)
 
@@ -285,7 +286,7 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 			setFocus(1)
 			return nil
 		}
-		if event.Key() == tcell.KeyBacktab {
+		if event.Key() == tcell.KeyBacktab || event.Key() == tcell.KeyUp {
 			if len(items) > 0 {
 				setFocus(3)
 			}
@@ -307,7 +308,7 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 			setFocus(2)
 			return nil
 		}
-		if event.Key() == tcell.KeyBacktab {
+		if event.Key() == tcell.KeyBacktab || event.Key() == tcell.KeyUp {
 			setFocus(0)
 			return nil
 		}
@@ -331,7 +332,7 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 			}
 			return nil
 		}
-		if event.Key() == tcell.KeyBacktab {
+		if event.Key() == tcell.KeyBacktab || event.Key() == tcell.KeyUp {
 			setFocus(1)
 			return nil
 		}
@@ -399,6 +400,9 @@ func ShowEnvEditor(app common.AppController, subject string, items []EnvItem, on
 		case tcell.KeyBacktab:
 			setFocus(3)
 			return nil
+		case tcell.KeyUp:
+			setFocus(3)
+			return nil
 		}
 		return event
 	})