Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: standardize optional values with samber/mo (#3322)
Kyle Mendelle01d8e3be4a6
diff --git a/backend/api/api_test.go b/backend/api/api_test.goindex 466717ce4..df47f71b8 100644--- a/backend/api/api_test.go+++ b/backend/api/api_test.go@@ -269,9 +269,9 @@ func TestVariableMaterializationRoutesAreAgentOnly(t *testing.T) {managerMatcher := authz.NewPermissionMatcher()managerMatcher.CollectFromHumaAPI(managerAPI)- _, found := managerMatcher.Lookup("GET", "/templates/variables")+ _, found := managerMatcher.Lookup("GET", "/templates/variables").Get()require.False(t, found)- _, found = managerMatcher.Lookup("PUT", "/templates/variables")+ _, found = managerMatcher.Lookup("PUT", "/templates/variables").Get()require.False(t, found)router := echo.New()@@ -316,7 +316,7 @@ func TestEasyJoinRoutesDeclareSwarmJoinPermission(t *testing.T) {require.Equal(t, authz.PermSwarmJoin, operation.Metadata[authz.MetaRequiredPermission])suffix := strings.TrimPrefix(tt.path, "/environments/{id}")- permission, found := matcher.Lookup(tt.method, suffix)+ permission, found := matcher.Lookup(tt.method, suffix).Get()require.True(t, found)require.Equal(t, authz.PermSwarmJoin, permission)})diff --git a/backend/api/handlers/activities.go b/backend/api/handlers/activities.goindex 80ab386d1..5b93319b3 100644--- a/backend/api/handlers/activities.go+++ b/backend/api/handlers/activities.go@@ -445,7 +445,7 @@ func (h *ActivityHandler) runRemoteActivityStreamPollerInternal(ctx context.ContcurrentEnvironment := environmentif h.environmentService != nil {var ok bool- currentEnvironment, ok = h.environmentService.GetActiveRemoteEnvironmentSnapshot(environmentID)+ currentEnvironment, ok = h.environmentService.GetActiveRemoteEnvironmentSnapshot(environmentID).Get()if !ok {return}diff --git a/backend/api/handlers/containers.go b/backend/api/handlers/containers.goindex 5311733b7..ddd585310 100644--- a/backend/api/handlers/containers.go+++ b/backend/api/handlers/containers.go@@ -23,6 +23,7 @@ import (containertypes "github.com/getarcaneapp/arcane/types/v2/container"dockercontainer "github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network"+ "github.com/samber/mo")type ContainerHandler struct {@@ -724,7 +725,7 @@ func (h *ContainerHandler) runContainerActionInternal(ctx context.Context, inputreturn &ContainerActionOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}@@ -775,7 +776,7 @@ func (h *ContainerHandler) RedeployContainer(ctx context.Context, input *Contain// Fetch full container details to return (consistent with other endpoints)details, inspectErr := h.containerService.GetContainerDetails(runtimeCtx, newContainerID)if inspectErr == nil {- details.ActivityID = utils.StringPtrFromTrimmed(activityID)+ details.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &GetContainerOutput{Body: base.ApiResponse[containertypes.Details]{@@ -792,7 +793,7 @@ func (h *ContainerHandler) RedeployContainer(ctx context.Context, input *ContainSuccess: true,Data: containertypes.Details{ID: newContainerID,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),},},}, nil@@ -815,7 +816,7 @@ func (h *ContainerHandler) DeleteContainer(ctx context.Context, input *DeleteConreturn &DeleteContainerOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Container deleted successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Container deleted successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}diff --git a/backend/api/handlers/dashboard.go b/backend/api/handlers/dashboard.goindex 974b9a531..addce85c4 100644--- a/backend/api/handlers/dashboard.go+++ b/backend/api/handlers/dashboard.go@@ -261,7 +261,7 @@ func (h *DashboardHandler) runRemoteDashboardStreamPollerInternal(ctx context.CocurrentEnvironment := environmentif h.environmentService != nil {var ok bool- currentEnvironment, ok = h.environmentService.GetActiveRemoteEnvironmentSnapshot(environmentID)+ currentEnvironment, ok = h.environmentService.GetActiveRemoteEnvironmentSnapshot(environmentID).Get()if !ok {return}diff --git a/backend/api/handlers/environments.go b/backend/api/handlers/environments.goindex 6fbfbca83..d63f0ee0e 100644--- a/backend/api/handlers/environments.go+++ b/backend/api/handlers/environments.go@@ -977,7 +977,7 @@ func (h *EnvironmentHandler) GetEnvironmentVersion(ctx context.Context, input *G// For edge environments, route through the tunnelif env.IsEdge {if !edge.HasActiveTunnel(input.ID) {- if _, ok := edge.RequestTunnelAndWait(reqCtx, input.ID, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()); !ok {+ if _, ok := edge.RequestTunnelAndWait(reqCtx, input.ID, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()).Get(); !ok {return nil, huma.Error503ServiceUnavailable("Edge agent is not connected")}}diff --git a/backend/api/handlers/networks.go b/backend/api/handlers/networks.goindex fd69a7a53..a81c685b7 100644--- a/backend/api/handlers/networks.go+++ b/backend/api/handlers/networks.go@@ -20,6 +20,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/base"networktypes "github.com/getarcaneapp/arcane/types/v2/network"dockernetwork "github.com/moby/moby/api/types/network"+ "github.com/samber/mo")type NetworkHandler struct {@@ -246,7 +247,7 @@ func (h *NetworkHandler) CreateNetwork(ctx context.Context, input *CreateNetworkif err != nil {return nil, huma.Error500InternalServerError((&common.NetworkMappingError{Err: err}).Error())}- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &CreateNetworkOutput{Body: base.ApiResponse[networktypes.CreateResponse]{@@ -388,7 +389,7 @@ func (h *NetworkHandler) DeleteNetwork(ctx context.Context, input *DeleteNetworkreturn &DeleteNetworkOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Network removed successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Network removed successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}@@ -417,7 +418,7 @@ func (h *NetworkHandler) PruneNetworks(ctx context.Context, input *PruneNetworksif err != nil {return nil, huma.Error500InternalServerError((&common.NetworkMappingError{Err: err}).Error())}- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &PruneNetworksOutput{Body: base.ApiResponse[networktypes.PruneReport]{diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.goindex 00e07da3f..edb4c7632 100644--- a/backend/api/handlers/projects.go+++ b/backend/api/handlers/projects.go@@ -7,6 +7,7 @@ import ("io""log/slog""net/http"+ "strings""time""github.com/danielgtaylor/huma/v2"@@ -23,6 +24,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/v2/base""github.com/getarcaneapp/arcane/types/v2/project"+ "github.com/samber/mo")// ProjectHandler provides Huma-based project management endpoints.@@ -576,7 +578,7 @@ func (h *ProjectHandler) DownProject(ctx context.Context, input *DownProjectInpuSuccess: true,Data: base.MessageResponse{Message: "Project brought down successfully",- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),},},}, nil@@ -650,12 +652,12 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProjectresponse.StatusReason = proj.StatusReasonresponse.CreatedAt = proj.CreatedAt.Format(time.RFC3339)response.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)- response.DirName = utils.DerefString(proj.DirName)+ response.DirName = mo.PointerToOption(proj.DirName).OrEmpty()response.RelativePath = h.projectService.GetProjectRelativePath(ctx, proj.Path)response.GitOpsManagedBy = proj.GitOpsManagedByresponse.IsArchived = proj.IsArchivedresponse.ArchivedAt = proj.ArchivedAt- response.ActivityID = utils.StringPtrFromTrimmed(activityID)+ response.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &CreateProjectOutput{Body: base.ApiResponse[project.CreateReponse]{@@ -817,7 +819,7 @@ func (h *ProjectHandler) DestroyProject(ctx context.Context, input *DestroyProjeSuccess: true,Data: base.MessageResponse{Message: "Project destroyed successfully",- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),},},}, nil@@ -840,7 +842,7 @@ func (h *ProjectHandler) UpdateProject(ctx context.Context, input *UpdateProjectType: models.ActivityTypeResourceAction,ResourceType: "project",ResourceID: input.ProjectID,- ResourceName: utils.DerefString(input.Body.Name),+ ResourceName: mo.PointerToOption(input.Body.Name).OrEmpty(),User: user,Step: "Updating project",Message: "Updating project",@@ -872,7 +874,7 @@ func (h *ProjectHandler) UpdateProject(ctx context.Context, input *UpdateProjectif err != nil {return nil, huma.Error500InternalServerError((&common.ProjectDetailsError{Err: err}).Error())}- details.ActivityID = utils.StringPtrFromTrimmed(activityID)+ details.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &UpdateProjectOutput{Body: base.ApiResponse[project.Details]{@@ -927,7 +929,7 @@ func (h *ProjectHandler) UpdateProjectInclude(ctx context.Context, input *Updateif err != nil {return nil, huma.Error500InternalServerError((&common.ProjectDetailsError{Err: err}).Error())}- details.ActivityID = utils.StringPtrFromTrimmed(activityID)+ details.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &UpdateProjectIncludeOutput{Body: base.ApiResponse[project.Details]{@@ -1094,7 +1096,7 @@ func (h *ProjectHandler) runProjectActivityActionInternal(ctx context.Context, ereturn base.MessageResponse{Message: cfg.SuccessMessage,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}, nil}diff --git a/backend/api/handlers/volumes.go b/backend/api/handlers/volumes.goindex 12b47b8a0..a527fddfc 100644--- a/backend/api/handlers/volumes.go+++ b/backend/api/handlers/volumes.go@@ -7,6 +7,7 @@ import ("net/http""path""strconv"+ "strings""github.com/danielgtaylor/huma/v2"humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"@@ -20,6 +21,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/base"volumetypes "github.com/getarcaneapp/arcane/types/v2/volume""github.com/moby/moby/client"+ "github.com/samber/mo")// VolumeHandler provides Huma-based volume management endpoints.@@ -641,7 +643,7 @@ func (h *VolumeHandler) CreateVolume(ctx context.Context, input *CreateVolumeInpif err != nil {return nil, huma.Error500InternalServerError((&common.VolumeCreationError{Err: err}).Error())}- response.ActivityID = utils.StringPtrFromTrimmed(activityID)+ response.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &CreateVolumeOutput{Body: base.ApiResponse[*volumetypes.Volume]{@@ -685,7 +687,7 @@ func (h *VolumeHandler) RemoveVolume(ctx context.Context, input *RemoveVolumeInpSuccess: true,Data: base.MessageResponse{Message: "Volume removed successfully",- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),},},}, nil@@ -718,7 +720,7 @@ func (h *VolumeHandler) PruneVolumes(ctx context.Context, input *PruneVolumesInpData: VolumePruneReportData{VolumesDeleted: report.VolumesDeleted,SpaceReclaimed: report.SpaceReclaimed,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),},},}, nil@@ -869,7 +871,7 @@ func (h *VolumeHandler) UploadFile(ctx context.Context, input *UploadFileInput)}return &base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "File uploaded successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "File uploaded successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},}, nil}@@ -930,7 +932,7 @@ func (h *VolumeHandler) runVolumePathActivityInternal(ctx context.Context, envir}return &base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},}, nil}@@ -1004,7 +1006,7 @@ func (h *VolumeHandler) CreateBackup(ctx context.Context, input *CreateBackupInpif err != nil {return nil, huma.Error500InternalServerError(err.Error())}- backup.ActivityID = utils.StringPtrFromTrimmed(activityID)+ backup.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()return &CreateBackupOutput{Body: base.ApiResponse[*models.VolumeBackup]{Success: true,@@ -1043,7 +1045,7 @@ func (h *VolumeHandler) RestoreBackup(ctx context.Context, input *RestoreBackupIreturn &RestoreBackupOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Restore initiated successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Restore initiated successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}@@ -1084,7 +1086,7 @@ func (h *VolumeHandler) RestoreBackupFiles(ctx context.Context, input *RestoreBareturn &RestoreBackupFilesOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Restore initiated successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Restore initiated successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}@@ -1147,7 +1149,7 @@ func (h *VolumeHandler) DeleteBackup(ctx context.Context, input *DeleteBackupInpreturn &DeleteBackupOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Backup deleted successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Backup deleted successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}@@ -1209,7 +1211,7 @@ func (h *VolumeHandler) UploadAndRestore(ctx context.Context, input *UploadAndRereturn &UploadAndRestoreOutput{Body: base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Backup uploaded and restored successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: "Backup uploaded and restored successfully", ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()},},}, nil}diff --git a/backend/go.mod b/backend/go.modindex fe2c077aa..69c7bc419 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -47,6 +47,7 @@ require (github.com/orandin/slog-gorm v1.4.0github.com/pressly/goose/v3 v3.27.2github.com/robfig/cron/v3 v3.0.1+ github.com/samber/mo v1.17.0github.com/samber/slog-echo v1.23.0github.com/shirou/gopsutil/v4 v4.26.6github.com/spf13/cobra v1.10.2diff --git a/backend/go.sum b/backend/go.sumindex 55ca64bad..5691d6a5e 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -435,6 +435,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=+github.com/samber/mo v1.17.0 h1:EbeLc7nxIdpalstxQQakLOcXxULuMRqo7PJPtY18bQg=+github.com/samber/mo v1.17.0/go.mod h1:DlgzJ4SYhOh41nP1L9kh9rDNERuf8IqWSAs+gj2Vxag=github.com/samber/slog-echo v1.23.0 h1:jFzK9t9hLvEjic2tfIkgXt2r22Zz2UYaYrUyM/S0pks=github.com/samber/slog-echo v1.23.0/go.mod h1:caG3zeXgrPRlGKaPVqyWG1MEc6nwrmtDjoLN/mc0PrM=github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=diff --git a/backend/internal/middleware/auth_middleware.go b/backend/internal/middleware/auth_middleware.goindex 2a67e90cd..9ba4287f9 100644--- a/backend/internal/middleware/auth_middleware.go+++ b/backend/internal/middleware/auth_middleware.go@@ -1,6 +1,8 @@package middlewareimport (+ "github.com/samber/mo"+"context""crypto/subtle""errors"@@ -179,7 +181,7 @@ func agentTokenMatchesInternal(presented, configured string) bool {func (m *AuthMiddleware) managerAuth(ctx context.Context, c echo.Context, next echo.HandlerFunc) error {req := c.Request()if agentToken := req.Header.Get(pkgutils.HeaderAgentToken); agentToken != "" {- if env, ok := m.resolveEnvironmentAccessToken(ctx, agentToken); ok {+ if env, ok := m.resolveEnvironmentAccessToken(ctx, agentToken).Get(); ok {environmentScopedInternal(c, env)return next(c)}@@ -272,7 +274,7 @@ func (m *AuthMiddleware) apiKeyHeaderAuth(ctx context.Context, c echo.Context, nreturn next(c)}}- if env, ok := m.resolveEnvironmentAccessToken(ctx, apiKey); ok {+ if env, ok := m.resolveEnvironmentAccessToken(ctx, apiKey).Get(); ok {environmentScopedInternal(c, env)return next(c)}@@ -312,17 +314,17 @@ func (m *AuthMiddleware) resolveApiKeyPermissionsOrDeny(ctx context.Context, apireturn ps}-func (m *AuthMiddleware) resolveEnvironmentAccessToken(ctx context.Context, token string) (*models.Environment, bool) {+func (m *AuthMiddleware) resolveEnvironmentAccessToken(ctx context.Context, token string) mo.Option[*models.Environment] {if m.envTokenResolver == nil {- return nil, false+ return mo.None[*models.Environment]()}env, err := m.envTokenResolver.ResolveEnvironmentByAccessToken(ctx, token)if err != nil || env == nil {- return nil, false+ return mo.None[*models.Environment]()}- return env, true+ return mo.Some(env)}func isPreflightInternal(c echo.Context) bool {diff --git a/backend/internal/middleware/environment_middleware.go b/backend/internal/middleware/environment_middleware.goindex 4cfe06a0d..6caa47f81 100644--- a/backend/internal/middleware/environment_middleware.go+++ b/backend/internal/middleware/environment_middleware.go@@ -1,6 +1,8 @@package middlewareimport (+ "github.com/samber/mo"+"bytes""context""errors"@@ -194,7 +196,7 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c echo.Context, ps *authz.method := c.Request().Methodsuffix := m.buildResourceSuffix(c.Request().URL.Path, envID)- perm, ok := m.matcher.Lookup(method, suffix)+ perm, ok := m.matcher.Lookup(method, suffix).Get()if !ok {slog.WarnContext(c.Request().Context(), "Denying proxied request with no known permission mapping","method", method, "path", suffix, "environment_id", envID)@@ -219,7 +221,7 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c echo.Context, ps *authz.}func (m *EnvironmentMiddleware) proxyActiveEdgeTunnelInternal(c echo.Context, envID string, accessToken *string) (bool, error) {- tunnel, ok := m.getActiveEdgeTunnelInternal(envID)+ tunnel, ok := m.getActiveEdgeTunnelInternal(envID).Get()if !ok {return false, nil}@@ -232,7 +234,7 @@ func (m *EnvironmentMiddleware) proxyActiveEdgeTunnelInternal(c echo.Context, enfunc (m *EnvironmentMiddleware) proxyRecoveredEdgeTunnelInternal(c echo.Context, envID string, accessToken *string) (bool, error) {edge.TouchTunnelDemand(envID, edge.DefaultTunnelDemandTTL)- tunnel, ok := m.waitForActiveEdgeTunnelInternal(c.Request().Context(), envID, edge.DefaultTunnelAcquireTimeout())+ tunnel, ok := m.waitForActiveEdgeTunnelInternal(c.Request().Context(), envID, edge.DefaultTunnelAcquireTimeout()).Get()if !ok {return false, nil}@@ -372,25 +374,25 @@ func isEdgeEnvironmentURLInternal(apiURL string) bool {return strings.HasPrefix(normalized, "edge://")}-func (m *EnvironmentMiddleware) getActiveEdgeTunnelInternal(envID string) (*edge.AgentTunnel, bool) {+func (m *EnvironmentMiddleware) getActiveEdgeTunnelInternal(envID string) mo.Option[*edge.AgentTunnel] {if m.registry == nil {- return nil, false+ return mo.None[*edge.AgentTunnel]()}- tunnel, ok := m.registry.Get(envID)+ tunnel, ok := m.registry.Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {- return nil, false+ return mo.None[*edge.AgentTunnel]()}- return tunnel, true+ return mo.Some(tunnel)}-func (m *EnvironmentMiddleware) waitForActiveEdgeTunnelInternal(ctx context.Context, envID string, timeout time.Duration) (*edge.AgentTunnel, bool) {+func (m *EnvironmentMiddleware) waitForActiveEdgeTunnelInternal(ctx context.Context, envID string, timeout time.Duration) mo.Option[*edge.AgentTunnel] {if timeout <= 0 {return m.getActiveEdgeTunnelInternal(envID)}- if tunnel, ok := m.getActiveEdgeTunnelInternal(envID); ok {- return tunnel, true+ if tunnel, ok := m.getActiveEdgeTunnelInternal(envID).Get(); ok {+ return mo.Some(tunnel)}waitCtx, cancel := context.WithTimeout(ctx, timeout)@@ -402,10 +404,10 @@ func (m *EnvironmentMiddleware) waitForActiveEdgeTunnelInternal(ctx context.Contfor {select {case <-waitCtx.Done():- return nil, false+ return mo.None[*edge.AgentTunnel]()case <-ticker.C:- if tunnel, ok := m.getActiveEdgeTunnelInternal(envID); ok {- return tunnel, true+ if tunnel, ok := m.getActiveEdgeTunnelInternal(envID).Get(); ok {+ return mo.Some(tunnel)}}}diff --git a/backend/internal/services/activity_limiter.go b/backend/internal/services/activity_limiter.goindex 66bb57bac..d95528895 100644--- a/backend/internal/services/activity_limiter.go+++ b/backend/internal/services/activity_limiter.go@@ -4,6 +4,8 @@ import ("context""sync""time"++ "github.com/samber/mo")const (@@ -55,13 +57,13 @@ func (l *activitySlotLimiter) stateForLockedInternal(environmentID string) *actireturn slots}-// tryAcquireInternal grabs a slot without blocking; ok=false means the caller+// tryAcquireInternal grabs a slot without blocking; None means the caller// should queue and block via acquireInternal. Held slots are counted even// while the limit is unlimited, so enabling a limit later still sees the work// already running.-func (l *activitySlotLimiter) tryAcquireInternal(ctx context.Context, environmentID string) (func(), bool) {+func (l *activitySlotLimiter) tryAcquireInternal(ctx context.Context, environmentID string) mo.Option[func()] {if l == nil || l.settings == nil {- return func() {}, true+ return mo.Some(func() {})}limit := l.limitInternal(ctx)@@ -69,10 +71,10 @@ func (l *activitySlotLimiter) tryAcquireInternal(ctx context.Context, environmendefer l.mu.Unlock()slots := l.stateForLockedInternal(environmentID)if limit > 0 && slots.held >= limit {- return nil, false+ return mo.None[func()]()}slots.held++- return l.releaseOnceInternal(environmentID), true+ return mo.Some(l.releaseOnceInternal(environmentID))}// acquireInternal blocks until a slot frees or ctx is cancelled. The limit isdiff --git a/backend/internal/services/activity_service.go b/backend/internal/services/activity_service.goindex a8a325e8e..c1fa4d1e4 100644--- a/backend/internal/services/activity_service.go+++ b/backend/internal/services/activity_service.go@@ -17,6 +17,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/utils"activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"+ "github.com/samber/mo""gorm.io/gorm")@@ -132,12 +133,12 @@ func (sub *activitySubscriber) dropOldestMessageLockedInternal() {}}-func (sub *activitySubscriber) nextInternal() (activitytypes.StreamEvent, bool) {+func (sub *activitySubscriber) nextInternal() mo.Option[activitytypes.StreamEvent] {sub.mu.Lock()defer sub.mu.Unlock()if len(sub.queue) == 0 {- return activitytypes.StreamEvent{}, false+ return mo.None[activitytypes.StreamEvent]()}entry := sub.queue[0]sub.queue = sub.queue[1:]@@ -149,13 +150,13 @@ func (sub *activitySubscriber) nextInternal() (activitytypes.StreamEvent, bool)} else {sub.messageCount--}- return event, true+ return mo.Some(event)}func (sub *activitySubscriber) pump() {defer close(sub.ch)for {- event, ok := sub.nextInternal()+ event, ok := sub.nextInternal().Get()if !ok {select {case <-sub.wake:@@ -269,10 +270,10 @@ func (s *ActivityService) StartActivity(ctx context.Context, req StartActivityRevar startedByUserID, startedByUsername, startedByDisplayName *stringif req.StartedBy != nil {- startedByUserID = utils.StringPtrFromTrimmed(req.StartedBy.ID)- startedByUsername = utils.StringPtrFromTrimmed(req.StartedBy.Username)+ startedByUserID = mo.EmptyableToOption(strings.TrimSpace(req.StartedBy.ID)).ToPointer()+ startedByUsername = mo.EmptyableToOption(strings.TrimSpace(req.StartedBy.Username)).ToPointer()if req.StartedBy.DisplayName != nil {- startedByDisplayName = utils.StringPtrFromTrimmed(*req.StartedBy.DisplayName)+ startedByDisplayName = mo.EmptyableToOption(strings.TrimSpace(*req.StartedBy.DisplayName)).ToPointer()}}@@ -289,7 +290,7 @@ func (s *ActivityService) StartActivity(ctx context.Context, req StartActivityRestatus := models.ActivityStatusRunningvar slotRelease func()if req.Queue {- if release, ok := s.limiter.tryAcquireInternal(ctx, environmentID); ok {+ if release, ok := s.limiter.tryAcquireInternal(ctx, environmentID).Get(); ok {slotRelease = release} else {status = models.ActivityStatusQueueddiff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 33c7bf819..f24a6d941 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -546,14 +546,14 @@ func (s *AuthService) extractOidcGroups(ctx context.Context, userInfo auth.OidcUclaim := s.oidcGroupsClaim(ctx)if claim != "" {- if v, ok := jwtclaims.GetByPath(userInfo.Extra, claim); ok {+ if v, ok := jwtclaims.GetByPath(userInfo.Extra, claim).Get(); ok {if groups := stringValuesFromClaim(v); len(groups) > 0 {return groups}}if tokenResp != nil && tokenResp.IDToken != "" {if parsed := jwtclaims.ParseJWTClaims(tokenResp.IDToken); parsed != nil {- if v, ok := jwtclaims.GetByPath(parsed, claim); ok {+ if v, ok := jwtclaims.GetByPath(parsed, claim).Get(); ok {if groups := stringValuesFromClaim(v); len(groups) > 0 {return groups}@@ -728,7 +728,7 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*mod}tokenHash := hashTokenInternal(accessToken)- if cached, ok := s.tokenCache.Get(tokenHash); ok {+ if cached, ok := s.tokenCache.Get(tokenHash).Get(); ok {return new(cached.User), cached.SessionID, nil}diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.goindex f2914b17a..2e465466c 100644--- a/backend/internal/services/container_registry_service.go+++ b/backend/internal/services/container_registry_service.go@@ -12,6 +12,7 @@ import ("time""github.com/cenkalti/backoff/v5"+ "github.com/samber/mo""golang.org/x/sync/singleflight"cerrdefs "github.com/containerd/errdefs"@@ -207,10 +208,10 @@ func (s *ContainerRegistryService) UpdateRegistry(ctx context.Context, id string}// Update common fields- utils.UpdateIfChanged(®istry.URL, req.URL)- utils.UpdateIfChanged(®istry.Description, req.Description)- utils.UpdateIfChanged(®istry.Insecure, req.Insecure)- utils.UpdateIfChanged(®istry.Enabled, req.Enabled)+ utils.ApplyChanged(®istry.URL, mo.PointerToOption(req.URL))+ utils.ApplyNullable(®istry.Description, mo.PointerToOption(req.Description))+ utils.ApplyChanged(®istry.Insecure, mo.PointerToOption(req.Insecure))+ utils.ApplyChanged(®istry.Enabled, mo.PointerToOption(req.Enabled))if registry.RegistryType == registryTypeECR {if err := s.updateECRRegistryFieldsInternal(registry, req); err != nil {@@ -247,15 +248,15 @@ func (s *ContainerRegistryService) applyRegistryTypeUpdateInternal(registry *mod}func (s *ContainerRegistryService) updateECRRegistryFieldsInternal(registry *models.ContainerRegistry, req models.UpdateContainerRegistryRequest) error {- utils.UpdateIfChanged(®istry.AWSAccessKeyID, req.AWSAccessKeyID)- utils.UpdateIfChanged(®istry.AWSRegion, req.AWSRegion)+ utils.ApplyChanged(®istry.AWSAccessKeyID, mo.PointerToOption(req.AWSAccessKeyID))+ utils.ApplyChanged(®istry.AWSRegion, mo.PointerToOption(req.AWSRegion))if req.AWSSecretAccessKey != nil && *req.AWSSecretAccessKey != "" {encryptedSecret, err := crypto.Encrypt(*req.AWSSecretAccessKey)if err != nil {return fmt.Errorf("failed to encrypt AWS secret access key: %w", err)}- utils.UpdateIfChanged(®istry.AWSSecretAccessKey, &encryptedSecret)+ utils.ApplyChanged(®istry.AWSSecretAccessKey, mo.Some(encryptedSecret))}if strings.TrimSpace(registry.AWSAccessKeyID) == "" {@@ -277,14 +278,14 @@ func (s *ContainerRegistryService) updateECRRegistryFieldsInternal(registry *mod}func (s *ContainerRegistryService) updateGenericRegistryFieldsInternal(registry *models.ContainerRegistry, req models.UpdateContainerRegistryRequest) error {- utils.UpdateIfChanged(®istry.Username, req.Username)+ utils.ApplyChanged(®istry.Username, mo.PointerToOption(req.Username))if req.Token != nil && *req.Token != "" {encryptedToken, err := crypto.Encrypt(*req.Token)if err != nil {return fmt.Errorf("failed to encrypt token: %w", err)}- utils.UpdateIfChanged(®istry.Token, &encryptedToken)+ utils.ApplyChanged(®istry.Token, mo.Some(encryptedToken))}if strings.TrimSpace(registry.Username) == "" {@@ -1151,10 +1152,10 @@ func (s *ContainerRegistryService) checkRegistryNeedsUpdateInternal(item containreturn false, err}- needsUpdate := utils.UpdateIfChanged(&existing.URL, item.URL)- needsUpdate = utils.UpdateIfChanged(&existing.Description, item.Description) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.Insecure, item.Insecure) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.Enabled, item.Enabled) || needsUpdate+ needsUpdate := utils.ApplyChanged(&existing.URL, mo.Some(item.URL))+ needsUpdate = utils.ApplyNullable(&existing.Description, mo.PointerToOption(item.Description)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Insecure, mo.Some(item.Insecure)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Enabled, mo.Some(item.Enabled)) || needsUpdate// Clear stale credentials when registry type changes during syncif newType != existing.RegistryType {@@ -1171,23 +1172,23 @@ func (s *ContainerRegistryService) checkRegistryNeedsUpdateInternal(item containneedsUpdate = true}- needsUpdate = utils.UpdateIfChanged(&existing.RegistryType, newType) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.RegistryType, mo.Some(newType)) || needsUpdateif newType == registryTypeGeneric {- needsUpdate = utils.UpdateIfChanged(&existing.Username, item.Username) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Username, mo.Some(item.Username)) || needsUpdateencryptedToken, err := crypto.Encrypt(item.Token)if err != nil {slog.Warn("failed to encrypt token during sync, skipping field", "registry", existing.ID, "error", err)} else {- needsUpdate = utils.UpdateIfChanged(&existing.Token, encryptedToken) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Token, mo.Some(encryptedToken)) || needsUpdate}return needsUpdate, nil}- credChanged := utils.UpdateIfChanged(&existing.AWSAccessKeyID, item.AWSAccessKeyID)- credChanged = utils.UpdateIfChanged(&existing.AWSRegion, item.AWSRegion) || credChanged+ credChanged := utils.ApplyChanged(&existing.AWSAccessKeyID, mo.Some(item.AWSAccessKeyID))+ credChanged = utils.ApplyChanged(&existing.AWSRegion, mo.Some(item.AWSRegion)) || credChanged// Encrypt and update AWS secret if providedif item.AWSSecretAccessKey != "" {@@ -1195,7 +1196,7 @@ func (s *ContainerRegistryService) checkRegistryNeedsUpdateInternal(item containif err != nil {slog.Warn("failed to encrypt AWS secret during sync, skipping field", "registry", existing.ID, "error", err)} else {- credChanged = utils.UpdateIfChanged(&existing.AWSSecretAccessKey, encryptedSecret) || credChanged+ credChanged = utils.ApplyChanged(&existing.AWSSecretAccessKey, mo.Some(encryptedSecret)) || credChanged}}diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex 0c5ec4582..94a4d9ce5 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -1188,7 +1188,7 @@ func (s *ContainerService) getUpdateInfoMap(ctx context.Context, imageIDs []striupdateInfoMap := make(map[string]*imagetypes.UpdateInfo, len(imageIDs))var uncachedIDs []stringfor _, imageID := range imageIDs {- info, ok := s.updateInfoCache.Get(imageID)+ info, ok := s.updateInfoCache.Get(imageID).Get()if !ok {uncachedIDs = append(uncachedIDs, imageID)continue@@ -1299,7 +1299,7 @@ func (s *ContainerService) getCachedProjectIconMetadataInternal(ctx context.Cont}if s.iconMetaCache != nil {- if meta, ok := s.iconMetaCache.Get(projectName); ok {+ if meta, ok := s.iconMetaCache.Get(projectName).Get(); ok {if metadataByProject != nil {metadataByProject[projectName] = meta}diff --git a/backend/internal/services/environment_runtime_state.go b/backend/internal/services/environment_runtime_state.goindex 4cca86a48..918cc5ff6 100644--- a/backend/internal/services/environment_runtime_state.go+++ b/backend/internal/services/environment_runtime_state.go@@ -26,11 +26,11 @@ func ApplyEnvironmentRuntimeState(env *environmenttypes.Environment) {env.EdgeAgentInstance = nilenv.EdgeCapabilities = nil- if pollState, ok := edge.GetPollRuntimeRegistry().Get(env.ID, time.Now()); ok {+ if pollState, ok := edge.GetPollRuntimeRegistry().Get(env.ID, time.Now()).Get(); ok {env.LastPollAt = pollState.LastPollAt}- if runtimeState, ok := edge.GetTunnelRuntimeState(env.ID); ok {+ if runtimeState, ok := edge.GetTunnelRuntimeState(env.ID).Get(); ok {connected = trueenv.Connected = &connectedenv.Status = string(models.EnvironmentStatusOnline)@@ -48,7 +48,7 @@ func ApplyEnvironmentRuntimeState(env *environmenttypes.Environment) {if len(runtimeState.Capabilities) > 0 {env.EdgeCapabilities = append([]string(nil), runtimeState.Capabilities...)}- if transport, ok := edge.GetActiveTunnelTransport(env.ID); ok {+ if transport, ok := edge.GetActiveTunnelTransport(env.ID).Get(); ok {env.EdgeTransport = &transport} else if runtimeState.Transport != "" {env.EdgeTransport = &runtimeState.Transportdiff --git a/backend/internal/services/environment_service.go b/backend/internal/services/environment_service.goindex 70a6dc7c2..b1406b893 100644--- a/backend/internal/services/environment_service.go+++ b/backend/internal/services/environment_service.go@@ -1,6 +1,8 @@package servicesimport (+ "github.com/samber/mo"+"context"json "encoding/json/v2""errors"@@ -226,17 +228,17 @@ func (s *EnvironmentService) RunHealthChecksNow(ctx context.Context) error {return nil}-func (s *EnvironmentService) acquireHealthLockInternal(envID string) (func(), bool) {+func (s *EnvironmentService) acquireHealthLockInternal(envID string) mo.Option[func()] {if _, loaded := s.runningHealthChecks.LoadOrStore(envID, struct{}{}); loaded {- return nil, false+ return mo.None[func()]()}- return func() { s.runningHealthChecks.Delete(envID) }, true+ return mo.Some(func() { s.runningHealthChecks.Delete(envID) })}// runHealthCheckInternal tests one environment's connection (updating its DB status)// and, for online remotes, syncs registries and repositories to it.func (s *EnvironmentService) runHealthCheckInternal(ctx context.Context, envID string) {- release, ok := s.acquireHealthLockInternal(envID)+ release, ok := s.acquireHealthLockInternal(envID).Get()if !ok {slog.WarnContext(ctx, "environment health check skipped; previous run still in progress", "environment_id", envID)return@@ -278,7 +280,7 @@ func (s *EnvironmentService) ResolveEdgeEnvironmentByToken(ctx context.Context,return "", errors.New("agent token required")}- if envID, ok := s.getCachedEnvironmentIDForTokenInternal(token, time.Now()); ok {+ if envID, ok := s.getCachedEnvironmentIDForTokenInternal(token, time.Now()).Get(); ok {return envID, nil}@@ -335,9 +337,9 @@ func (s *EnvironmentService) logEdgeTokenResolveMissInternal(ctx context.Contextslog.DebugContext(ctx, "Edge agent token did not match any environment", args...)}-func (s *EnvironmentService) getCachedEnvironmentIDForTokenInternal(token string, now time.Time) (string, bool) {+func (s *EnvironmentService) getCachedEnvironmentIDForTokenInternal(token string, now time.Time) mo.Option[string] {if s == nil || token == "" {- return "", false+ return mo.None[string]()}if now.IsZero() {now = time.Now()@@ -347,10 +349,10 @@ func (s *EnvironmentService) getCachedEnvironmentIDForTokenInternal(token stringentry, ok := s.tokenCache[token]s.tokenCacheMu.RUnlock()if !ok {- return "", false+ return mo.None[string]()}if entry.ExpiresAt.After(now) {- return entry.EnvironmentID, true+ return mo.Some(entry.EnvironmentID)}s.tokenCacheMu.Lock()@@ -358,17 +360,17 @@ func (s *EnvironmentService) getCachedEnvironmentIDForTokenInternal(token stringentry, ok = s.tokenCache[token]if !ok {- return "", false+ return mo.None[string]()}if !entry.ExpiresAt.After(now) {delete(s.tokenCache, token)if currentToken, ok := s.tokenByEnvID[entry.EnvironmentID]; ok && currentToken == token {delete(s.tokenByEnvID, entry.EnvironmentID)}- return "", false+ return mo.None[string]()}- return entry.EnvironmentID, true+ return mo.Some(entry.EnvironmentID)}func (s *EnvironmentService) cacheEnvironmentTokenInternal(envID string, token string, now time.Time) {@@ -423,18 +425,18 @@ func (s *EnvironmentService) syncEnvironmentTokenCacheInternal(envID string, tok// GetActiveRemoteEnvironmentSnapshot returns the latest in-process snapshot for// an enabled, visible, non-local remote environment.-func (s *EnvironmentService) GetActiveRemoteEnvironmentSnapshot(environmentID string) (models.Environment, bool) {+func (s *EnvironmentService) GetActiveRemoteEnvironmentSnapshot(environmentID string) mo.Option[models.Environment] {if s == nil || environmentID == "" {- return models.Environment{}, false+ return mo.None[models.Environment]()}s.remoteEnvMu.RLock()environment, ok := s.remoteEnvs[environmentID]s.remoteEnvMu.RUnlock()if !ok || !isActiveRemoteEnvironmentInternal(environment) {- return models.Environment{}, false+ return mo.None[models.Environment]()}- return environment, true+ return mo.Some(environment)}func isActiveRemoteEnvironmentInternal(environment models.Environment) bool {@@ -1249,7 +1251,7 @@ func (s *EnvironmentService) TestConnection(ctx context.Context, id string, cust// testEdgeConnection tests connection to an edge agent via its tunnelfunc (s *EnvironmentService) testEdgeConnection(ctx context.Context, id string) (string, error) {if !edge.HasActiveTunnel(id) {- if _, ok := edge.RequestTunnelAndWait(ctx, id, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()); !ok {+ if _, ok := edge.RequestTunnelAndWait(ctx, id, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()).Get(); !ok {_ = s.updateEnvironmentStatusInternal(ctx, id, string(models.EnvironmentStatusOffline))return "offline", errors.New("edge agent is not connected")}@@ -1357,7 +1359,7 @@ func (s *EnvironmentService) UpdateEnvironmentConnectionState(ctx context.Contexupdates["last_seen"] = &now// Remember the tunnel transport so the UI can keep showing it after// the tunnel drops or while the agent is poll-only.- if state, ok := edge.GetTunnelRuntimeState(id); ok && state.Transport != "" {+ if state, ok := edge.GetTunnelRuntimeState(id).Get(); ok && state.Transport != "" {updates["last_edge_transport"] = state.Transport}} else {@@ -1917,7 +1919,7 @@ func ensureRemoteEnvironmentTunnelAvailableInternal(ctx context.Context, envID sreturn nil}- if _, ok := edge.RequestTunnelAndWait(ctx, envID, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()); ok {+ if _, ok := edge.RequestTunnelAndWait(ctx, envID, edge.DefaultTunnelDemandTTL, edge.DefaultTunnelAcquireTimeout()).Get(); ok {return nil}@@ -1932,7 +1934,7 @@ func doRemoteEnvironmentTunnelRequestInternal(headers map[string]string,body []byte,) (*remenv.Response, error) {- tunnel, ok := edge.GetRegistry().Get(envID)+ tunnel, ok := edge.GetRegistry().Get(envID).Get()if !ok {return nil, fmt.Errorf("no active tunnel for environment %s", envID)}diff --git a/backend/internal/services/environment_service_test.go b/backend/internal/services/environment_service_test.goindex 75b46b263..876f8f425 100644--- a/backend/internal/services/environment_service_test.go+++ b/backend/internal/services/environment_service_test.go@@ -542,7 +542,7 @@ func TestEnvironmentService_UpdateEnvironment_ClearingAccessTokenInvalidatesCach_, err = svc.UpdateEnvironment(ctx, "edge-auth-clear", map[string]any{"access_token": nil}, nil, nil)require.NoError(t, err)- cachedEnvID, ok := svc.getCachedEnvironmentIDForTokenInternal(oldToken, time.Now())+ cachedEnvID, ok := svc.getCachedEnvironmentIDForTokenInternal(oldToken, time.Now()).Get()require.False(t, ok)require.Empty(t, cachedEnvID)@@ -565,7 +565,7 @@ func TestEnvironmentService_getCachedEnvironmentIDForTokenInternal_ExpiresAndClesvc.cacheEnvironmentTokenInternal("env-expired", "expired-token", now.Add(-2*edgeTokenCacheTTL))- envID, ok := svc.getCachedEnvironmentIDForTokenInternal("expired-token", now)+ envID, ok := svc.getCachedEnvironmentIDForTokenInternal("expired-token", now).Get()require.False(t, ok)require.Empty(t, envID)diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.goindex 013ca6f55..1ab7ecec2 100644--- a/backend/internal/services/event_service.go+++ b/backend/internal/services/event_service.go@@ -21,6 +21,8 @@ import (pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/v2/event"+ "github.com/samber/mo"+ "github.com/samber/mo/option""golang.org/x/text/cases""golang.org/x/text/language""gorm.io/gorm"@@ -632,11 +634,13 @@ func cloneEventMetadataValueInternal(value any) any {}}-var eventDefinitions = map[models.EventType]struct {+type eventDefinition struct {TitleFormat stringDescriptionFormat stringSeverity models.EventSeverity-}{+}++var eventDefinitions = map[models.EventType]eventDefinition{models.EventTypeContainerStart: {"Container started: %s", "Container '%s' has been started", models.EventSeveritySuccess},models.EventTypeContainerStop: {"Container stopped: %s", "Container '%s' has been stopped", models.EventSeverityInfo},models.EventTypeContainerRestart: {"Container restarted: %s", "Container '%s' has been restarted", models.EventSeverityInfo},@@ -686,22 +690,24 @@ var eventDefinitions = map[models.EventType]struct {}func (s *EventService) generateEventTitle(eventType models.EventType, resourceName string) string {- if def, ok := eventDefinitions[eventType]; ok {+ definition, ok := eventDefinitions[eventType]+ return option.Map(func(def eventDefinition) string {return fmt.Sprintf(def.TitleFormat, resourceName)- }- return "Event: " + string(eventType)+ })(mo.TupleToOption(definition, ok)).OrElse("Event: " + string(eventType))}func (s *EventService) generateEventDescription(eventType models.EventType, resourceType, resourceName string) string {- if def, ok := eventDefinitions[eventType]; ok {+ definition, ok := eventDefinitions[eventType]+ return option.Map(func(def eventDefinition) string {return fmt.Sprintf(def.DescriptionFormat, resourceName)- }- return fmt.Sprintf("%s operation performed on %s '%s'", string(eventType), resourceType, resourceName)+ })(mo.TupleToOption(definition, ok)).OrElse(+ fmt.Sprintf("%s operation performed on %s '%s'", string(eventType), resourceType, resourceName),+ )}func (s *EventService) getEventSeverity(eventType models.EventType) models.EventSeverity {- if def, ok := eventDefinitions[eventType]; ok {+ definition, ok := eventDefinitions[eventType]+ return option.Map(func(def eventDefinition) models.EventSeverity {return def.Severity- }- return models.EventSeverityInfo+ })(mo.TupleToOption(definition, ok)).OrElse(models.EventSeverityInfo)}diff --git a/backend/internal/services/federated_credential_service.go b/backend/internal/services/federated_credential_service.goindex 247757a95..0923ee334 100644--- a/backend/internal/services/federated_credential_service.go+++ b/backend/internal/services/federated_credential_service.go@@ -16,6 +16,7 @@ import ("github.com/coreos/go-oidc/v3/oidc""github.com/google/uuid"+ "github.com/samber/mo""golang.org/x/sync/singleflight""gorm.io/gorm"@@ -166,7 +167,7 @@ func (s *FederatedCredentialService) Create(ctx context.Context, callerUserID sterr = dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {serviceUser := models.User{Username: "svc_federated_" + strings.ReplaceAll(uuid.NewString(), "-", ""),- DisplayName: pkgutils.StringPtrFromTrimmed("Federated: " + normalized.Name),+ DisplayName: mo.EmptyableToOption(strings.TrimSpace("Federated: " + normalized.Name)).ToPointer(),IsServiceAccount: true,}if err := tx.Create(&serviceUser).Error; err != nil {@@ -552,7 +553,7 @@ func unverifiedTokenExchangeMetadataInternal(rawToken string) (string, string, [}func stringClaimByPathInternal(claims map[string]any, path string) string {- value, ok := jwtclaims.GetByPath(claims, path)+ value, ok := jwtclaims.GetByPath(claims, path).Get()if !ok {return ""}@@ -560,7 +561,7 @@ func stringClaimByPathInternal(claims map[string]any, path string) string {}func stringSliceClaimInternal(claims map[string]any, path string) []string {- value, ok := jwtclaims.GetByPath(claims, path)+ value, ok := jwtclaims.GetByPath(claims, path).Get()if !ok || value == nil {return nil}@@ -592,7 +593,7 @@ func normalizeCreateFederatedCredentialInternal(req federatedtypes.CreateFederatreq.SubjectMatch = strings.TrimSpace(req.SubjectMatch)req.MatchType = normalizeMatchTypeInternal(req.MatchType)req.Audiences = pkgutils.UniqueNonEmptyStrings(req.Audiences)- req.EnvironmentID = pkgutils.StringPtrFromTrimmed(pkgutils.DerefString(req.EnvironmentID))+ req.EnvironmentID = mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(req.EnvironmentID).OrEmpty())).ToPointer()req.TokenTTLSeconds = clampFederatedTokenTTLSecondsInternal(req.TokenTTLSeconds)if req.SubjectClaim == "" {@@ -686,8 +687,8 @@ func applyFederatedRoleScopeUpdateInternal(existing *models.FederatedCredential,existing.RoleID = normalizedRoleID}if environmentID != nil {- normalized := pkgutils.StringPtrFromTrimmed(*environmentID)- roleChanged = roleChanged || pkgutils.DerefString(existing.EnvironmentID) != pkgutils.DerefString(normalized)+ normalized := mo.EmptyableToOption(strings.TrimSpace(*environmentID)).ToPointer()+ roleChanged = roleChanged || mo.PointerToOption(existing.EnvironmentID).OrEmpty() != mo.PointerToOption(normalized).OrEmpty()existing.EnvironmentID = normalized}return roleChanged, nil@@ -857,11 +858,11 @@ func (s *FederatedCredentialService) logExchangeInternal(ctx context.Context, reSeverity: severity,Title: title,Description: "Workload identity federation token exchange",- ResourceType: pkgutils.StringPtrFromTrimmed("federated_credential"),- ResourceID: pkgutils.StringPtrFromTrimmed(credentialID),- ResourceName: pkgutils.StringPtrFromTrimmed(credentialName),- UserID: pkgutils.StringPtrFromTrimmed(userID),- Username: pkgutils.StringPtrFromTrimmed(username),+ ResourceType: mo.EmptyableToOption(strings.TrimSpace("federated_credential")).ToPointer(),+ ResourceID: mo.EmptyableToOption(strings.TrimSpace(credentialID)).ToPointer(),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace(credentialName)).ToPointer(),+ UserID: mo.EmptyableToOption(strings.TrimSpace(userID)).ToPointer(),+ Username: mo.EmptyableToOption(strings.TrimSpace(username)).ToPointer(),Metadata: metadata,})if err != nil {diff --git a/backend/internal/services/git_repository_service.go b/backend/internal/services/git_repository_service.goindex 1d8c28cd0..ee61f62d0 100644--- a/backend/internal/services/git_repository_service.go+++ b/backend/internal/services/git_repository_service.go@@ -14,6 +14,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation""github.com/getarcaneapp/arcane/types/v2/gitops"+ "github.com/samber/mo"contextsource "go.getarcane.app/builds/pkg/utils/contextsource""go.getarcane.app/sys/crypto""gorm.io/gorm"@@ -497,19 +498,19 @@ func (s *GitRepositoryService) updateExistingRepository(ctx context.Context, ite}func (s *GitRepositoryService) checkRepositoryNeedsUpdate(item gitops.RepositorySync, existing *models.GitRepository) bool {- needsUpdate := utils.UpdateIfChanged(&existing.Name, item.Name)- needsUpdate = utils.UpdateIfChanged(&existing.URL, item.URL) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.AuthType, item.AuthType) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.Username, item.Username) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.SSHHostKeyVerification, item.SSHHostKeyVerification) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.Description, item.Description) || needsUpdate- needsUpdate = utils.UpdateIfChanged(&existing.Enabled, item.Enabled) || needsUpdate+ needsUpdate := utils.ApplyChanged(&existing.Name, mo.Some(item.Name))+ needsUpdate = utils.ApplyChanged(&existing.URL, mo.Some(item.URL)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.AuthType, mo.Some(item.AuthType)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Username, mo.Some(item.Username)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.SSHHostKeyVerification, mo.Some(item.SSHHostKeyVerification)) || needsUpdate+ needsUpdate = utils.ApplyNullable(&existing.Description, mo.PointerToOption(item.Description)) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Enabled, mo.Some(item.Enabled)) || needsUpdate// Handle Token updateif item.Token != "" {encryptedToken, err := crypto.Encrypt(item.Token)if err == nil {- needsUpdate = utils.UpdateIfChanged(&existing.Token, encryptedToken) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.Token, mo.Some(encryptedToken)) || needsUpdate}} else if existing.Token != "" {existing.Token = ""@@ -520,7 +521,7 @@ func (s *GitRepositoryService) checkRepositoryNeedsUpdate(item gitops.Repositoryif item.SSHKey != "" {encryptedSSHKey, err := crypto.Encrypt(item.SSHKey)if err == nil {- needsUpdate = utils.UpdateIfChanged(&existing.SSHKey, encryptedSSHKey) || needsUpdate+ needsUpdate = utils.ApplyChanged(&existing.SSHKey, mo.Some(encryptedSSHKey)) || needsUpdate}} else if existing.SSHKey != "" {existing.SSHKey = ""diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.goindex 115dedcca..2893d353b 100644--- a/backend/internal/services/gitops_sync_service.go+++ b/backend/internal/services/gitops_sync_service.go@@ -26,6 +26,7 @@ import (projecttypes "github.com/getarcaneapp/arcane/types/v2/project"schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/getarcaneapp/arcane/types/v2/swarm"+ "github.com/samber/mo""gorm.io/gorm")@@ -484,13 +485,13 @@ func isGitOpsSyncOverdueInternal(sync *models.GitOpsSync) bool {return time.Now().After(sync.LastSyncAt.Add(time.Duration(interval) * time.Minute))}-// acquireSyncLockInternal returns a release func and true when no sync is currently-// running for the given id; otherwise it returns false and the caller should skip.-func (s *GitOpsSyncService) acquireSyncLockInternal(syncID string) (func(), bool) {+// acquireSyncLockInternal returns a release func when no sync is currently+// running for the given id; otherwise the caller should skip.+func (s *GitOpsSyncService) acquireSyncLockInternal(syncID string) mo.Option[func()] {if _, loaded := s.runningSyncs.LoadOrStore(syncID, struct{}{}); loaded {- return nil, false+ return mo.None[func()]()}- return func() { s.runningSyncs.Delete(syncID) }, true+ return mo.Some(func() { s.runningSyncs.Delete(syncID) })}func (s *GitOpsSyncService) getEnvironmentSyncLimits(ctx context.Context) (int, int64, int64) {@@ -912,7 +913,7 @@ func (s *GitOpsSyncService) DeleteSync(ctx context.Context, environmentID, id stfunc (s *GitOpsSyncService) PerformSync(ctx context.Context, environmentID, id string, actor models.User) (*gitops.SyncResult, error) {// Coalesce overlapping runs for the same sync (scheduled fire, startup/enable// kick, manual trigger, webhook) so they don't race the clone/redeploy.- release, ok := s.acquireSyncLockInternal(id)+ release, ok := s.acquireSyncLockInternal(id).Get()if !ok {slog.InfoContext(ctx, "GitOps sync already in progress; skipping", "syncId", id)return &gitops.SyncResult{Success: false, Message: "sync already in progress", SyncedAt: time.Now()}, nildiff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex 290a82844..0a818a37b 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -17,7 +17,6 @@ import (dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/types/v2/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/v2/image"systemtypes "github.com/getarcaneapp/arcane/types/v2/system"@@ -25,6 +24,7 @@ import ("github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/image""github.com/moby/moby/client"+ "github.com/samber/mo""golang.org/x/sync/errgroup""gorm.io/gorm")@@ -767,7 +767,7 @@ func buildImageRefUpdateLookupsInternal(imageRefs []string) []imageRefUpdateLookseen := make(map[string]struct{}, len(imageRefs))for _, rawRef := range imageRefs {- lookup, ok := parseImageRefUpdateLookupInternal(rawRef)+ lookup, ok := parseImageRefUpdateLookupInternal(rawRef).Get()if !ok {continue}@@ -781,15 +781,15 @@ func buildImageRefUpdateLookupsInternal(imageRefs []string) []imageRefUpdateLookreturn lookups}-func parseImageRefUpdateLookupInternal(imageRef string) (imageRefUpdateLookup, bool) {+func parseImageRefUpdateLookupInternal(imageRef string) mo.Option[imageRefUpdateLookup] {trimmedRef := strings.TrimSpace(imageRef)if trimmedRef == "" {- return imageRefUpdateLookup{}, false+ return mo.None[imageRefUpdateLookup]()}named, err := ref.ParseNormalizedNamed(trimmedRef)if err != nil {- return imageRefUpdateLookup{}, false+ return mo.None[imageRefUpdateLookup]()}tag := "latest"@@ -821,11 +821,11 @@ func parseImageRefUpdateLookupInternal(imageRef string) (imageRefUpdateLookup, brepositoryCandidates[strings.TrimPrefix(repositoryPath, "library/")] = struct{}{}}- return imageRefUpdateLookup{+ return mo.Some(imageRefUpdateLookup{originalRef: trimmedRef,tag: tag,repositoryCandidates: repositoryCandidates,- }, true+ })}func selectLatestMatchingImageUpdateRecordInternal(@@ -1053,7 +1053,7 @@ func parseRepoAndTagFromRepoTag(repoTag string) (repo, tag string) {return repoTag, "latest"}-func parseRepoFromDigests(repoDigests []string) (repo string, found bool) {+func parseRepoFromDigests(repoDigests []string) mo.Option[string] {for _, rd := range repoDigests {if rd == "<none>@<none>" {continue@@ -1061,11 +1061,11 @@ func parseRepoFromDigests(repoDigests []string) (repo string, found bool) {if at := strings.LastIndex(rd, "@"); at != -1 {candidateRepo := rd[:at]if candidateRepo != "" {- return candidateRepo, true+ return mo.Some(candidateRepo)}}}- return "", false+ return mo.None[string]()}func determineRepoAndTag(di image.Summary) (repo, tag string) {@@ -1074,8 +1074,8 @@ func determineRepoAndTag(di image.Summary) (repo, tag string) {}if len(di.RepoDigests) > 0 {- if r, found := parseRepoFromDigests(di.RepoDigests); found {- return r, "<none>"+ if repo, found := parseRepoFromDigests(di.RepoDigests).Get(); found {+ return repo, "<none>"}}@@ -1087,15 +1087,15 @@ func buildUpdateInfo(updateRecord *models.ImageUpdateRecord) *imagetypes.UpdateIHasUpdate: updateRecord.HasUpdate,UpdateType: updateRecord.UpdateType,CurrentVersion: updateRecord.CurrentVersion,- LatestVersion: utils.DerefString(updateRecord.LatestVersion),- CurrentDigest: utils.DerefString(updateRecord.CurrentDigest),- LatestDigest: utils.DerefString(updateRecord.LatestDigest),+ LatestVersion: mo.PointerToOption(updateRecord.LatestVersion).OrEmpty(),+ CurrentDigest: mo.PointerToOption(updateRecord.CurrentDigest).OrEmpty(),+ LatestDigest: mo.PointerToOption(updateRecord.LatestDigest).OrEmpty(),CheckTime: updateRecord.CheckTime,ResponseTimeMs: updateRecord.ResponseTimeMs,- Error: utils.DerefString(updateRecord.LastError),- AuthMethod: utils.DerefString(updateRecord.AuthMethod),- AuthUsername: utils.DerefString(updateRecord.AuthUsername),- AuthRegistry: utils.DerefString(updateRecord.AuthRegistry),+ Error: mo.PointerToOption(updateRecord.LastError).OrEmpty(),+ AuthMethod: mo.PointerToOption(updateRecord.AuthMethod).OrEmpty(),+ AuthUsername: mo.PointerToOption(updateRecord.AuthUsername).OrEmpty(),+ AuthRegistry: mo.PointerToOption(updateRecord.AuthRegistry).OrEmpty(),UsedCredential: updateRecord.UsedCredential,}}diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex b7316f08a..3cfb4b2eb 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -23,6 +23,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/imageupdate""github.com/moby/moby/api/types/image""github.com/moby/moby/client"+ "github.com/samber/mo""go.getarcane.app/sys/crypto"updaterdigest "go.getarcane.app/updater/pkg/digest"updaterrefs "go.getarcane.app/updater/pkg/refs"@@ -139,7 +140,7 @@ func (s *ImageUpdateService) startImageUpdateActivityInternal(ctx context.ContexType: models.ActivityTypeImageUpdateCheck,Queue: true,ResourceType: &resourceType,- ResourceName: utils.StringPtrFromTrimmed(resourceName),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace(resourceName)).ToPointer(),Step: "Checking image updates",LatestMessage: "Image update check started",Metadata: models.JSON{@@ -178,7 +179,7 @@ func (s *ImageUpdateService) completeImageUpdateActivityInternal(ctx context.Convar errMessage *stringif !success {status = models.ActivityStatusFailed- errMessage = utils.StringPtrFromTrimmed(message)+ errMessage = mo.EmptyableToOption(strings.TrimSpace(message)).ToPointer()if activitylib.CancelledByContext(ctx) {status = models.ActivityStatusCancellederrMessage = nil@@ -200,9 +201,9 @@ func (s *ImageUpdateService) CheckImageUpdate(ctx context.Context, imageRef strictx = s.activityService.Track(ctx, activityID)activitylib.AwaitHandlerActivitySlot(ctx, s.activityService, activityID, "0")- if result, ok := digestPinnedImageUpdateResultInternal(imageRef); ok {+ if result, ok := digestPinnedImageUpdateResultInternal(imageRef).Get(); ok {result.ResponseTimeMs = int(time.Since(startTime).Milliseconds())- result.ActivityID = utils.StringPtrFromTrimmed(activityID)+ result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.appendImageUpdateActivityMessageInternal(ctx, activityID, models.ActivityMessageLevelInfo, imageRef+" — digest pinned, skipped", 100, "Skipping image update check")if saveErr := s.saveUpdateResultWithSnapshotInternal(ctx, imageRef, result, nil); saveErr != nil {slog.WarnContext(ctx, "Failed to save digest-pinned update result", "imageRef", imageRef, "error", saveErr.Error())@@ -234,7 +235,7 @@ func (s *ImageUpdateService) CheckImageUpdate(ctx context.Context, imageRef striError: "Invalid image reference format",CheckTime: time.Now(),ResponseTimeMs: int(time.Since(startTime).Milliseconds()),- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}s.completeImageUpdateActivityInternal(ctx, activityID, false, result.Error)return result, nil@@ -251,7 +252,7 @@ func (s *ImageUpdateService) CheckImageUpdate(ctx context.Context, imageRef striError: err.Error(),CheckTime: time.Now(),ResponseTimeMs: int(time.Since(startTime).Milliseconds()),- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}metadata := models.JSON{"action": "check_update",@@ -270,7 +271,7 @@ func (s *ImageUpdateService) CheckImageUpdate(ctx context.Context, imageRef stri}digestResult.ResponseTimeMs = int(time.Since(startTime).Milliseconds())- digestResult.ActivityID = utils.StringPtrFromTrimmed(activityID)+ digestResult.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()if digestResult.UpdateType == models.UpdateTypeLocal {s.appendImageUpdateActivityMessageInternal(ctx, activityID, models.ActivityMessageLevelInfo, imageRef+" — local build, registry check skipped", 100, "Skipping image update check")}@@ -344,11 +345,11 @@ func (s *ImageUpdateService) resolveNotifiedImageIDInternal(ctx context.Context,return resolved}-func digestPinnedImageUpdateResultInternal(imageRef string) (*imageupdate.Response, bool) {+func digestPinnedImageUpdateResultInternal(imageRef string) mo.Option[*imageupdate.Response] {imageRef = strings.TrimSpace(imageRef)pinnedDigest, ok := updaterdigest.FromReferenceSuffix(imageRef)if !ok {- return nil, false+ return mo.None[*imageupdate.Response]()}tag := "latest"@@ -358,7 +359,7 @@ func digestPinnedImageUpdateResultInternal(imageRef string) (*imageupdate.Respon}}- return &imageupdate.Response{+ return mo.Some(&imageupdate.Response{HasUpdate: false,UpdateType: models.UpdateTypeDigest,CurrentVersion: tag,@@ -367,7 +368,7 @@ func digestPinnedImageUpdateResultInternal(imageRef string) (*imageupdate.ResponLatestDigest: pinnedDigest,CheckTime: time.Now(),ResponseTimeMs: 0,- }, true+ })}func (s *ImageUpdateService) checkDigestUpdateWithSnapshotInternal(ctx context.Context, parts *ImageParts, composeBuildRefs map[string]struct{}) (*imageupdate.Response, *localImageSnapshot, error) {@@ -909,7 +910,7 @@ func savePreparedUpdateResultWithTxInternal(tx *gorm.DB, imageID, repo, tag striif hasExisting &&strings.TrimSpace(result.Error) != "" &&isRateLimitErrorStringInternal(result.Error) &&- strings.TrimSpace(utils.DerefString(existingRecord.LastError)) == "" {+ strings.TrimSpace(mo.PointerToOption(existingRecord.LastError).OrEmpty()) == "" {slog.Debug("Preserving previous image update result; check hit a registry rate limit","imageID", imageID, "repository", repo, "tag", tag, "error", result.Error)return nil@@ -918,8 +919,8 @@ func savePreparedUpdateResultWithTxInternal(tx *gorm.DB, imageID, repo, tag striif hasExisting {// Existing record found - check if we need to reset notification_sentstateChanged := existingRecord.HasUpdate != updateRecord.HasUpdate- digestChanged := utils.DerefString(existingRecord.LatestDigest) != utils.DerefString(updateRecord.LatestDigest)- versionChanged := utils.DerefString(existingRecord.LatestVersion) != utils.DerefString(updateRecord.LatestVersion)+ digestChanged := mo.PointerToOption(existingRecord.LatestDigest).OrEmpty() != mo.PointerToOption(updateRecord.LatestDigest).OrEmpty()+ versionChanged := mo.PointerToOption(existingRecord.LatestVersion).OrEmpty() != mo.PointerToOption(updateRecord.LatestVersion).OrEmpty()// Reset notification_sent if the update state changed in any wayif stateChanged || (updateRecord.HasUpdate && (digestChanged || versionChanged)) {@@ -1006,9 +1007,9 @@ func (s *ImageUpdateService) MarkImageRefUpToDateAfterPull(ctx context.Context,ResponseTimeMs: 0,}- lookup, hasLookup := parseImageRefUpdateLookupInternal(imageRef)+ lookup := parseImageRefUpdateLookupInternal(imageRef)return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {- if hasLookup {+ if lookup, hasLookup := lookup.Get(); hasLookup {repositories := repositoryCandidatesSliceInternal(lookup.repositoryCandidates)if len(repositories) > 0 {// Only clear synthetic ref:: records, not real sha256 image ID records.@@ -1107,7 +1108,7 @@ func (s *ImageUpdateService) parseAndGroupImagesInternal(imageRefs []string) (maindexByNormalizedRef := make(map[string]int)for _, ref := range imageRefs {- if result, ok := digestPinnedImageUpdateResultInternal(ref); ok {+ if result, ok := digestPinnedImageUpdateResultInternal(ref).Get(); ok {results[ref] = resultcontinue}@@ -1279,7 +1280,7 @@ func (s *ImageUpdateService) checkBatchImageInternal(ctx context.Context, activiError: err.Error(),CheckTime: time.Now(),ResponseTimeMs: 0,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}s.recordBatchImageCheckInternal(ctx, activityID, img, res, nil, recorder)return nil@@ -1291,7 +1292,7 @@ func (s *ImageUpdateService) checkBatchImageInternal(ctx context.Context, activireturn ctx.Err()}if res != nil {- res.ActivityID = utils.StringPtrFromTrimmed(activityID)+ res.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}s.recordBatchImageCheckInternal(ctx, activityID, img, res, snapshot, recorder)@@ -1328,7 +1329,7 @@ func (s *ImageUpdateService) CheckMultipleImages(ctx context.Context, imageRefsif result == nil {continue}- result.ActivityID = utils.StringPtrFromTrimmed(activityID)+ result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()if strings.TrimSpace(result.Error) != "" {continue}@@ -1425,15 +1426,15 @@ func (s *ImageUpdateService) sendBatchImageUpdateNotificationsInternal(ctx conteHasUpdate: record.HasUpdate,UpdateType: record.UpdateType,CurrentVersion: record.CurrentVersion,- LatestVersion: utils.DerefString(record.LatestVersion),- CurrentDigest: utils.DerefString(record.CurrentDigest),- LatestDigest: utils.DerefString(record.LatestDigest),+ LatestVersion: mo.PointerToOption(record.LatestVersion).OrEmpty(),+ CurrentDigest: mo.PointerToOption(record.CurrentDigest).OrEmpty(),+ LatestDigest: mo.PointerToOption(record.LatestDigest).OrEmpty(),CheckTime: record.CheckTime,ResponseTimeMs: record.ResponseTimeMs,- Error: utils.DerefString(record.LastError),- AuthMethod: utils.DerefString(record.AuthMethod),- AuthUsername: utils.DerefString(record.AuthUsername),- AuthRegistry: utils.DerefString(record.AuthRegistry),+ Error: mo.PointerToOption(record.LastError).OrEmpty(),+ AuthMethod: mo.PointerToOption(record.AuthMethod).OrEmpty(),+ AuthUsername: mo.PointerToOption(record.AuthUsername).OrEmpty(),+ AuthRegistry: mo.PointerToOption(record.AuthRegistry).OrEmpty(),UsedCredential: record.UsedCredential,}imageIDsToMark = append(imageIDsToMark, imageID)diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.goindex b34d5d445..547d4a067 100644--- a/backend/internal/services/image_update_service_test.go+++ b/backend/internal/services/image_update_service_test.go@@ -26,6 +26,7 @@ import ("github.com/moby/moby/client""github.com/opencontainers/go-digest"ocispec "github.com/opencontainers/image-spec/specs-go/v1"+ "github.com/samber/mo""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"@@ -298,38 +299,6 @@ func TestImageUpdateService_DockerReferenceCompatibility(t *testing.T) {}}-// TestDerefString tests the shared helper used for pointer comparison.-func TestDerefString(t *testing.T) {- tests := []struct {- name string- ptr *string- want string- }{- {- name: "nil pointer returns empty string",- ptr: nil,- want: "",- },- {- name: "valid pointer returns value",- ptr: stringToPtr("test-value"),- want: "test-value",- },- {- name: "empty string pointer returns empty string",- ptr: stringToPtr(""),- want: "",- },- }-- for _, tt := range tests {- t.Run(tt.name, func(t *testing.T) {- result := utils.DerefString(tt.ptr)- assert.Equal(t, tt.want, result)- })- }-}-// TestStringToPtr tests the helper function for creating string pointersfunc TestStringToPtr(t *testing.T) {tests := []struct {@@ -663,8 +632,8 @@ func TestImageUpdateService_CheckMultipleImages_SkippedDigestPinnedReferenceClearequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", recordID).First(&saved).Error)assert.False(t, saved.HasUpdate)assert.Nil(t, saved.LastError)- assert.Equal(t, pinnedDigest, utils.DerefString(saved.CurrentDigest))- assert.Equal(t, pinnedDigest, utils.DerefString(saved.LatestDigest))+ assert.Equal(t, pinnedDigest, mo.PointerToOption(saved.CurrentDigest).OrEmpty())+ assert.Equal(t, pinnedDigest, mo.PointerToOption(saved.LatestDigest).OrEmpty())}func TestImageUpdateService_CheckMultipleImages_DigestPinnedTagPreservedWhenLocalImageHasNoRepoTags(t *testing.T) {@@ -747,7 +716,7 @@ func TestImageUpdateService_CheckImageUpdate_UsesRegistryFallback(t *testing.T)var saved models.ImageUpdateRecordrequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:local-image-id").First(&saved).Error)- assert.Equal(t, remoteDigest, utils.DerefString(saved.LatestDigest))+ assert.Equal(t, remoteDigest, mo.PointerToOption(saved.LatestDigest).OrEmpty())}func TestImageUpdateService_CheckMultipleImages_UsesRegistryFallback(t *testing.T) {@@ -789,7 +758,7 @@ func TestImageUpdateService_CheckMultipleImages_UsesRegistryFallback(t *testing.var saved models.ImageUpdateRecordrequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:local-image-id").First(&saved).Error)- assert.Equal(t, remoteDigest, utils.DerefString(saved.LatestDigest))+ assert.Equal(t, remoteDigest, mo.PointerToOption(saved.LatestDigest).OrEmpty())}func TestImageUpdateService_CheckMultipleImagesCompletesActivityWhenRequestContextCanceledInternal(t *testing.T) {@@ -1040,7 +1009,7 @@ func TestImageUpdateService_SaveUpdateResultWithSnapshotInternal_PersistsRegistrassert.Equal(t, repository, saved.Repository)assert.Equal(t, "alpine", saved.Tag)assert.True(t, saved.HasUpdate)- assert.Equal(t, remoteDigest, utils.DerefString(saved.LatestDigest))+ assert.Equal(t, remoteDigest, mo.PointerToOption(saved.LatestDigest).OrEmpty())assert.Nil(t, saved.LastError)}@@ -1121,8 +1090,8 @@ func TestImageUpdateService_MarkImageRefUpToDateAfterPull_ClearsMatchingRecordsAassert.False(t, currentRecord.HasUpdate)assert.Equal(t, repository, currentRecord.Repository)assert.Equal(t, "1.2.3", currentRecord.Tag)- assert.Equal(t, localDigest, utils.DerefString(currentRecord.CurrentDigest))- assert.Equal(t, localDigest, utils.DerefString(currentRecord.LatestDigest))+ assert.Equal(t, localDigest, mo.PointerToOption(currentRecord.CurrentDigest).OrEmpty())+ assert.Equal(t, localDigest, mo.PointerToOption(currentRecord.LatestDigest).OrEmpty())assert.Equal(t, "1.2.3", currentRecord.CurrentVersion)require.NotNil(t, currentRecord.LatestVersion)assert.Equal(t, "1.2.3", *currentRecord.LatestVersion)@@ -1297,8 +1266,8 @@ func TestImageUpdateService_NotificationSentReset(t *testing.T) {// This is the logic we're testing - comparing string values not pointersstateChanged := existingRecord.HasUpdate != updateRecord.HasUpdate- digestChanged := utils.DerefString(existingRecord.LatestDigest) != utils.DerefString(updateRecord.LatestDigest)- versionChanged := utils.DerefString(existingRecord.LatestVersion) != utils.DerefString(updateRecord.LatestVersion)+ digestChanged := mo.PointerToOption(existingRecord.LatestDigest).OrEmpty() != mo.PointerToOption(updateRecord.LatestDigest).OrEmpty()+ versionChanged := mo.PointerToOption(existingRecord.LatestVersion).OrEmpty() != mo.PointerToOption(updateRecord.LatestVersion).OrEmpty()if stateChanged || (updateRecord.HasUpdate && (digestChanged || versionChanged)) {updateRecord.NotificationSent = false@@ -1376,10 +1345,10 @@ func TestImageUpdateService_RateLimitErrorPreservesPreviousResult(t *testing.T)if tt.expectPreserved {assert.Nil(t, saved.LastError, "previous good record should be preserved")- assert.Equal(t, "sha256:current", utils.DerefString(saved.LatestDigest))+ assert.Equal(t, "sha256:current", mo.PointerToOption(saved.LatestDigest).OrEmpty())assert.Equal(t, checkTime, saved.CheckTime.UTC())} else {- assert.Equal(t, tt.resultError, utils.DerefString(saved.LastError))+ assert.Equal(t, tt.resultError, mo.PointerToOption(saved.LastError).OrEmpty())assert.Nil(t, saved.LatestDigest)}})diff --git a/backend/internal/services/job_service.go b/backend/internal/services/job_service.goindex 170dde666..0c8e2713f 100644--- a/backend/internal/services/job_service.go+++ b/backend/internal/services/job_service.go@@ -15,12 +15,13 @@ import ("github.com/getarcaneapp/arcane/types/v2/meta"schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/robfig/cron/v3"+ "github.com/samber/mo""gorm.io/gorm")type JobRunner interface {- GetJob(jobID string) (schedulertypes.Job, bool)- GetJobRuntimeState(jobID string) (schedulertypes.JobRuntimeState, bool)+ GetJob(jobID string) mo.Option[schedulertypes.Job]+ GetJobRuntimeState(jobID string) mo.Option[schedulertypes.JobRuntimeState]RescheduleJob(ctx context.Context, job schedulertypes.Job) errorRunBusWatcherNow(ctx context.Context, watcherID string) error}@@ -232,7 +233,7 @@ func (s *JobService) rescheduleAffectedJobInternal(ctx context.Context, jobID streturn nil}- job, ok := s.scheduler.GetJob(jobID)+ job, ok := s.scheduler.GetJob(jobID).Get()if !ok {return fmt.Errorf("job %s not found in scheduler", jobID)}@@ -243,7 +244,7 @@ func (s *JobService) rescheduleAffectedJobInternal(ctx context.Context, jobID streturn fmt.Errorf("reschedule job %s: %w", jobID, err)}- runtimeState, ok := s.scheduler.GetJobRuntimeState(jobID)+ runtimeState, ok := s.scheduler.GetJobRuntimeState(jobID).Get()if !ok {return fmt.Errorf("job %s has no runtime scheduler state", jobID)}@@ -311,7 +312,7 @@ func (s *JobService) ListJobs(ctx context.Context) (*jobschedule.JobListResponseprerequisites := s.evaluatePrerequisitesInternal(ctx, jobMeta)if s.scheduler != nil && jobMeta.SettingsKey != "" && jobMeta.ID != "environment-health" {- if runtimeState, ok := s.scheduler.GetJobRuntimeState(jobMeta.ID); ok && runtimeState.Schedule != "" {+ if runtimeState, ok := s.scheduler.GetJobRuntimeState(jobMeta.ID).Get(); ok && runtimeState.Schedule != "" {schedule = runtimeState.SchedulenextRun = runtimeState.NextRun}@@ -377,7 +378,7 @@ func (s *JobService) getRunnableJobInternal(jobID string) (schedulertypes.Job, ereturn nil, fmt.Errorf("job %s is manager-only and cannot run in agent mode", jobID)}- job, ok := s.scheduler.GetJob(jobID)+ job, ok := s.scheduler.GetJob(jobID).Get()if !ok {return nil, fmt.Errorf("job %s not found in scheduler", jobID)}diff --git a/backend/internal/services/job_service_test.go b/backend/internal/services/job_service_test.goindex aec63e20a..ef4ba3701 100644--- a/backend/internal/services/job_service_test.go+++ b/backend/internal/services/job_service_test.go@@ -10,6 +10,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/getarcaneapp/arcane/types/v2/jobschedule"schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"+ "github.com/samber/mo""github.com/stretchr/testify/require")@@ -346,14 +347,14 @@ func newFakeJobSchedulerInternal(jobIDs ...string) *fakeJobSchedulerInternal {}}-func (s *fakeJobSchedulerInternal) GetJob(jobID string) (schedulertypes.Job, bool) {+func (s *fakeJobSchedulerInternal) GetJob(jobID string) mo.Option[schedulertypes.Job] {job, ok := s.jobs[jobID]- return job, ok+ return mo.TupleToOption(job, ok)}-func (s *fakeJobSchedulerInternal) GetJobRuntimeState(jobID string) (schedulertypes.JobRuntimeState, bool) {+func (s *fakeJobSchedulerInternal) GetJobRuntimeState(jobID string) mo.Option[schedulertypes.JobRuntimeState] {state, ok := s.runtimeStates[jobID]- return state, ok+ return mo.TupleToOption(state, ok)}func (s *fakeJobSchedulerInternal) RescheduleJob(ctx context.Context, job schedulertypes.Job) error {diff --git a/backend/internal/services/lifecycle_service.go b/backend/internal/services/lifecycle_service.goindex db8b77bd0..5b2abc421 100644--- a/backend/internal/services/lifecycle_service.go+++ b/backend/internal/services/lifecycle_service.go@@ -19,6 +19,7 @@ import (containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount""github.com/moby/moby/client"+ "github.com/samber/mo""gorm.io/gorm""github.com/getarcaneapp/arcane/backend/v2/internal/database"@@ -27,7 +28,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts""github.com/getarcaneapp/arcane/backend/v2/pkg/projects"- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"buildapi "go.getarcane.app/builds/api")@@ -192,7 +192,7 @@ func (s *LifecycleService) executePreDeployInternal(ctx context.Context, projectfunc (s *LifecycleService) resolveRunnerImageInternal(ctx context.Context, sync *models.GitOpsSync) string {if sync != nil {- runnerImage := strings.TrimSpace(utils.DerefString(sync.PreDeployRunnerImage))+ runnerImage := strings.TrimSpace(mo.PointerToOption(sync.PreDeployRunnerImage).OrEmpty())if runnerImage != "" {return runnerImage}@@ -416,7 +416,7 @@ func (s *LifecycleService) emitLifecycleEventInternal() {severity := models.EventSeveritySuccesstitle := "Pre-deploy lifecycle hook succeeded: " + project.Name- description := fmt.Sprintf("Script %s exited with code %d in %dms", utils.DerefString(sync.PreDeployScriptPath), exitCode, durationMs)+ description := fmt.Sprintf("Script %s exited with code %d in %dms", mo.PointerToOption(sync.PreDeployScriptPath).OrEmpty(), exitCode, durationMs)if status != lifecycleStatusSuccess {severity = models.EventSeverityWarningtitle = fmt.Sprintf("Pre-deploy lifecycle hook %s: %s", status, project.Name)@@ -426,7 +426,7 @@ func (s *LifecycleService) emitLifecycleEventInternal(}metadata := models.JSON{- "scriptPath": utils.DerefString(sync.PreDeployScriptPath),+ "scriptPath": mo.PointerToOption(sync.PreDeployScriptPath).OrEmpty(),"runnerImage": runnerImage,"exitCode": exitCode,"durationMs": durationMs,diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex cdd9a7f6b..08233b69d 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -24,6 +24,7 @@ import ("github.com/moby/moby/api/types/container"dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/client"+ "github.com/samber/mo""gorm.io/gorm""github.com/getarcaneapp/arcane/backend/v2/internal/common"@@ -307,20 +308,20 @@ func lookupProjectContainers(p models.Project, containersByProject map[string][]return nil}-func (s *ProjectService) getCachedComposeProjectIDInternal(normalizedName string) (string, bool) {+func (s *ProjectService) getCachedComposeProjectIDInternal(normalizedName string) mo.Option[string] {if normalizedName == "" {- return "", false+ return mo.None[string]()}s.composeNameCacheMu.RLock()defer s.composeNameCacheMu.RUnlock()if s.composeNameToProjID == nil {- return "", false+ return mo.None[string]()}projectID, ok := s.composeNameToProjID[normalizedName]- return projectID, ok+ return mo.TupleToOption(projectID, ok)}func (s *ProjectService) cacheComposeProjectIDInternal(normalizedName, projectID string) {@@ -349,7 +350,7 @@ func (s *ProjectService) invalidateCachedComposeProjectIDInternal(normalizedName}func (s *ProjectService) lookupProjectByCachedComposeNameInternal(ctx context.Context, normalizedName string) (*models.Project, bool, error) {- projectID, ok := s.getCachedComposeProjectIDInternal(normalizedName)+ projectID, ok := s.getCachedComposeProjectIDInternal(normalizedName).Get()if !ok {return nil, false, nil}@@ -1029,7 +1030,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.IsArchived = proj.IsArchivedresp.ArchivedAt = proj.ArchivedAtresp.HasBuildDirective = false- resp.DirName = utils.DerefString(proj.DirName)+ resp.DirName = mo.PointerToOption(proj.DirName).OrEmpty()resp.RelativePath = s.getProjectRelativePathInternal(projectsDir, proj.Path)resp.GitOpsManagedBy = proj.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, *proj)@@ -1608,7 +1609,7 @@ func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPa} else if serviceCountErr != nil {slog.WarnContext(ctx, "failed to refresh compose service count during project sync", "projectID", existing.ID, "path", dirPath, "error", serviceCountErr)}- if serviceCountErr == nil && !utils.StringPtrEqual(existing.ComposeProjectName, composeMetadata.composeProjectName) {+ if serviceCountErr == nil && mo.PointerToOption(existing.ComposeProjectName) != mo.PointerToOption(composeMetadata.composeProjectName) {updates["compose_project_name"] = composeMetadata.composeProjectName}if serviceCountErr == nil {@@ -1742,7 +1743,7 @@ func (s *ProjectService) cleanupDBProjectsInternal(ctx context.Context, seen mapcontinue}candidates++- if decision, remove := s.evaluateProjectCleanupInternal(ctx, p, followProjectSymlinks, projectsDir, maxDepth); remove {+ if decision, remove := s.evaluateProjectCleanupInternal(ctx, p, followProjectSymlinks, projectsDir, maxDepth).Get(); remove {pendingDeletions = append(pendingDeletions, decision)}}@@ -1812,9 +1813,9 @@ func isInternalScratchProjectInternal(p models.Project) bool {// the current filesystem pass should be pruned. It performs only read-only checks// (warning in place for the "keep" cases); the actual deletion is deferred to the// caller so the mass-wipe guard can veto an entire suspicious pass.-func (s *ProjectService) evaluateProjectCleanupInternal(ctx context.Context, p models.Project, followProjectSymlinks bool, projectsDir string, maxDepth int) (projectCleanupDecision, bool) {+func (s *ProjectService) evaluateProjectCleanupInternal(ctx context.Context, p models.Project, followProjectSymlinks bool, projectsDir string, maxDepth int) mo.Option[projectCleanupDecision] {if s.projectExceedsScanDepthInternal(p, projectsDir, maxDepth) {- return projectCleanupDecision{project: p, reason: "removed project: directory is beyond the configured scan depth"}, true+ return mo.Some(projectCleanupDecision{project: p, reason: "removed project: directory is beyond the configured scan depth"})}validDir, err := projects.IsProjectDirectoryPath(p.Path, followProjectSymlinks)@@ -1822,7 +1823,7 @@ func (s *ProjectService) evaluateProjectCleanupInternal(ctx context.Context, p mreturn s.evaluateProjectPathErrorInternal(ctx, p, err)}if !validDir {- return projectCleanupDecision{project: p, reason: "removed project: path is no longer a valid project directory"}, true+ return mo.Some(projectCleanupDecision{project: p, reason: "removed project: path is no longer a valid project directory"})}return s.evaluateProjectComposeFileInternal(ctx, p)@@ -1842,19 +1843,19 @@ func (s *ProjectService) projectExceedsScanDepthInternal(p models.Project, projereturn rel != "" && strings.Count(rel, "/")+1 > maxDepth}-func (s *ProjectService) evaluateProjectPathErrorInternal(ctx context.Context, p models.Project, err error) (projectCleanupDecision, bool) {+func (s *ProjectService) evaluateProjectPathErrorInternal(ctx context.Context, p models.Project, err error) mo.Option[projectCleanupDecision] {if os.IsNotExist(err) {- return projectCleanupDecision{project: p, reason: "removed project: directory no longer exists"}, true+ return mo.Some(projectCleanupDecision{project: p, reason: "removed project: directory no longer exists"})}slog.WarnContext(ctx, "stat error during cleanup; keeping DB record", "path", p.Path, "error", err)- return projectCleanupDecision{}, false+ return mo.None[projectCleanupDecision]()}-func (s *ProjectService) evaluateProjectComposeFileInternal(ctx context.Context, p models.Project) (projectCleanupDecision, bool) {+func (s *ProjectService) evaluateProjectComposeFileInternal(ctx context.Context, p models.Project) mo.Option[projectCleanupDecision] {_, err := s.resolveProjectComposeFileInternal(ctx, &p)if err == nil {- return projectCleanupDecision{}, false+ return mo.None[projectCleanupDecision]()}// The project directory still exists here (it passed the directory-validity@@ -1867,10 +1868,10 @@ func (s *ProjectService) evaluateProjectComposeFileInternal(ctx context.Context,if _, ok := errors.AsType[*common.ComposeFileNotFoundError](err); !ok {slog.WarnContext(ctx, "project directory present but compose file unresolved during cleanup; keeping DB record","projectID", p.ID, "path", p.Path, "error", err)- return projectCleanupDecision{}, false+ return mo.None[projectCleanupDecision]()}- return projectCleanupDecision{project: p, reason: "removed orphaned project: directory present but contains no compose file"}, true+ return mo.Some(projectCleanupDecision{project: p, reason: "removed orphaned project: directory present but contains no compose file"})}// deleteProjectDuringCleanupInternal removes a project record discovered to be@@ -4139,7 +4140,7 @@ func (s *ProjectService) ensureProjectPathUnderRoot(ctx context.Context, proj *m}// Attempt to repair using known directory name or sanitized project name- dirName := utils.DerefString(proj.DirName)+ dirName := mo.PointerToOption(proj.DirName).OrEmpty()if strings.TrimSpace(dirName) == "" {dirName = projects.SanitizeProjectName(proj.Name)}@@ -4722,7 +4723,7 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, pro_ = mapper.MapStruct(p, &results[i])results[i].CreatedAt = p.CreatedAt.Format(time.RFC3339)results[i].UpdatedAt = p.UpdatedAt.Format(time.RFC3339)- results[i].DirName = utils.DerefString(p.DirName)+ results[i].DirName = mo.PointerToOption(p.DirName).OrEmpty()results[i].RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)results[i].GitOpsManagedBy = p.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, p)@@ -4754,7 +4755,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringresp.UpdatedAt = p.UpdatedAt.Format(time.RFC3339)resp.IsArchived = p.IsArchivedresp.ArchivedAt = p.ArchivedAt- resp.DirName = utils.DerefString(p.DirName)+ resp.DirName = mo.PointerToOption(p.DirName).OrEmpty()resp.RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)resp.GitOpsManagedBy = p.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, p)@@ -4990,7 +4991,7 @@ func (s *ProjectService) refreshComposeProjectNameInternal(ctx context.Context,if shouldUpdateName && meta.resolvedProjectName != "" && proj.Name != meta.resolvedProjectName {updates["name"] = meta.resolvedProjectName}- if !utils.StringPtrEqual(proj.ComposeProjectName, meta.composeProjectName) {+ if mo.PointerToOption(proj.ComposeProjectName) != mo.PointerToOption(meta.composeProjectName) {updates["compose_project_name"] = meta.composeProjectName}if len(updates) == 0 {diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 9f5b34c21..d4a50f615 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -26,7 +26,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/projects"- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog""github.com/getarcaneapp/arcane/types/v2/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/v2/image"@@ -37,6 +36,7 @@ import (dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/api/types/volume""github.com/opencontainers/go-digest"+ "github.com/samber/mo""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"buildtypes "go.getarcane.app/builds/types"@@ -563,7 +563,7 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {require.NoError(t, err)assert.Equal(t, original.ID, found.ID)- cachedProjectID, cached := svc.getCachedComposeProjectIDInternal("myproject")+ cachedProjectID, cached := svc.getCachedComposeProjectIDInternal("myproject").Get()require.True(t, cached)assert.Equal(t, original.ID, cachedProjectID)@@ -580,7 +580,7 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {require.NoError(t, err)assert.Equal(t, replacement.ID, found.ID)- cachedProjectID, cached = svc.getCachedComposeProjectIDInternal("myproject")+ cachedProjectID, cached = svc.getCachedComposeProjectIDInternal("myproject").Get()require.True(t, cached)assert.Equal(t, replacement.ID, cachedProjectID)})@@ -600,7 +600,7 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {require.NoError(t, err)assert.Equal(t, original.ID, found.ID)- cachedProjectID, cached := svc.getCachedComposeProjectIDInternal("myapp")+ cachedProjectID, cached := svc.getCachedComposeProjectIDInternal("myapp").Get()require.True(t, cached)assert.Equal(t, original.ID, cachedProjectID)@@ -613,7 +613,7 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {require.Error(t, err)assert.Contains(t, err.Error(), "project not found")- _, cached = svc.getCachedComposeProjectIDInternal("myapp")+ _, cached = svc.getCachedComposeProjectIDInternal("myapp").Get()assert.False(t, cached)})}@@ -715,8 +715,8 @@ func TestProjectService_PullProjectImages_UpdatesCurrentImageRecordAfterPull(t *assert.False(t, currentRecord.HasUpdate)assert.Equal(t, repository, currentRecord.Repository)assert.Equal(t, "1.2.3", currentRecord.Tag)- assert.Equal(t, imageDigest, utils.DerefString(currentRecord.CurrentDigest))- assert.Equal(t, imageDigest, utils.DerefString(currentRecord.LatestDigest))+ assert.Equal(t, imageDigest, mo.PointerToOption(currentRecord.CurrentDigest).OrEmpty())+ assert.Equal(t, imageDigest, mo.PointerToOption(currentRecord.LatestDigest).OrEmpty())}func TestProjectService_EnsureImagesPresent_UpdatesCurrentImageRecordAfterPull(t *testing.T) {@@ -768,7 +768,7 @@ func TestProjectService_EnsureImagesPresent_UpdatesCurrentImageRecordAfterPull(tvar currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)assert.False(t, currentRecord.HasUpdate)- assert.Equal(t, imageDigest, utils.DerefString(currentRecord.LatestDigest))+ assert.Equal(t, imageDigest, mo.PointerToOption(currentRecord.LatestDigest).OrEmpty())}func TestProjectService_PullImageForService_UpdatesCurrentImageRecordAfterPull(t *testing.T) {@@ -817,7 +817,7 @@ func TestProjectService_PullImageForService_UpdatesCurrentImageRecordAfterPull(tvar currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)assert.False(t, currentRecord.HasUpdate)- assert.Equal(t, imageDigest, utils.DerefString(currentRecord.LatestDigest))+ assert.Equal(t, imageDigest, mo.PointerToOption(currentRecord.LatestDigest).OrEmpty())}func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccess(t *testing.T) {@@ -932,12 +932,12 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccvar privateCurrentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", privateImageID).First(&privateCurrentRecord).Error)assert.False(t, privateCurrentRecord.HasUpdate)- assert.Equal(t, privateImageDigest, utils.DerefString(privateCurrentRecord.LatestDigest))+ assert.Equal(t, privateImageDigest, mo.PointerToOption(privateCurrentRecord.LatestDigest).OrEmpty())var publicCurrentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", publicImageID).First(&publicCurrentRecord).Error)assert.False(t, publicCurrentRecord.HasUpdate)- assert.Equal(t, publicImageDigest, utils.DerefString(publicCurrentRecord.LatestDigest))+ assert.Equal(t, publicImageDigest, mo.PointerToOption(publicCurrentRecord.LatestDigest).OrEmpty())}func TestProjectService_ComposePullSelectedServicesInternal_LeavesRecordsWhenPullFails(t *testing.T) {diff --git a/backend/internal/services/role_service.go b/backend/internal/services/role_service.goindex 144d7162c..e0629c8e6 100644--- a/backend/internal/services/role_service.go+++ b/backend/internal/services/role_service.go@@ -17,10 +17,10 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"- pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"roletypes "github.com/getarcaneapp/arcane/types/v2/role"+ "github.com/samber/mo")// permissionCacheTTL bounds how long a resolved PermissionSet is reused@@ -605,7 +605,7 @@ func (s *RoleService) ResolvePermissions(ctx context.Context, user *models.User)if user == nil {return authz.NewPermissionSet(), nil}- if ps, ok := s.userCache.Get(user.ID); ok {+ if ps, ok := s.userCache.Get(user.ID).Get(); ok {return ps, nil}ps, err := s.resolveUserPermissionsInternal(ctx, s.db.WithContext(ctx), user.ID)@@ -663,7 +663,7 @@ func decodePermissionsJSONInternal(raw string) ([]string, error) {// ResolveApiKeyPermissions returns the PermissionSet for an API key. Caches// per-key. Falls back to an empty set (deny-all) if the key has no perms.func (s *RoleService) ResolveApiKeyPermissions(ctx context.Context, apiKeyID string) (*authz.PermissionSet, error) {- if ps, ok := s.apiKeyCache.Get(apiKeyID); ok {+ if ps, ok := s.apiKeyCache.Get(apiKeyID).Get(); ok {return ps, nil}var perms []models.ApiKeyPermission@@ -992,7 +992,7 @@ func (s *RoleService) ValidateRoleAssignmentAgainstCaller(ctx context.Context, cif err := validatePermissionsInternal(desired); err != nil {return err}- return validatePermissionSetAgainstCallerInternal(caller, desired, pkgutils.DerefString(environmentID))+ return validatePermissionSetAgainstCallerInternal(caller, desired, mo.PointerToOption(environmentID).OrEmpty())}func validatePermissionSetAgainstCallerInternal(caller *authz.PermissionSet, desired []string, environmentID string) error {diff --git a/backend/internal/services/session_service.go b/backend/internal/services/session_service.goindex fbabeac1b..27b948d9a 100644--- a/backend/internal/services/session_service.go+++ b/backend/internal/services/session_service.go@@ -12,10 +12,10 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/models"- pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil""github.com/getarcaneapp/arcane/types/v2/auth""github.com/google/uuid"+ "github.com/samber/mo""gorm.io/gorm")@@ -35,8 +35,8 @@ func (s *SessionService) CreateSession(ctx context.Context, userID string, expirsession := &models.UserSession{UserID: userID,RefreshTokenHash: refreshHash,- UserAgent: pkgutils.StringPtrFromTrimmed(meta.UserAgent),- IPAddress: pkgutils.StringPtrFromTrimmed(meta.IPAddress),+ UserAgent: mo.EmptyableToOption(strings.TrimSpace(meta.UserAgent)).ToPointer(),+ IPAddress: mo.EmptyableToOption(strings.TrimSpace(meta.IPAddress)).ToPointer(),Source: models.UserSessionSourceLocal,LastUsedAt: now,ExpiresAt: expiresAt,@@ -57,7 +57,7 @@ func (s *SessionService) CreateFederatedSession(ctx context.Context, userID striUserID: userID,RefreshTokenHash: refreshHash,Source: models.UserSessionSourceFederated,- FederatedCredentialID: pkgutils.StringPtrFromTrimmed(credentialID),+ FederatedCredentialID: mo.EmptyableToOption(strings.TrimSpace(credentialID)).ToPointer(),LastUsedAt: now,ExpiresAt: expiresAt,}@@ -114,8 +114,8 @@ func (s *SessionService) RotateRefreshToken(ctx context.Context, sessionID strin"refresh_token_hash": newHash,"last_used_at": now,"updated_at": now,- "user_agent": pkgutils.StringPtrFromTrimmed(meta.UserAgent),- "ip_address": pkgutils.StringPtrFromTrimmed(meta.IPAddress),+ "user_agent": mo.EmptyableToOption(strings.TrimSpace(meta.UserAgent)).ToPointer(),+ "ip_address": mo.EmptyableToOption(strings.TrimSpace(meta.IPAddress)).ToPointer(),}result := tx.Model(&models.UserSession{}).Where("id = ? AND refresh_token_hash = ? AND revoked_at IS NULL", session.ID, session.RefreshTokenHash).@@ -136,8 +136,8 @@ func (s *SessionService) RotateRefreshToken(ctx context.Context, sessionID strinrotated.RefreshTokenHash = newHashrotated.LastUsedAt = nowrotated.UpdatedAt = &now- rotated.UserAgent = pkgutils.StringPtrFromTrimmed(meta.UserAgent)- rotated.IPAddress = pkgutils.StringPtrFromTrimmed(meta.IPAddress)+ rotated.UserAgent = mo.EmptyableToOption(strings.TrimSpace(meta.UserAgent)).ToPointer()+ rotated.IPAddress = mo.EmptyableToOption(strings.TrimSpace(meta.IPAddress)).ToPointer()return &rotated, newRefreshJTI, nil}diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex b8c9df693..186656d3b 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -17,6 +17,7 @@ import ("time""github.com/google/uuid"+ "github.com/samber/mo""gorm.io/gorm""github.com/getarcaneapp/arcane/backend/v2/internal/config"@@ -804,39 +805,30 @@ func (s *SettingsService) setupInstanceID(ctx context.Context) error {return nil}-func (s *SettingsService) GetBoolSetting(ctx context.Context, key string, defaultValue bool) bool {+func settingValueInternal[T any](ctx context.Context, s *SettingsService, key string, parse func(string) (T, error)) mo.Option[T] {cfg := s.getEffectiveSettingsConfigInternal(ctx)- val, _, _, err := cfg.FieldByKey(key)- if err != nil || val == "" {- return defaultValue+ value, _, _, err := cfg.FieldByKey(key)+ if err != nil || value == "" {+ return mo.None[T]()}- b, err := strconv.ParseBool(val)++ parsed, err := parse(value)if err != nil {- return defaultValue+ return mo.None[T]()}- return b+ return mo.Some(parsed)+}++func (s *SettingsService) GetBoolSetting(ctx context.Context, key string, defaultValue bool) bool {+ return settingValueInternal(ctx, s, key, strconv.ParseBool).OrElse(defaultValue)}func (s *SettingsService) GetIntSetting(ctx context.Context, key string, defaultValue int) int {- cfg := s.getEffectiveSettingsConfigInternal(ctx)- val, _, _, err := cfg.FieldByKey(key)- if err != nil || val == "" {- return defaultValue- }- i, err := strconv.Atoi(val)- if err != nil {- return defaultValue- }- return i+ return settingValueInternal(ctx, s, key, strconv.Atoi).OrElse(defaultValue)}func (s *SettingsService) GetStringSetting(ctx context.Context, key, defaultValue string) string {- cfg := s.getEffectiveSettingsConfigInternal(ctx)- val, _, _, err := cfg.FieldByKey(key)- if err != nil || val == "" {- return defaultValue- }- return val+ return settingValueInternal(ctx, s, key, func(value string) (string, error) { return value, nil }).OrElse(defaultValue)}func (s *SettingsService) SetBoolSetting(ctx context.Context, key string, value bool) error {diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.goindex 27d78fb51..4077df7c8 100644--- a/backend/internal/services/swarm_service.go+++ b/backend/internal/services/swarm_service.go@@ -822,11 +822,11 @@ func (s *SwarmService) resolveSwarmNodeAgentRuntimeInternal(ctx context.Context,connected: edge.HasActiveTunnel(env.ID),}- if tunnelState, ok := edge.GetTunnelRuntimeState(env.ID); ok {+ if tunnelState, ok := edge.GetTunnelRuntimeState(env.ID).Get(); ok {runtime.lastHeartbeat = tunnelState.LastHeartbeat}- if pollState, ok := edge.GetPollRuntimeRegistry().Get(env.ID, time.Now()); ok {+ if pollState, ok := edge.GetPollRuntimeRegistry().Get(env.ID, time.Now()).Get(); ok {runtime.lastPollAt = pollState.LastPollAt}diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex 1a8f214f0..d08fb17cf 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -16,6 +16,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/system""github.com/moby/moby/api/types/container""github.com/moby/moby/client"+ "github.com/samber/mo""go.getarcane.app/updater/pkg/labels""golang.org/x/sync/errgroup")@@ -69,9 +70,10 @@ func (s *SystemService) PruneAll(ctx context.Context, environmentID string, req"build_cache", req.BuildCache,)- activityID, started := s.beginSystemPruneInternal(ctx, environmentID, req)- result := &system.PruneAllResult{Success: true, ActivityID: utils.StringPtrFromTrimmed(activityID)}- if !started {+ prune := s.beginSystemPruneInternal(ctx, environmentID, req)+ activityID := prune.activityID+ result := &system.PruneAllResult{Success: true, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}+ if prune.started.IsAbsent() {slog.InfoContext(ctx, "System prune already running", "environmentId", environmentID, "activityId", activityID)return result, false, nil}@@ -85,10 +87,11 @@ func (s *SystemService) PruneAll(ctx context.Context, environmentID string, req}func (s *SystemService) StartPruneAll(ctx context.Context, environmentID string, req system.PruneAllRequest) *system.PruneAllResult {- activityID, started := s.beginSystemPruneInternal(ctx, environmentID, req)- if !started {+ prune := s.beginSystemPruneInternal(ctx, environmentID, req)+ activityID := prune.activityID+ if prune.started.IsAbsent() {slog.InfoContext(ctx, "System prune already running", "environmentId", environmentID, "activityId", activityID)- return &system.PruneAllResult{Success: true, ActivityID: utils.StringPtrFromTrimmed(activityID)}+ return &system.PruneAllResult{Success: true, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}}backgroundCtx := utils.ActivityRuntimeContext(ctx, nil)@@ -97,24 +100,29 @@ func (s *SystemService) StartPruneAll(ctx context.Context, environmentID string,go func() {defer s.finishSystemPruneInternal(environmentID)- result := &system.PruneAllResult{Success: true, ActivityID: utils.StringPtrFromTrimmed(activityID)}+ result := &system.PruneAllResult{Success: true, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}s.runSystemPruneInternal(backgroundCtx, req, activityID, result)}()- return &system.PruneAllResult{Success: true, ActivityID: utils.StringPtrFromTrimmed(activityID)}+ return &system.PruneAllResult{Success: true, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}}-func (s *SystemService) beginSystemPruneInternal(ctx context.Context, environmentID string, req system.PruneAllRequest) (string, bool) {+type systemPruneBeginResult struct {+ activityID string+ started mo.Option[struct{}]+}++func (s *SystemService) beginSystemPruneInternal(ctx context.Context, environmentID string, req system.PruneAllRequest) systemPruneBeginResult {s.pruneMu.Lock()defer s.pruneMu.Unlock()if activityID, ok := s.runningPrunes[environmentID]; ok {- return activityID, false+ return systemPruneBeginResult{activityID: activityID, started: mo.None[struct{}]()}}activityID := s.startSystemPruneActivityInternal(ctx, environmentID, req)s.runningPrunes[environmentID] = activityID- return activityID, true+ return systemPruneBeginResult{activityID: activityID, started: mo.Some(struct{}{})}}func (s *SystemService) finishSystemPruneInternal(environmentID string) {@@ -369,7 +377,7 @@ func (s *SystemService) startMatchingContainersInternal(ctx context.Context, envresult := &containertypes.ActionResult{Success: false,Errors: []string{fmt.Sprintf("Failed to list containers: %v", err)},- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}s.completeSystemContainerActivityInternal(ctx, activityID, opts.FailureMessage, result)return result, err@@ -378,7 +386,7 @@ func (s *SystemService) startMatchingContainersInternal(ctx context.Context, envresult := s.performBatchContainerAction(ctx, containers, "start", opts.ShouldStart, func(ctx context.Context, id string) error {return s.containerService.StartContainer(ctx, id, systemUser)})- result.ActivityID = utils.StringPtrFromTrimmed(activityID)+ result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.completeSystemContainerActivityInternal(ctx, activityID, opts.SuccessMessage, result)return result, nil}@@ -390,7 +398,7 @@ func (s *SystemService) StopAllContainers(ctx context.Context, environmentID strresult := &containertypes.ActionResult{Success: false,Errors: []string{fmt.Sprintf("Failed to list containers: %v", err)},- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}s.completeSystemContainerActivityInternal(ctx, activityID, "Stopping all containers failed", result)return result, err@@ -404,7 +412,7 @@ func (s *SystemService) StopAllContainers(ctx context.Context, environmentID strfunc(ctx context.Context, id string) error {return s.containerService.StopContainer(ctx, id, systemUser)})- result.ActivityID = utils.StringPtrFromTrimmed(activityID)+ result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.completeSystemContainerActivityInternal(ctx, activityID, "Stopped all containers", result)return result, nil}diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.goindex 67ad0ea16..a3888a3f0 100644--- a/backend/internal/services/template_service.go+++ b/backend/internal/services/template_service.go@@ -28,6 +28,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/env"tmpl "github.com/getarcaneapp/arcane/types/v2/template""github.com/google/uuid"+ "github.com/samber/mo""golang.org/x/sync/errgroup""gorm.io/gorm")@@ -317,7 +318,7 @@ func (s *TemplateService) CreateTemplate(ctx context.Context, template *models.C}template.IsCustom = truetemplate.IsRemote = false- setTemplateIconURL(template, s.resolveTemplateIconURL(ctx, template.Content, utils.DerefString(template.EnvContent)))+ setTemplateIconURL(template, s.resolveTemplateIconURL(ctx, template.Content, mo.PointerToOption(template.EnvContent).OrEmpty()))return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {if err := tx.Create(template).Error; err != nil {return fmt.Errorf("failed to create template: %w", err)@@ -344,7 +345,7 @@ func (s *TemplateService) UpdateTemplate(ctx context.Context, id string, updatesexisting.Description = updates.Descriptionexisting.Content = updates.Contentexisting.EnvContent = updates.EnvContent- setTemplateIconURL(&existing, s.resolveTemplateIconURL(ctx, existing.Content, utils.DerefString(existing.EnvContent)))+ setTemplateIconURL(&existing, s.resolveTemplateIconURL(ctx, existing.Content, mo.PointerToOption(existing.EnvContent).OrEmpty()))if err := tx.Save(&existing).Error; err != nil {return fmt.Errorf("failed to update template: %w", err)@@ -604,7 +605,7 @@ func (s *TemplateService) loadRemoteTemplates(ctx context.Context) ([]models.Comdefer mu.Unlock()for _, template := range remoteTemplates {template.Registry = cloneRegistry(®)- template.RegistryID = utils.StringPtrFromTrimmed(reg.ID)+ template.RegistryID = mo.EmptyableToOption(strings.TrimSpace(reg.ID)).ToPointer()templates = append(templates, template)}return nil@@ -729,15 +730,15 @@ func (s *TemplateService) convertRemoteToLocal(remote tmpl.RemoteTemplate, regisEnvContent: nil,IsCustom: false,IsRemote: true,- RegistryID: utils.StringPtrFromTrimmed(registry.ID),+ RegistryID: mo.EmptyableToOption(strings.TrimSpace(registry.ID)).ToPointer(),Registry: cloneRegistry(registry),Metadata: &models.ComposeTemplateMetadata{- Version: utils.StringPtrFromTrimmed(remote.Version),- Author: utils.StringPtrFromTrimmed(remote.Author),+ Version: mo.EmptyableToOption(strings.TrimSpace(remote.Version)).ToPointer(),+ Author: mo.EmptyableToOption(strings.TrimSpace(remote.Author)).ToPointer(),Tags: remote.Tags,- RemoteURL: utils.StringPtrFromTrimmed(remote.ComposeURL),- EnvURL: utils.StringPtrFromTrimmed(remote.EnvURL),- DocumentationURL: utils.StringPtrFromTrimmed(remote.DocumentationURL),+ RemoteURL: mo.EmptyableToOption(strings.TrimSpace(remote.ComposeURL)).ToPointer(),+ EnvURL: mo.EmptyableToOption(strings.TrimSpace(remote.EnvURL)).ToPointer(),+ DocumentationURL: mo.EmptyableToOption(strings.TrimSpace(remote.DocumentationURL)).ToPointer(),},}}@@ -949,13 +950,13 @@ func cloneTemplateMetadata(meta *models.ComposeTemplateMetadata) *models.Composereturn nil}return &models.ComposeTemplateMetadata{- Version: utils.StringPtrFromTrimmed(utils.DerefString(meta.Version)),- Author: utils.StringPtrFromTrimmed(utils.DerefString(meta.Author)),+ Version: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.Version).OrEmpty())).ToPointer(),+ Author: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.Author).OrEmpty())).ToPointer(),Tags: append([]string(nil), meta.Tags...),- RemoteURL: utils.StringPtrFromTrimmed(utils.DerefString(meta.RemoteURL)),- EnvURL: utils.StringPtrFromTrimmed(utils.DerefString(meta.EnvURL)),- DocumentationURL: utils.StringPtrFromTrimmed(utils.DerefString(meta.DocumentationURL)),- IconURL: utils.StringPtrFromTrimmed(utils.DerefString(meta.IconURL)),+ RemoteURL: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.RemoteURL).OrEmpty())).ToPointer(),+ EnvURL: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.EnvURL).OrEmpty())).ToPointer(),+ DocumentationURL: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.DocumentationURL).OrEmpty())).ToPointer(),+ IconURL: mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(meta.IconURL).OrEmpty())).ToPointer(),}}@@ -967,7 +968,7 @@ func cloneRemoteTemplates(items []models.ComposeTemplate) []models.ComposeTemplacloned := make([]models.ComposeTemplate, len(items))for i := range items {cloned[i] = items[i]- cloned[i].RegistryID = utils.StringPtrFromTrimmed(utils.DerefString(items[i].RegistryID))+ cloned[i].RegistryID = mo.EmptyableToOption(strings.TrimSpace(mo.PointerToOption(items[i].RegistryID).OrEmpty())).ToPointer()cloned[i].Registry = cloneRegistry(items[i].Registry)cloned[i].Metadata = cloneTemplateMetadata(items[i].Metadata)}@@ -997,7 +998,7 @@ func (s *TemplateService) SyncLocalTemplatesFromFilesystem(ctx context.Context)}func (s *TemplateService) upsertFilesystemTemplate(ctx context.Context, name, desc, compose string, envPtr *string) error {- iconURL := s.resolveTemplateIconURL(ctx, compose, utils.DerefString(envPtr))+ iconURL := s.resolveTemplateIconURL(ctx, compose, mo.PointerToOption(envPtr).OrEmpty())return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {var existing models.ComposeTemplate@@ -1186,7 +1187,7 @@ func (s *TemplateService) resolveTemplateIconURL(ctx context.Context, composeConreturn nil}- arcaneBlockMap, ok := utils.AsStringMap(arcaneBlock)+ arcaneBlockMap, ok := utils.AsStringMap(arcaneBlock).Get()if !ok {return nil}@@ -1196,7 +1197,7 @@ func (s *TemplateService) resolveTemplateIconURL(ctx context.Context, composeConutils.FirstNonEmpty(utils.Collect(arcaneBlockMap[templateArcaneIconsAliasKey], utils.ToString)...),)- return utils.StringPtrFromTrimmed(icon)+ return mo.EmptyableToOption(strings.TrimSpace(icon)).ToPointer()}func setTemplateIconURL(template *models.ComposeTemplate, iconURL *string) {diff --git a/backend/internal/services/template_service_test.go b/backend/internal/services/template_service_test.goindex f416c1305..6afe40012 100644--- a/backend/internal/services/template_service_test.go+++ b/backend/internal/services/template_service_test.go@@ -9,11 +9,13 @@ import ("net/url""os""path/filepath"+ "strings""sync/atomic""testing""time"sqlite "github.com/libtnb/sqlite"+ "github.com/samber/mo""github.com/stretchr/testify/require""gorm.io/gorm"@@ -21,7 +23,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"tmpl "github.com/getarcaneapp/arcane/types/v2/template")@@ -274,11 +275,11 @@ services:Description: "Remote template",IsRemote: true,IsCustom: false,- RegistryID: utils.StringPtrFromTrimmed("reg-1"),+ RegistryID: mo.EmptyableToOption(strings.TrimSpace("reg-1")).ToPointer(),Metadata: &models.ComposeTemplateMetadata{- RemoteURL: utils.StringPtrFromTrimmed(baseURL + "/compose.yaml"),- EnvURL: utils.StringPtrFromTrimmed(baseURL + "/template.env"),- IconURL: utils.StringPtrFromTrimmed("https://cdn.example/download.png"),+ RemoteURL: mo.EmptyableToOption(strings.TrimSpace(baseURL + "/compose.yaml")).ToPointer(),+ EnvURL: mo.EmptyableToOption(strings.TrimSpace(baseURL + "/template.env")).ToPointer(),+ IconURL: mo.EmptyableToOption(strings.TrimSpace("https://cdn.example/download.png")).ToPointer(),},}@@ -335,7 +336,7 @@ func TestGetAllTemplatesPaginated_FiltersByType(t *testing.T) {Description: "Remote template",Content: "services: {}",IsRemote: true,- RegistryID: utils.StringPtrFromTrimmed("registry-one"),+ RegistryID: mo.EmptyableToOption(strings.TrimSpace("registry-one")).ToPointer(),},},lastFetch: now,diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 282805536..8d26f5705 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -14,6 +14,7 @@ import ("github.com/compose-spec/compose-go/v2/loader""github.com/moby/moby/api/types/container""github.com/moby/moby/client"+ "github.com/samber/mo""github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/database"@@ -148,7 +149,7 @@ func (s *UpdaterService) registryDigestResolverInternal() updaterdigest.RemoteRefunc (s *UpdaterService) ApplyPending(ctx context.Context, options updater.Options) (out *updater.Result, err error) {start := time.Now()activityID := s.startAutoUpdateActivityInternal(ctx, options.DryRun)- out = &updater.Result{Items: []updater.ResourceResult{}, ActivityID: utils.StringPtrFromTrimmed(activityID)}+ out = &updater.Result{Items: []updater.ResourceResult{}, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}ctx = s.trackActivityInternal(ctx, activityID)ctx = contextWithActivityIDInternal(ctx, activityID)activitylib.AwaitHandlerActivitySlot(ctx, s.deps.Activity, activityID, "0")@@ -160,7 +161,7 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, options updater.Optioif out.Duration == "" {out.Duration = time.Since(start).String()}- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.completeAutoUpdateActivityInternal(ctx, activityID, out, err)}()@@ -182,7 +183,7 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, options updater.OptiomoduleResult, engineErr := s.engineInternal().ApplyPending(ctx, moduleOptionsFromUpdaterOptionsInternal(options))if moduleResult != nil {out = resultFromModuleInternal(moduleResult)- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.logResultItemsInternal(ctx, out)}if engineErr != nil {@@ -363,7 +364,7 @@ func (s *UpdaterService) containerIDsForImagesInternal(ctx context.Context, imagfunc (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerID string) (out *updater.Result, err error) {start := time.Now()activityID := s.startSingleContainerUpdateActivityInternal(ctx, containerID)- out = &updater.Result{Items: []updater.ResourceResult{}, ActivityID: utils.StringPtrFromTrimmed(activityID)}+ out = &updater.Result{Items: []updater.ResourceResult{}, ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()}ctx = s.trackActivityInternal(ctx, activityID)ctx = contextWithActivityIDInternal(ctx, activityID)activitylib.AwaitHandlerActivitySlot(ctx, s.deps.Activity, activityID, "0")@@ -375,14 +376,14 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerIDif out.Duration == "" {out.Duration = time.Since(start).String()}- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.completeAutoUpdateActivityInternal(ctx, activityID, out, err)}()moduleResult, engineErr := s.engineInternal().UpdateContainer(ctx, containerID, moduletypes.Options{})if moduleResult != nil {out = resultFromModuleInternal(moduleResult)- out.ActivityID = utils.StringPtrFromTrimmed(activityID)+ out.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.logResultItemsInternal(ctx, out)}if engineErr != nil {@@ -448,9 +449,9 @@ func (s *UpdaterService) recordAutoUpdateEventInternal(ctx context.Context, seveType: models.EventTypeSystemAutoUpdate,Severity: severity,Title: autoUpdateEventTitleInternal(phase, metadata),- ResourceType: utils.StringPtrFromTrimmed("system"),- ResourceName: utils.StringPtrFromTrimmed("auto_updater"),- EnvironmentID: utils.StringPtrFromTrimmed("0"),+ ResourceType: mo.EmptyableToOption(strings.TrimSpace("system")).ToPointer(),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace("auto_updater")).ToPointer(),+ EnvironmentID: mo.EmptyableToOption(strings.TrimSpace("0")).ToPointer(),Metadata: metadata,})if err != nil {@@ -688,7 +689,7 @@ func (s *UpdaterService) RecordEvent(ctx context.Context, event moduletypes.Evenreturn nil}- eventType, ok := containerEventTypeInternal(event.Phase)+ eventType, ok := containerEventTypeInternal(event.Phase).Get()if ok {if s.deps.Events == nil {return nil@@ -719,20 +720,20 @@ func (s *UpdaterService) RecordEvent(ctx context.Context, event moduletypes.Evenreturn nil}-func containerEventTypeInternal(phase string) (models.EventType, bool) {+func containerEventTypeInternal(phase string) mo.Option[models.EventType] {switch phase {case "container_stop":- return models.EventTypeContainerStop, true+ return mo.Some(models.EventTypeContainerStop)case "container_delete":- return models.EventTypeContainerDelete, true+ return mo.Some(models.EventTypeContainerDelete)case "container_create":- return models.EventTypeContainerCreate, true+ return mo.Some(models.EventTypeContainerCreate)case "container_start":- return models.EventTypeContainerStart, true+ return mo.Some(models.EventTypeContainerStart)case "container_update":- return models.EventTypeContainerUpdate, true+ return mo.Some(models.EventTypeContainerUpdate)default:- return "", false+ return mo.None[models.EventType]()}}@@ -762,8 +763,8 @@ func (s *UpdaterService) startAutoUpdateActivityInternal(ctx context.Context, drEnvironmentID: "0",Type: models.ActivityTypeAutoUpdate,Queue: true,- ResourceType: utils.StringPtrFromTrimmed("system"),- ResourceName: utils.StringPtrFromTrimmed("Auto update"),+ ResourceType: mo.EmptyableToOption(strings.TrimSpace("system")).ToPointer(),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace("Auto update")).ToPointer(),Step: "Planning updates",LatestMessage: "Auto-update run started",Metadata: models.JSON{"dryRun": dryRun},@@ -783,9 +784,9 @@ func (s *UpdaterService) startSingleContainerUpdateActivityInternal(ctx context.EnvironmentID: "0",Type: models.ActivityTypeAutoUpdate,Queue: true,- ResourceType: utils.StringPtrFromTrimmed("container"),+ ResourceType: mo.EmptyableToOption(strings.TrimSpace("container")).ToPointer(),ResourceID: &containerID,- ResourceName: utils.StringPtrFromTrimmed(containerID),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace(containerID)).ToPointer(),Step: "Updating container",LatestMessage: "Container update started",Metadata: models.JSON{"containerID": containerID},diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.goindex 9cbb41794..15b10132a 100644--- a/backend/internal/services/version_service.go+++ b/backend/internal/services/version_service.go@@ -13,12 +13,12 @@ import (ref "github.com/distribution/reference"containertypes "github.com/moby/moby/api/types/container""github.com/moby/moby/client"+ "github.com/samber/mo""golang.org/x/mod/semver""github.com/getarcaneapp/arcane/backend/v2/buildables""github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache""github.com/getarcaneapp/arcane/types/v2/version""go.getarcane.app/sys/cgroup"@@ -293,7 +293,7 @@ func (s *VersionService) storedOrDigestBasedUpdateInternal(ctx context.Context,if err != nil {slog.WarnContext(ctx, "Failed to read stored Arcane image update state", "imageID", currentImageID, "error", err)} else if found {- return record.HasUpdate, utils.DerefString(record.LatestDigest)+ return record.HasUpdate, mo.PointerToOption(record.LatestDigest).OrEmpty()}}diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.goindex f743ffb0b..427119625 100644--- a/backend/internal/services/volume_service.go+++ b/backend/internal/services/volume_service.go@@ -32,6 +32,7 @@ import ("github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/volume""github.com/moby/moby/client"+ "github.com/samber/mo")type VolumeService struct {@@ -109,7 +110,7 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*volusettings := s.settingsService.GetSettingsConfig()usageCtx, usageCancel := timeouts.WithTimeout(ctx, settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)defer usageCancel()- if usageVolumes, ok := docker.GetVolumeUsageDataStaleWhileRevalidate(usageCtx, dockerClient); ok {+ if usageVolumes, ok := docker.GetVolumeUsageDataStaleWhileRevalidate(usageCtx, dockerClient).Get(); ok {for _, uv := range usageVolumes {if uv.Name == vol.Name && uv.UsageData != nil {vol.UsageData = uv.UsageData@@ -474,7 +475,7 @@ func getVolumeHelperImageInternal(ctx context.Context, dockerService *DockerClieslog.WarnContext(ctx, "volume service: image service unavailable, attempting arcane fallback")}- if fallback, ok := volumehelper.ResolveArcaneRuntimeImage(ctx, dockerClient); ok {+ if fallback, ok := volumehelper.ResolveArcaneRuntimeImage(ctx, dockerClient).Get(); ok {slog.InfoContext(ctx, "volume service: helper image strategy selected", "strategy", "arcane-fallback", "source", fallback.Source, "image", fallback.Image)return fallback.Image, nil}@@ -482,10 +483,10 @@ func getVolumeHelperImageInternal(ctx context.Context, dockerService *DockerCliereturn "", fmt.Errorf("failed to resolve helper image: tools image unavailable and arcane fallback not found (pull error: %w)", pullErr)}-func resolveBackupStorageMountFromMountsInternal(mounts []container.MountPoint, target string, readOnly bool) (backupStorageMountInternal, bool) {+func resolveBackupStorageMountFromMountsInternal(mounts []container.MountPoint, target string, readOnly bool) mo.Option[backupStorageMountInternal] {mirroredMount := docker.MountForDestination(mounts, "/backups", target)if mirroredMount == nil {- return backupStorageMountInternal{}, false+ return mo.None[backupStorageMountInternal]()}// MountForDestination only returns non-nil for bind and named volume mounts.@@ -494,10 +495,10 @@ func resolveBackupStorageMountFromMountsInternal(mounts []container.MountPoint,}mirroredMount.ReadOnly = readOnly- return backupStorageMountInternal{+ return mo.Some(backupStorageMountInternal{mode: backupStorageModeArcaneMount,mount: *mirroredMount,- }, true+ })}func (s *VolumeService) resolveBackupStorageMountInternal(ctx context.Context, dockerClient *client.Client, target string, readOnly bool) backupStorageMountInternal {@@ -507,7 +508,7 @@ func (s *VolumeService) resolveBackupStorageMountInternal(ctx context.Context, dinspect, err := libarcane.ContainerInspectWithCompatibility(ctx, dockerClient, containerID, client.ContainerInspectOptions{})if err != nil {slog.WarnContext(ctx, "volume service: failed to inspect arcane container for backup mount resolution, falling back to named volume", "container_id", containerID, "error", err.Error())- } else if resolved, ok := resolveBackupStorageMountFromMountsInternal(inspect.Container.Mounts, target, readOnly); ok {+ } else if resolved, ok := resolveBackupStorageMountFromMountsInternal(inspect.Container.Mounts, target, readOnly).Get(); ok {return resolved}}@@ -543,7 +544,7 @@ func backupMountWarningForStorageInternal(storage backupStorageMountInternal) st}func backupMountWarningFromArcaneMountsInternal(mounts []container.MountPoint) string {- backupStorage, ok := resolveBackupStorageMountFromMountsInternal(mounts, "/backups", true)+ backupStorage, ok := resolveBackupStorageMountFromMountsInternal(mounts, "/backups", true).Get()if ok {return backupMountWarningForStorageInternal(backupStorage)}@@ -717,7 +718,7 @@ func (s *VolumeService) createTempContainerInternal(ctx context.Context, volumeN}if readOnly {- if containerID, ok := s.getReusableReadOnlyContainerInternal(ctx, dockerClient, volumeName); ok {+ if containerID, ok := s.getReusableReadOnlyContainerInternal(ctx, dockerClient, volumeName).Get(); ok {return containerID, func() {}, nil}}@@ -770,12 +771,12 @@ func (s *VolumeService) createTempContainerInternal(ctx context.Context, volumeNreturn resp.ID, cleanup, nil}-func (s *VolumeService) getReusableReadOnlyContainerInternal(ctx context.Context, dockerClient *client.Client, volumeName string) (string, bool) {+func (s *VolumeService) getReusableReadOnlyContainerInternal(ctx context.Context, dockerClient *client.Client, volumeName string) mo.Option[string] {s.helperMu.Lock()helper := s.helperByVolume[volumeName]s.helperMu.Unlock()if helper == nil || helper.id == "" {- return "", false+ return mo.None[string]()}inspect, err := libarcane.ContainerInspectWithCompatibility(ctx, dockerClient, helper.id, client.ContainerInspectOptions{})@@ -783,12 +784,12 @@ func (s *VolumeService) getReusableReadOnlyContainerInternal(ctx context.Contexts.helperMu.Lock()delete(s.helperByVolume, volumeName)s.helperMu.Unlock()- return "", false+ return mo.None[string]()}s.touchHelperInternal(volumeName)- return helper.id, true+ return mo.Some(helper.id)}// touchHelperInternal records that the helper for volumeName just serviced a@@ -2088,8 +2089,8 @@ func (s *VolumeService) compareVolumeSizesInternal(a, b volumetypes.Volume) int}func (s *VolumeService) compareVolumeCreatedInternal(a, b volumetypes.Volume) int {- aTime, aOk := s.parseVolumeCreatedAtInternal(a.CreatedAt)- bTime, bOk := s.parseVolumeCreatedAtInternal(b.CreatedAt)+ aTime, aOk := s.parseVolumeCreatedAtInternal(a.CreatedAt).Get()+ bTime, bOk := s.parseVolumeCreatedAtInternal(b.CreatedAt).Get()if aOk && bOk {if aTime.Before(bTime) {return -1@@ -2102,17 +2103,17 @@ func (s *VolumeService) compareVolumeCreatedInternal(a, b volumetypes.Volume) inreturn strings.Compare(a.CreatedAt, b.CreatedAt)}-func (s *VolumeService) parseVolumeCreatedAtInternal(createdAt string) (time.Time, bool) {+func (s *VolumeService) parseVolumeCreatedAtInternal(createdAt string) mo.Option[time.Time] {if createdAt == "" {- return time.Time{}, false+ return mo.None[time.Time]()}if parsed, err := time.Parse(time.RFC3339Nano, createdAt); err == nil {- return parsed, true+ return mo.Some(parsed)}if parsed, err := time.Parse(time.RFC3339, createdAt); err == nil {- return parsed, true+ return mo.Some(parsed)}- return time.Time{}, false+ return mo.None[time.Time]()}func (s *VolumeService) buildVolumeFilterAccessorsInternal() []pagination.FilterAccessor[volumetypes.Volume] {@@ -2209,7 +2210,7 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat// background so this list request never waits for Docker's DiskUsage call.var usageVolumes []volume.Volumeif params.Sort == "size" {- if uv, found := docker.GetVolumeUsageDataStaleWhileRevalidate(apiCtx, dockerClient); found && (len(uv) > 0 || len(volResult.volumes) == 0) {+ if uv, found := docker.GetVolumeUsageDataStaleWhileRevalidate(apiCtx, dockerClient).Get(); found && (len(uv) > 0 || len(volResult.volumes) == 0) {usageVolumes = uvusageCacheSnapshot = "available"} else {diff --git a/backend/internal/services/volume_service_test.go b/backend/internal/services/volume_service_test.goindex 6b717d4a8..7b29c0687 100644--- a/backend/internal/services/volume_service_test.go+++ b/backend/internal/services/volume_service_test.go@@ -276,7 +276,7 @@ func TestResolveBackupStorageMountFromMountsInternal(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- got, ok := resolveBackupStorageMountFromMountsInternal(tt.mounts, tt.target, tt.readOnly)+ got, ok := resolveBackupStorageMountFromMountsInternal(tt.mounts, tt.target, tt.readOnly).Get()require.Equal(t, tt.wantResolved, ok)if !tt.wantResolved {returndiff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex 93afd7cc4..3a574ec55 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -26,6 +26,7 @@ import (imagetypes "github.com/moby/moby/api/types/image"mounttypes "github.com/moby/moby/api/types/mount""github.com/moby/moby/client"+ "github.com/samber/mo""gorm.io/gorm""gorm.io/gorm/clause"@@ -76,6 +77,11 @@ type trivyRuntimeOptions struct {NetworkMode string}+type trivyRuntimeSecurityInternal struct {+ securityOpts []string+ privileged bool+}+// VulnerabilityService handles vulnerability scanning of container imagestype VulnerabilityService struct {db *database.DB@@ -314,7 +320,7 @@ func (s *VulnerabilityService) ScanImage(ctx context.Context, envID string, imagImageName: imageName,ScanTime: time.Now(),Status: vulnerability.ScanStatusScanning,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),}s.applyScanPhaseToResultInternal(pendingResult)if saveErr := s.saveScanResultWithRetryInternal(scanCtx, pendingResult); saveErr != nil {@@ -395,7 +401,7 @@ func (s *VulnerabilityService) scanImageInBackgroundInternal(ctx context.ContextImageName: imageName,ScanTime: time.Now(),Status: vulnerability.ScanStatusFailed,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),Error: "Trivy scanner is not available: " + err.Error(),}if saveErr := s.saveScanResultWithRetryInternal(ctx, result); saveErr != nil {@@ -426,7 +432,7 @@ func (s *VulnerabilityService) scanImageInBackgroundInternal(ctx context.ContextImageName: imageName,ScanTime: time.Now(),Status: vulnerability.ScanStatusFailed,- ActivityID: utils.StringPtrFromTrimmed(activityID),+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),Error: err.Error(),Duration: duration,}@@ -447,7 +453,7 @@ func (s *VulnerabilityService) scanImageInBackgroundInternal(ctx context.Context}result.Duration = duration- result.ActivityID = utils.StringPtrFromTrimmed(activityID)+ result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()s.ensureSummary(result)s.setScanPhaseInternal(imageID, vulnerability.ScanPhaseStoringResults)s.updateVulnerabilityScanActivityInternal(ctx, activityID, vulnerability.ScanPhaseStoringResults, 90, "Storing vulnerability results")@@ -585,7 +591,7 @@ func (s *VulnerabilityService) GetScanSummary(ctx context.Context, imageID strinUnknown: record.UnknownCount,Total: record.TotalCount,},- Error: utils.DerefString(record.Error),+ Error: mo.PointerToOption(record.Error).OrEmpty(),}s.applyScanPhaseToSummaryInternal(summary)@@ -816,8 +822,7 @@ func (s *VulnerabilityService) ListAllVulnerabilities(ctx context.Context, envIDSelect("id", "image_name", "vulnerabilities", "total_count").Where("status = ?", models.ScanStatusCompleted).Where("total_count > 0")- var hasPossibleMatches bool- recordsQuery, hasPossibleMatches = applyListAllVulnerabilityRecordPrefiltersInternal(recordsQuery, params.Filters)+ recordsQuery, hasPossibleMatches := applyListAllVulnerabilityRecordPrefiltersInternal(recordsQuery, params.Filters).Get()if !hasPossibleMatches {filtered := pagination.FilterResult[vulnerability.VulnerabilityWithImage]{Items: []vulnerability.VulnerabilityWithImage{},@@ -955,7 +960,7 @@ func (s *VulnerabilityService) ListAllVulnerabilityImageOptions(ctx context.Contvar hasPossibleMatches boolquery, hasPossibleMatches = applyListAllVulnerabilityRecordPrefiltersInternal(query, map[string]string{"severity": severityFilter,- })+ }).Get()if !hasPossibleMatches {return []string{}, nil}@@ -988,15 +993,15 @@ func (s *VulnerabilityService) ListAllVulnerabilityImageOptions(ctx context.Contreturn options, nil}-func applyListAllVulnerabilityRecordPrefiltersInternal(query *gorm.DB, filters map[string]string) (*gorm.DB, bool) {+func applyListAllVulnerabilityRecordPrefiltersInternal(query *gorm.DB, filters map[string]string) mo.Option[*gorm.DB] {if query == nil || len(filters) == 0 {- return query, true+ return mo.Some(query)}if severityFilter, ok := filters["severity"]; ok {severityColumns := severityCountColumnsForFilterInternal(severityFilter)if len(severityColumns) == 0 {- return query, false+ return mo.None[*gorm.DB]()}parts := make([]string, 0, len(severityColumns))@@ -1011,7 +1016,7 @@ func applyListAllVulnerabilityRecordPrefiltersInternal(query *gorm.DB, filters mif imageNameFilter, ok := filters["imageName"]; ok {imageNameParts := splitNonEmptyCSVInternal(imageNameFilter)if len(imageNameParts) == 0 {- return query, false+ return mo.None[*gorm.DB]()}clauses := make([]string, 0, len(imageNameParts))@@ -1023,7 +1028,7 @@ func applyListAllVulnerabilityRecordPrefiltersInternal(query *gorm.DB, filters mquery = query.Where("("+strings.Join(clauses, " OR ")+")", args...)}- return query, true+ return mo.Some(query)}func severityCountColumnsForFilterInternal(value string) []string {@@ -1479,7 +1484,8 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, tr},}- securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()+ runtimeSecurity := s.getTrivyRuntimeSecurityInternal().OrEmpty()+ securityOpts, privileged := runtimeSecurity.securityOpts, runtimeSecurity.privilegedhostConfig := buildTrivyBatchHostConfigInternal(cacheVolume, runtimeOptions, securityOpts, privileged)resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)@@ -2009,17 +2015,20 @@ func (s *VulnerabilityService) resolveTrivyRuntimeOptionsInternal(ctx context.Coreturn options, nil}-func (s *VulnerabilityService) getTrivyRuntimeSecurityInternal() ([]string, bool) {+func (s *VulnerabilityService) getTrivyRuntimeSecurityInternal() mo.Option[trivyRuntimeSecurityInternal] {if s.settingsService == nil {- return nil, false+ return mo.None[trivyRuntimeSecurityInternal]()}cfg := s.settingsService.GetSettingsConfig()if cfg == nil {- return nil, false+ return mo.None[trivyRuntimeSecurityInternal]()}- return vuln.ParseSecurityOpts(cfg.TrivySecurityOpts.Value), cfg.TrivyPrivileged.IsTrue()+ return mo.Some(trivyRuntimeSecurityInternal{+ securityOpts: vuln.ParseSecurityOpts(cfg.TrivySecurityOpts.Value),+ privileged: cfg.TrivyPrivileged.IsTrue(),+ })}func (s *VulnerabilityService) getTrivyScanTimeoutArg() string {@@ -2144,36 +2153,36 @@ func (s *VulnerabilityService) getTrivyIgnoreUnfixed() bool {return cfg != nil && cfg.TrivyIgnoreUnfixed.IsTrue()}-func (s *VulnerabilityService) createTrivyConfigTempFile(ctx context.Context, content string) (string, bool) {+func (s *VulnerabilityService) createTrivyConfigTempFile(ctx context.Context, content string) mo.Option[string] {configFile, err := os.CreateTemp("", "trivy-config-*.yaml")if err != nil {slog.WarnContext(ctx, "failed to create trivy config temp file", "error", err)- return "", false+ return mo.None[string]()}if _, err := configFile.WriteString(content); err != nil {slog.WarnContext(ctx, "failed to write trivy config", "error", err)_ = configFile.Close()_ = os.Remove(configFile.Name())- return "", false+ return mo.None[string]()}_ = configFile.Close()- return configFile.Name(), true+ return mo.Some(configFile.Name())}-func (s *VulnerabilityService) createTrivyIgnoreTempFile(ctx context.Context, content string) (string, bool) {+func (s *VulnerabilityService) createTrivyIgnoreTempFile(ctx context.Context, content string) mo.Option[string] {ignoreFile, err := os.CreateTemp("", "trivy-ignore-*")if err != nil {slog.WarnContext(ctx, "failed to create trivy ignore temp file", "error", err)- return "", false+ return mo.None[string]()}if _, err := ignoreFile.WriteString(content); err != nil {slog.WarnContext(ctx, "failed to write trivy ignore", "error", err)_ = ignoreFile.Close()_ = os.Remove(ignoreFile.Name())- return "", false+ return mo.None[string]()}_ = ignoreFile.Close()- return ignoreFile.Name(), true+ return mo.Some(ignoreFile.Name())}func cleanupTempFiles(ctx context.Context, tempFiles []string) {@@ -2201,14 +2210,14 @@ func (s *VulnerabilityService) buildTrivyCommandArgs(var tempFiles []stringif strings.TrimSpace(configContent) != "" {- if tempFile, ok := s.createTrivyConfigTempFile(ctx, configContent); ok {+ if tempFile, ok := s.createTrivyConfigTempFile(ctx, configContent).Get(); ok {tempFiles = append(tempFiles, tempFile)cmdArgs = append(cmdArgs, "--config", "/tmp/trivy-config.yaml")}}if strings.TrimSpace(ignoreContent) != "" {- if tempFile, ok := s.createTrivyIgnoreTempFile(ctx, ignoreContent); ok {+ if tempFile, ok := s.createTrivyIgnoreTempFile(ctx, ignoreContent).Get(); ok {tempFiles = append(tempFiles, tempFile)cmdArgs = append(cmdArgs, "--ignorefile", "/tmp/trivy-ignore")}@@ -2685,7 +2694,7 @@ func buildTrivyCPUSetInternal(nanoCPUs int64, hostCPUs int) string {return fmt.Sprintf("0-%d", requestedCPUs-1)}-func (s *VulnerabilityService) getTrivyContainerResourcesInternal() (containertypes.Resources, bool) {+func (s *VulnerabilityService) getTrivyContainerResourcesInternal() mo.Option[containertypes.Resources] {var cfg *models.Settingsif s.settingsService != nil {cfg = s.settingsService.GetSettingsConfig()@@ -2695,7 +2704,7 @@ func (s *VulnerabilityService) getTrivyContainerResourcesInternal() (containerty}func (s *VulnerabilityService) getTrivyContainerResourceOptionsInternal(ctx context.Context, dockerClient *client.Client) (containertypes.Resources, string, bool) {- resources, applyLimits := s.getTrivyContainerResourcesInternal()+ resources, applyLimits := s.getTrivyContainerResourcesInternal().Get()if !applyLimits || dockerClient == nil {return resources, "", applyLimits}@@ -3082,7 +3091,7 @@ func formatTrivyExitErrorInternal(exitCode int64, errMsg, imageName string) erroreturn fmt.Errorf("trivy scan failed: %s", errMsg)}-func buildTrivyContainerResourcesInternal(cfg *models.Settings) (containertypes.Resources, bool) {+func buildTrivyContainerResourcesInternal(cfg *models.Settings) mo.Option[containertypes.Resources] {limitsEnabled := truecpuLimitCores := defaultTrivyCPULimitCoresmemoryLimitMB := defaultTrivyMemoryLimitMB@@ -3094,7 +3103,7 @@ func buildTrivyContainerResourcesInternal(cfg *models.Settings) (containertypes.}if !limitsEnabled {- return containertypes.Resources{}, false+ return mo.None[containertypes.Resources]()}resources := containertypes.Resources{}@@ -3108,7 +3117,7 @@ func buildTrivyContainerResourcesInternal(cfg *models.Settings) (containertypes.resources.MemorySwap = memoryBytes}- return resources, true+ return mo.Some(resources)}func (s *VulnerabilityService) runTrivyContainer(@@ -3338,7 +3347,8 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage striconfig := vuln.BuildContainerConfig(trivyImage, cmdArgs, env)resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)- securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()+ runtimeSecurity := s.getTrivyRuntimeSecurityInternal().OrEmpty()+ securityOpts, privileged := runtimeSecurity.securityOpts, runtimeSecurity.privilegedhostConfig := buildTrivyHostConfig(cacheVolume,tempFiles,diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.goindex fd0855f32..df9df4c4f 100644--- a/backend/internal/services/vulnerability_service_test.go+++ b/backend/internal/services/vulnerability_service_test.go@@ -226,7 +226,7 @@ func TestCleanupTrivyLogTempFilesInternal_RemovesFiles(t *testing.T) {}func TestBuildTrivyContainerResourcesInternal_Defaults(t *testing.T) {- resources, applyLimits := buildTrivyContainerResourcesInternal(nil)+ resources, applyLimits := buildTrivyContainerResourcesInternal(nil).Get()require.True(t, applyLimits)require.Equal(t, int64(1_000_000_000), resources.NanoCPUs)@@ -241,7 +241,7 @@ func TestBuildTrivyContainerResourcesInternal_LimitsDisabled(t *testing.T) {TrivyMemoryLimitMb: models.SettingVariable{Value: "2048"},}- resources, applyLimits := buildTrivyContainerResourcesInternal(cfg)+ resources, applyLimits := buildTrivyContainerResourcesInternal(cfg).Get()require.False(t, applyLimits)require.Equal(t, int64(0), resources.NanoCPUs)@@ -256,7 +256,7 @@ func TestBuildTrivyContainerResourcesInternal_CustomLimits(t *testing.T) {TrivyMemoryLimitMb: models.SettingVariable{Value: "2048"},}- resources, applyLimits := buildTrivyContainerResourcesInternal(cfg)+ resources, applyLimits := buildTrivyContainerResourcesInternal(cfg).Get()require.True(t, applyLimits)require.Equal(t, int64(2_500_000_000), resources.NanoCPUs)@@ -821,16 +821,16 @@ func TestApplyListAllVulnerabilityRecordPrefiltersInternal_NoPossibleMatches(t *db := setupVulnerabilityScanTestDB(t)base := db.WithContext(context.Background()).Model(&models.VulnerabilityScanRecord{})- _, ok := applyListAllVulnerabilityRecordPrefiltersInternal(base, map[string]string{"severity": "not-a-severity"})+ _, ok := applyListAllVulnerabilityRecordPrefiltersInternal(base, map[string]string{"severity": "not-a-severity"}).Get()require.False(t, ok)- _, ok = applyListAllVulnerabilityRecordPrefiltersInternal(base, map[string]string{"imageName": " , "})+ _, ok = applyListAllVulnerabilityRecordPrefiltersInternal(base, map[string]string{"imageName": " , "}).Get()require.False(t, ok)_, ok = applyListAllVulnerabilityRecordPrefiltersInternal(base, map[string]string{"severity": "high,bad","imageName": "nginx",- })+ }).Get()require.True(t, ok)}diff --git a/backend/pkg/authz/permission_matcher.go b/backend/pkg/authz/permission_matcher.goindex 93eaedcb5..03ef7fe27 100644--- a/backend/pkg/authz/permission_matcher.go+++ b/backend/pkg/authz/permission_matcher.go@@ -1,6 +1,10 @@package authz-import "strings"+import (+ "strings"++ "github.com/samber/mo"+)// PermissionMatcher maps an HTTP method and environment-relative resource path// to the permission required to perform it. It mirrors the per-operation@@ -56,9 +60,9 @@ func (m *PermissionMatcher) AddPublic(method, pathTemplate string) {// static routes such as "/containers/counts" take precedence over// parameterized routes such as "/containers/{containerId}".//-// The boolean result reports whether any route matched. Callers should treat a-// false result as "deny" for proxied resource paths.-func (m *PermissionMatcher) Lookup(method, suffixPath string) (string, bool) {+// The returned option contains the required permission when a route matched.+// Callers should treat None as "deny" for proxied resource paths.+func (m *PermissionMatcher) Lookup(method, suffixPath string) mo.Option[string] {if i := strings.IndexByte(suffixPath, '?'); i >= 0 {suffixPath = suffixPath[:i]}@@ -91,7 +95,10 @@ func (m *PermissionMatcher) Lookup(method, suffixPath string) (string, bool) {found = true}}- return bestPerm, found+ if found {+ return mo.Some(bestPerm)+ }+ return mo.None[string]()}// pathSegmentsInternal splits a path into its non-empty segments, ignoringdiff --git a/backend/pkg/authz/permission_matcher_huma.go b/backend/pkg/authz/permission_matcher_huma.goindex c1e38efa0..0bb263529 100644--- a/backend/pkg/authz/permission_matcher_huma.go+++ b/backend/pkg/authz/permission_matcher_huma.go@@ -5,6 +5,7 @@ import ("strings""github.com/danielgtaylor/huma/v2"+ "github.com/samber/mo")// MetaRequiredPermission is the huma.Operation.Metadata key under which the@@ -33,7 +34,7 @@ func (m *PermissionMatcher) CollectFromHumaAPI(humaAPI huma.API) {if item == nil {continue}- suffix, ok := envResourceSuffixInternal(path)+ suffix, ok := envResourceSuffixInternal(path).Get()if !ok {continue}@@ -41,7 +42,7 @@ func (m *PermissionMatcher) CollectFromHumaAPI(humaAPI huma.API) {if op == nil {continue}- if perm, ok := requiredPermissionInternal(op); ok {+ if perm, ok := requiredPermissionInternal(op).Get(); ok {m.Add(method, suffix, perm)continue}@@ -58,24 +59,24 @@ func (m *PermissionMatcher) CollectFromHumaAPI(humaAPI huma.API) {// envResourceSuffixInternal returns the resource path after /environments/{id}// for environment-scoped operation paths, e.g. "/containers" for-// "/environments/{id}/containers". It returns ok=false for paths that are not+// "/environments/{id}/containers". It returns None for paths that are not// environment-scoped resource paths (including the bare "/environments/{id}").-func envResourceSuffixInternal(path string) (string, bool) {+func envResourceSuffixInternal(path string) mo.Option[string] {if !strings.HasPrefix(path, envPathPrefixInternal+"/") {- return "", false+ return mo.None[string]()}- return strings.TrimPrefix(path, envPathPrefixInternal), true+ return mo.Some(strings.TrimPrefix(path, envPathPrefixInternal))}-func requiredPermissionInternal(op *huma.Operation) (string, bool) {+func requiredPermissionInternal(op *huma.Operation) mo.Option[string] {if op.Metadata == nil {- return "", false+ return mo.None[string]()}perm, ok := op.Metadata[MetaRequiredPermission].(string)if !ok || perm == "" {- return "", false+ return mo.None[string]()}- return perm, true+ return mo.Some(perm)}// isPublicOperationInternal reports whether op explicitly opts out of alldiff --git a/backend/pkg/authz/permission_matcher_test.go b/backend/pkg/authz/permission_matcher_test.goindex ef0f3347a..89b8dddc9 100644--- a/backend/pkg/authz/permission_matcher_test.go+++ b/backend/pkg/authz/permission_matcher_test.go@@ -7,10 +7,10 @@ func TestPermissionMatcherLookupExactAndWildcard(t *testing.T) {m.Add("POST", "/containers/{containerId}/start", "containers:start")m.Add("GET", "/containers/{containerId}", "containers:read")- if perm, ok := m.Lookup("POST", "/containers/abc123/start"); !ok || perm != "containers:start" {+ if perm, ok := m.Lookup("POST", "/containers/abc123/start").Get(); !ok || perm != "containers:start" {t.Fatalf("expected containers:start, got %q ok=%v", perm, ok)}- if perm, ok := m.Lookup("GET", "/containers/abc123"); !ok || perm != "containers:read" {+ if perm, ok := m.Lookup("GET", "/containers/abc123").Get(); !ok || perm != "containers:read" {t.Fatalf("expected containers:read, got %q ok=%v", perm, ok)}}@@ -22,10 +22,10 @@ func TestPermissionMatcherStaticBeatsWildcard(t *testing.T) {m.Add("GET", "/containers/{containerId}", "containers:read")m.Add("GET", "/containers/counts", "containers:list")- if perm, ok := m.Lookup("GET", "/containers/counts"); !ok || perm != "containers:list" {+ if perm, ok := m.Lookup("GET", "/containers/counts").Get(); !ok || perm != "containers:list" {t.Fatalf("expected static route to win with containers:list, got %q ok=%v", perm, ok)}- if perm, ok := m.Lookup("GET", "/containers/xyz"); !ok || perm != "containers:read" {+ if perm, ok := m.Lookup("GET", "/containers/xyz").Get(); !ok || perm != "containers:read" {t.Fatalf("expected wildcard route containers:read, got %q ok=%v", perm, ok)}}@@ -34,13 +34,13 @@ func TestPermissionMatcherMethodAndLengthMismatch(t *testing.T) {m := NewPermissionMatcher()m.Add("POST", "/containers/{containerId}/start", "containers:start")- if _, ok := m.Lookup("DELETE", "/containers/abc/start"); ok {+ if _, ok := m.Lookup("DELETE", "/containers/abc/start").Get(); ok {t.Fatal("expected no match for wrong method")}- if _, ok := m.Lookup("POST", "/containers/abc/start/extra"); ok {+ if _, ok := m.Lookup("POST", "/containers/abc/start/extra").Get(); ok {t.Fatal("expected no match for longer path")}- if _, ok := m.Lookup("POST", "/containers/abc"); ok {+ if _, ok := m.Lookup("POST", "/containers/abc").Get(); ok {t.Fatal("expected no match for shorter path")}}@@ -49,7 +49,7 @@ func TestPermissionMatcherNormalizesEchoParamsAndStripsQuery(t *testing.T) {m := NewPermissionMatcher()m.Add("GET", "/volumes/:volumeName/browse", "volumes:browse")- if perm, ok := m.Lookup("GET", "/volumes/data/browse?path=/etc"); !ok || perm != "volumes:browse" {+ if perm, ok := m.Lookup("GET", "/volumes/data/browse?path=/etc").Get(); !ok || perm != "volumes:browse" {t.Fatalf("expected volumes:browse with echo param + query string, got %q ok=%v", perm, ok)}}@@ -58,7 +58,7 @@ func TestPermissionMatcherPublicRoute(t *testing.T) {m := NewPermissionMatcher()m.AddPublic("GET", "/settings/public")- perm, ok := m.Lookup("GET", "/settings/public")+ perm, ok := m.Lookup("GET", "/settings/public").Get()if !ok {t.Fatal("expected public route to be found")}@@ -71,7 +71,7 @@ func TestPermissionMatcherUnmappedReturnsNotFound(t *testing.T) {m := NewPermissionMatcher()m.Add("GET", "/containers", "containers:list")- if _, ok := m.Lookup("GET", "/images"); ok {+ if _, ok := m.Lookup("GET", "/images").Get(); ok {t.Fatal("expected unmapped path to return not found")}}diff --git a/backend/pkg/dockerutil/volume_utils.go b/backend/pkg/dockerutil/volume_utils.goindex 8941a553a..d7f7a43b2 100644--- a/backend/pkg/dockerutil/volume_utils.go+++ b/backend/pkg/dockerutil/volume_utils.go@@ -12,6 +12,7 @@ import ("github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/volume""github.com/moby/moby/client"+ "github.com/samber/mo")var (@@ -79,9 +80,9 @@ func GetVolumeUsageData(ctx context.Context, dockerClient *client.Client) ([]vol// GetVolumeUsageDataStaleWhileRevalidate returns immediately with any cached// snapshot and starts a bounded refresh when the snapshot is stale or missing.-func GetVolumeUsageDataStaleWhileRevalidate(ctx context.Context, dockerClient *client.Client) ([]volume.Volume, bool) {+func GetVolumeUsageDataStaleWhileRevalidate(ctx context.Context, dockerClient *client.Client) mo.Option[[]volume.Volume] {if dockerClient == nil {- return nil, false+ return mo.None[[]volume.Volume]()}key := volumeUsageCacheKeyInternal(dockerClient)@@ -102,7 +103,10 @@ func GetVolumeUsageDataStaleWhileRevalidate(ctx context.Context, dockerClient *cif !fresh {startVolumeUsageRefreshInternal(ctx, key, dockerClient)}- return cached, found+ if !found {+ return mo.None[[]volume.Volume]()+ }+ return mo.Some(cached)}// InvalidateVolumeUsageCache invalidates usage data for the Docker daemon used by dockerClient.diff --git a/backend/pkg/dockerutil/volume_utils_test.go b/backend/pkg/dockerutil/volume_utils_test.goindex 516a19e00..5c568c537 100644--- a/backend/pkg/dockerutil/volume_utils_test.go+++ b/backend/pkg/dockerutil/volume_utils_test.go@@ -91,7 +91,7 @@ func TestVolumeUsageCacheBehaviorInternal(t *testing.T) {volumeUsageCacheMutex.Unlock()startedAt := time.Now()- stale, found := GetVolumeUsageDataStaleWhileRevalidate(ctx, dockerClient)+ stale, found := GetVolumeUsageDataStaleWhileRevalidate(ctx, dockerClient).Get()require.True(t, found)require.Len(t, stale, 1)require.Equal(t, "stale", stale[0].Name)@@ -102,7 +102,7 @@ func TestVolumeUsageCacheBehaviorInternal(t *testing.T) {case <-time.After(time.Second):t.Fatal("background volume usage refresh did not start")}- _, _ = GetVolumeUsageDataStaleWhileRevalidate(ctx, dockerClient)+ _, _ = GetVolumeUsageDataStaleWhileRevalidate(ctx, dockerClient).Get()require.Equal(t, int32(2), requests.Load())close(releaseSecond)diff --git a/backend/pkg/libarcane/activity/handler.go b/backend/pkg/libarcane/activity/handler.goindex 3ef221888..1afb66635 100644--- a/backend/pkg/libarcane/activity/handler.go+++ b/backend/pkg/libarcane/activity/handler.go@@ -11,6 +11,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/samber/mo")// ErrCanceled is the cancellation cause set on an activity's work context when a@@ -130,9 +131,9 @@ func startHandlerActivityInternal(EnvironmentID: environmentID,Type: activityType,Queue: queue,- ResourceType: utils.StringPtrFromTrimmed(resourceType),- ResourceID: utils.StringPtrFromTrimmed(resourceID),- ResourceName: utils.StringPtrFromTrimmed(resourceName),+ ResourceType: mo.EmptyableToOption(strings.TrimSpace(resourceType)).ToPointer(),+ ResourceID: mo.EmptyableToOption(strings.TrimSpace(resourceID)).ToPointer(),+ ResourceName: mo.EmptyableToOption(strings.TrimSpace(resourceName)).ToPointer(),StartedBy: user,Step: step,LatestMessage: message,diff --git a/backend/pkg/libarcane/activity/writer.go b/backend/pkg/libarcane/activity/writer.goindex f652522ff..9c1182acc 100644--- a/backend/pkg/libarcane/activity/writer.go+++ b/backend/pkg/libarcane/activity/writer.go@@ -12,6 +12,7 @@ import ("sync""github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/samber/mo")type Writer struct {@@ -87,7 +88,7 @@ func (w *Writer) Write(p []byte) (int, error) {}line := strings.TrimSpace(string(w.buffer[:idx]))w.buffer = w.buffer[idx+1:]- if message, ok := w.processLineInternal(line); ok {+ if message, ok := w.processLineInternal(line).Get(); ok {messages = append(messages, message)}}@@ -119,31 +120,31 @@ func (w *Writer) Flush() {}}-func (w *Writer) processLineInternal(line string) (writerAppendMessage, bool) {+func (w *Writer) processLineInternal(line string) mo.Option[writerAppendMessage] {if line == "" || w.activityService == nil || w.activityID == "" {- return writerAppendMessage{}, false+ return mo.None[writerAppendMessage]()}var payload map[string]anyif err := json.Unmarshal([]byte(line), &payload); err != nil {- return writerAppendMessage{+ return mo.Some(writerAppendMessage{level: models.ActivityMessageLevelInfo,message: line,step: w.defaultStep,- }, true+ })}message, level, step, progress := w.describePayloadInternal(payload)if message == "" {- return writerAppendMessage{}, false+ return mo.None[writerAppendMessage]()}- return writerAppendMessage{+ return mo.Some(writerAppendMessage{level: level,message: message,payload: models.JSON(payload),progress: progress,step: step,- }, true+ })}func (w *Writer) describePayloadInternal(payload map[string]any) (string, models.ActivityMessageLevel, string, *int) {diff --git a/backend/pkg/libarcane/docker_compat.go b/backend/pkg/libarcane/docker_compat.goindex e1ebaec49..a0f17f518 100644--- a/backend/pkg/libarcane/docker_compat.go+++ b/backend/pkg/libarcane/docker_compat.go@@ -11,6 +11,7 @@ import ("github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network""github.com/moby/moby/client"+ "github.com/samber/mo")const NetworkScopedMacAddressMinAPIVersion = "1.44"@@ -73,12 +74,12 @@ func SupportsDockerCreatePerNetworkMACAddress(apiVersion string) bool {// API versions (e.g. "1.43", "1.44.1"). Returns false when either version// cannot be parsed.func IsDockerAPIVersionAtLeast(current, minimum string) bool {- cur, ok := parseAPIVersionInternal(current)+ cur, ok := parseAPIVersionInternal(current).Get()if !ok {return false}- minV, ok := parseAPIVersionInternal(minimum)+ minV, ok := parseAPIVersionInternal(minimum).Get()if !ok {return false}@@ -250,33 +251,33 @@ func ContainerCreateWithCompatibilityForAPIVersion(ctx context.Context, dockerClreturn result, nil}-func parseAPIVersionInternal(version string) ([3]int, bool) {+func parseAPIVersionInternal(version string) mo.Option[[3]int] {parsed := [3]int{}version = strings.TrimSpace(strings.TrimPrefix(version, "v"))if version == "" {- return parsed, false+ return mo.None[[3]int]()}parts := strings.Split(version, ".")if len(parts) < 2 {- return parsed, false+ return mo.None[[3]int]()}for i := 0; i < len(parsed) && i < len(parts); i++ {part := strings.TrimSpace(parts[i])if part == "" {- return [3]int{}, false+ return mo.None[[3]int]()}n, err := strconv.Atoi(part)if err != nil {- return [3]int{}, false+ return mo.None[[3]int]()}parsed[i] = n}- return parsed, true+ return mo.Some(parsed)}func resolvePrimaryContainerCreateNetworkInternal(hostConfig *container.HostConfig, endpoints map[string]*network.EndpointSettings) string {diff --git a/backend/pkg/libarcane/edge/client.go b/backend/pkg/libarcane/edge/client.goindex 6f1e9e0bb..698ac5174 100644--- a/backend/pkg/libarcane/edge/client.go+++ b/backend/pkg/libarcane/edge/client.go@@ -16,6 +16,7 @@ import ("github.com/google/uuid""github.com/gorilla/websocket"+ "github.com/samber/mo")const (@@ -223,7 +224,7 @@ func (c *TunnelClient) connectAndServe(ctx context.Context) error {func (c *TunnelClient) connectAndServeManagedTunnelInternal(ctx context.Context) error {if c.shouldAttemptGRPCTunnelInternal() {- if preferredUntil, ok := c.preferredWebSocketUntilInternal(time.Now()); ok {+ if preferredUntil, ok := c.preferredWebSocketUntilInternal(time.Now()).Get(); ok {slog.InfoContext(ctx, "Temporarily preferring websocket edge tunnel transport after recent websocket success","preferred_until", preferredUntil,"manager_ws_url", c.managerWebSocketURLInternal(),@@ -340,19 +341,19 @@ func (c *TunnelClient) websocketPreferenceTTLInternal() time.Duration {return c.websocketPreferenceTTL}-func (c *TunnelClient) preferredWebSocketUntilInternal(now time.Time) (time.Time, bool) {+func (c *TunnelClient) preferredWebSocketUntilInternal(now time.Time) mo.Option[time.Time] {if c == nil || !c.shouldAttemptGRPCTunnelInternal() || !c.shouldAttemptWebSocketTunnelInternal() {- return time.Time{}, false+ return mo.None[time.Time]()}c.transportPreferenceMu.RLock()defer c.transportPreferenceMu.RUnlock()if c.preferWebSocketUntil.IsZero() || !now.Before(c.preferWebSocketUntil) {- return time.Time{}, false+ return mo.None[time.Time]()}- return c.preferWebSocketUntil, true+ return mo.Some(c.preferWebSocketUntil)}func (c *TunnelClient) markTransportConnectedInternal(transport string) {@@ -726,7 +727,7 @@ func (c *TunnelClient) handleRequestStreaming(ctx context.Context, conn TunnelCo// handleWebSocketStart handles a WebSocket stream start request from the manager.func (c *TunnelClient) handleWebSocketStart(ctx context.Context, conn TunnelConnection, msg *TunnelMessage) {if msg.Command == "" {- if commandName, ok := ResolveEdgeCommandName(http.MethodGet, msg.Path, true); ok {+ if commandName, ok := ResolveEdgeCommandName(http.MethodGet, msg.Path, true).Get(); ok {msg.Command = commandName}}diff --git a/backend/pkg/libarcane/edge/client_test.go b/backend/pkg/libarcane/edge/client_test.goindex 62430f8b1..d2cef3cae 100644--- a/backend/pkg/libarcane/edge/client_test.go+++ b/backend/pkg/libarcane/edge/client_test.go@@ -903,7 +903,7 @@ func TestTunnelClient_GRPC_EndToEnd(t *testing.T) {var tunnel *AgentTunnelrequire.Eventually(t, func() bool {var ok bool- tunnel, ok = GetRegistry().Get(envID)+ tunnel, ok = GetRegistry().Get(envID).Get()return ok && tunnel != nil && !tunnel.Conn.IsClosed()}, 5*time.Second, 20*time.Millisecond)@@ -1228,13 +1228,13 @@ func TestTunnelClient_GRPC_WebSocketProxyEndToEnd(t *testing.T) {go client.StartWithErrorChan(ctx, errCh)require.Eventually(t, func() bool {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()return ok && tunnel != nil && !tunnel.Conn.IsClosed()}, 5*time.Second, 20*time.Millisecond)router := echo.New()router.GET("/proxy-ws", func(c echo.Context) error {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil {return c.NoContent(http.StatusServiceUnavailable)}@@ -1491,7 +1491,7 @@ func TestTunnelClient_connectAndServe_OpensGRPCWhenAvailable(t *testing.T) {}()require.Eventually(t, func() bool {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {return false}@@ -1691,7 +1691,7 @@ func TestTunnelClient_connectAndServePoll_OpensGRPCWhenRequired(t *testing.T) {}()require.Eventually(t, func() bool {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {return false}diff --git a/backend/pkg/libarcane/edge/client_transport_grpc_test.go b/backend/pkg/libarcane/edge/client_transport_grpc_test.goindex f55e14e63..a2591eb08 100644--- a/backend/pkg/libarcane/edge/client_transport_grpc_test.go+++ b/backend/pkg/libarcane/edge/client_transport_grpc_test.go@@ -94,7 +94,7 @@ func TestGRPCTunnel_RequestResponse(t *testing.T) {var tunnel *AgentTunnelrequire.Eventually(t, func() bool {var ok bool- tunnel, ok = GetRegistry().Get(envID)+ tunnel, ok = GetRegistry().Get(envID).Get()return ok && tunnel != nil}, time.Second, 10*time.Millisecond)@@ -200,7 +200,7 @@ func TestGRPCTunnel_RequestResponseStreamingChunks(t *testing.T) {var tunnel *AgentTunnelrequire.Eventually(t, func() bool {var ok bool- tunnel, ok = GetRegistry().Get(envID)+ tunnel, ok = GetRegistry().Get(envID).Get()return ok && tunnel != nil}, time.Second, 10*time.Millisecond)diff --git a/backend/pkg/libarcane/edge/command_client.go b/backend/pkg/libarcane/edge/command_client.goindex 28ac01f5d..a21a720cb 100644--- a/backend/pkg/libarcane/edge/command_client.go+++ b/backend/pkg/libarcane/edge/command_client.go@@ -46,7 +46,7 @@ func (c *CommandClient) Execute(ctx context.Context, tunnel *AgentTunnel, req *CcommandName := req.Commandif commandName == "" {- resolved, ok := ResolveEdgeCommandName(req.Method, req.Path, false)+ resolved, ok := ResolveEdgeCommandName(req.Method, req.Path, false).Get()if !ok {return nil, fmt.Errorf("unsupported edge command for %s %s", req.Method, req.Path)}@@ -115,7 +115,7 @@ func (c *CommandClient) OpenStream(ctx context.Context, tunnel *AgentTunnel, reqcommandName := req.Commandif commandName == "" {- resolved, ok := ResolveEdgeCommandName(http.MethodGet, req.Path, true)+ resolved, ok := ResolveEdgeCommandName(http.MethodGet, req.Path, true).Get()if !ok {return fmt.Errorf("unsupported edge stream target %q", req.Path)}diff --git a/backend/pkg/libarcane/edge/commands.go b/backend/pkg/libarcane/edge/commands.goindex 89b207c0b..e2c36a9a6 100644--- a/backend/pkg/libarcane/edge/commands.go+++ b/backend/pkg/libarcane/edge/commands.go@@ -1,6 +1,8 @@package edgeimport (+ "github.com/samber/mo"+"net/http""strings")@@ -249,24 +251,24 @@ type commandRouteIndexInternal struct {var commandRoutesIndex = buildCommandRouteIndexInternal(commandRoutes)-func ResolveEdgeCommandName(method, requestPath string, stream bool) (string, bool) {+func ResolveEdgeCommandName(method, requestPath string, stream bool) mo.Option[string] {method = strings.ToUpper(strings.TrimSpace(method))requestPath = normalizeCommandPathInternal(requestPath)- route, ok := commandRoutesIndex.resolveInternal(method, requestPath, stream)+ route, ok := commandRoutesIndex.resolveInternal(method, requestPath, stream).Get()if !ok {- return "", false+ return mo.None[string]()}if route.LocalOnly {- return "", false+ return mo.None[string]()}- return route.CommandName, true+ return mo.Some(route.CommandName)}func ValidateEdgeCommand(commandName, method, requestPath string, stream bool) bool {- resolved, ok := ResolveEdgeCommandName(method, requestPath, stream)+ resolved, ok := ResolveEdgeCommandName(method, requestPath, stream).Get()return ok && resolved == strings.TrimSpace(commandName)}@@ -362,10 +364,10 @@ func (n *commandRouteNode) insertInternal(route *commandRoute) {current.route = route}-func (i commandRouteIndexInternal) resolveInternal(method string, requestPath string, stream bool) (*commandRoute, bool) {+func (i commandRouteIndexInternal) resolveInternal(method string, requestPath string, stream bool) mo.Option[*commandRoute] {root := i.roots[commandRouteLookupKeyInternal(method, stream)]if root == nil {- return nil, false+ return mo.None[*commandRoute]()}current := root@@ -375,12 +377,12 @@ func (i commandRouteIndexInternal) resolveInternal(method string, requestPath stcontinue}if current.param == nil || part == "" {- return nil, false+ return mo.None[*commandRoute]()}current = current.param}if current.route == nil {- return nil, false+ return mo.None[*commandRoute]()}- return current.route, true+ return mo.Some(current.route)}diff --git a/backend/pkg/libarcane/edge/commands_test.go b/backend/pkg/libarcane/edge/commands_test.goindex 370972dbf..aee67ea31 100644--- a/backend/pkg/libarcane/edge/commands_test.go+++ b/backend/pkg/libarcane/edge/commands_test.go@@ -43,7 +43,7 @@ func TestResolveEdgeCommandName(t *testing.T) {t.Run(tc.name, func(t *testing.T) {t.Parallel()- command, ok := ResolveEdgeCommandName(tc.method, tc.path, tc.stream)+ command, ok := ResolveEdgeCommandName(tc.method, tc.path, tc.stream).Get()require.Equal(t, tc.shouldHit, ok)if tc.shouldHit {require.Equal(t, tc.command, command)diff --git a/backend/pkg/libarcane/edge/poll_control.go b/backend/pkg/libarcane/edge/poll_control.goindex 03b52e238..34eda3524 100644--- a/backend/pkg/libarcane/edge/poll_control.go+++ b/backend/pkg/libarcane/edge/poll_control.go@@ -1,6 +1,8 @@package edgeimport (+ "github.com/samber/mo"+json "encoding/json/v2""errors""io"@@ -183,9 +185,9 @@ func (r *PollRuntimeRegistry) Update(envID string, interval time.Duration, now t}// Get returns the most recent poll runtime state if it is still fresh.-func (r *PollRuntimeRegistry) Get(envID string, now time.Time) (PollRuntimeState, bool) {+func (r *PollRuntimeRegistry) Get(envID string, now time.Time) mo.Option[PollRuntimeState] {if r == nil || strings.TrimSpace(envID) == "" {- return PollRuntimeState{}, false+ return mo.None[PollRuntimeState]()}if now.IsZero() {now = time.Now()@@ -195,7 +197,7 @@ func (r *PollRuntimeRegistry) Get(envID string, now time.Time) (PollRuntimeStatestate, ok := r.states[envID]r.mu.RUnlock()if !ok || state.LastPollAt == nil {- return PollRuntimeState{}, false+ return mo.None[PollRuntimeState]()}ttl := pollRuntimeTTLInternal(state)@@ -205,18 +207,18 @@ func (r *PollRuntimeRegistry) Get(envID string, now time.Time) (PollRuntimeStatestate, ok = r.states[envID]if !ok || state.LastPollAt == nil {r.mu.Unlock()- return PollRuntimeState{}, false+ return mo.None[PollRuntimeState]()}ttl = pollRuntimeTTLInternal(state)if now.Sub(*state.LastPollAt) > ttl {delete(r.states, envID)r.mu.Unlock()- return PollRuntimeState{}, false+ return mo.None[PollRuntimeState]()}r.mu.Unlock()}- return state, true+ return mo.Some(state)}func decodeTunnelPollRequestInternal(c echo.Context) (*TunnelPollRequest, error) {@@ -245,7 +247,7 @@ func (s *TunnelServer) pollStatusInternal(envID string) TunnelPollResponse {hasActiveTunnel := falseactiveTransport := ""- if tunnel, ok := s.registry.Get(envID); ok && tunnel != nil && tunnel.Conn != nil && !tunnel.Conn.IsClosed() {+ if tunnel, ok := s.registry.Get(envID).Get(); ok && tunnel != nil && tunnel.Conn != nil && !tunnel.Conn.IsClosed() {hasActiveTunnel = trueswitch tunnel.Conn.(type) {case *GRPCManagerTunnelConn:diff --git a/backend/pkg/libarcane/edge/poll_control_test.go b/backend/pkg/libarcane/edge/poll_control_test.goindex 83d4dc68f..f76d2bce1 100644--- a/backend/pkg/libarcane/edge/poll_control_test.go+++ b/backend/pkg/libarcane/edge/poll_control_test.go@@ -52,7 +52,7 @@ func TestTunnelServer_HandlePoll(t *testing.T) {assert.Equal(t, TunnelStatusRequired, resp.Status)assert.Equal(t, int(DefaultTunnelPollInterval/time.Second), resp.PollIntervalSeconds)assert.False(t, resp.Connected)- if state, ok := GetPollRuntimeRegistry().Get("env-poll-1", time.Now()); assert.True(t, ok) {+ if state, ok := GetPollRuntimeRegistry().Get("env-poll-1", time.Now()).Get(); assert.True(t, ok) {assert.NotNil(t, state.LastPollAt)assert.Equal(t, int(DefaultTunnelPollInterval/time.Second), state.PollIntervalSeconds)}@@ -203,7 +203,7 @@ func TestPollRuntimeRegistryGetExpiresStaleState(t *testing.T) {now := time.Now()r.Update("env-stale", DefaultTunnelPollInterval, now)- state, ok := r.Get("env-stale", now.Add(DefaultPollRuntimeTTL+time.Second))+ state, ok := r.Get("env-stale", now.Add(DefaultPollRuntimeTTL+time.Second)).Get()assert.False(t, ok)assert.Nil(t, state.LastPollAt)}diff --git a/backend/pkg/libarcane/edge/proxy.go b/backend/pkg/libarcane/edge/proxy.goindex 8a8e38188..c4726c694 100644--- a/backend/pkg/libarcane/edge/proxy.go+++ b/backend/pkg/libarcane/edge/proxy.go@@ -1,6 +1,8 @@package edgeimport (+ "github.com/samber/mo"+"bytes""context""errors"@@ -274,27 +276,26 @@ func stripInternalTunnelHeaders(headers map[string]string) map[string]string {// HasActiveTunnel checks if an environment has an active edge tunnelfunc HasActiveTunnel(envID string) bool {- _, ok := GetActiveTunnel(envID)- return ok+ return GetActiveTunnel(envID).IsPresent()}// GetActiveTunnel returns the active tunnel for an environment, if one exists.-func GetActiveTunnel(envID string) (*AgentTunnel, bool) {- tunnel, ok := GetRegistry().Get(envID)+func GetActiveTunnel(envID string) mo.Option[*AgentTunnel] {+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {- return nil, false+ return mo.None[*AgentTunnel]()}- return tunnel, true+ return mo.Some(tunnel)}// WaitForActiveTunnel waits for an environment to establish a live tunnel.-func WaitForActiveTunnel(ctx context.Context, envID string, timeout time.Duration) (*AgentTunnel, bool) {+func WaitForActiveTunnel(ctx context.Context, envID string, timeout time.Duration) mo.Option[*AgentTunnel] {if timeout <= 0 {return GetActiveTunnel(envID)}- if tunnel, ok := GetActiveTunnel(envID); ok {- return tunnel, true+ if tunnel, ok := GetActiveTunnel(envID).Get(); ok {+ return mo.Some(tunnel)}waitCtx, cancel := context.WithTimeout(ctx, timeout)@@ -306,10 +307,10 @@ func WaitForActiveTunnel(ctx context.Context, envID string, timeout time.Duratiofor {select {case <-waitCtx.Done():- return nil, false+ return mo.None[*AgentTunnel]()case <-ticker.C:- if tunnel, ok := GetActiveTunnel(envID); ok {- return tunnel, true+ if tunnel, ok := GetActiveTunnel(envID).Get(); ok {+ return mo.Some(tunnel)}}}@@ -317,7 +318,7 @@ func WaitForActiveTunnel(ctx context.Context, envID string, timeout time.Duratio// RequestTunnelAndWait marks an edge environment as needed and waits for the// agent to establish a live tunnel.-func RequestTunnelAndWait(ctx context.Context, envID string, demandTTL, timeout time.Duration) (*AgentTunnel, bool) {+func RequestTunnelAndWait(ctx context.Context, envID string, demandTTL, timeout time.Duration) mo.Option[*AgentTunnel] {TouchTunnelDemand(envID, demandTTL)return WaitForActiveTunnel(ctx, envID, timeout)}@@ -326,7 +327,7 @@ func RequestTunnelAndWait(ctx context.Context, envID string, demandTTL, timeout// This is for service-level calls that need to route through the tunnel.// Returns (statusCode, responseBody, error)func DoRequest(ctx context.Context, envID, method, path string, body []byte) (int, []byte, error) {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok {return 0, nil, fmt.Errorf("no active tunnel for environment %s", envID)}diff --git a/backend/pkg/libarcane/edge/proxy_test.go b/backend/pkg/libarcane/edge/proxy_test.goindex 1091dbef1..a5c42f37b 100644--- a/backend/pkg/libarcane/edge/proxy_test.go+++ b/backend/pkg/libarcane/edge/proxy_test.go@@ -221,7 +221,7 @@ func TestProxyHTTPRequest_GRPCTunnel(t *testing.T) {var tunnel *AgentTunnelrequire.Eventually(t, func() bool {var ok bool- tunnel, ok = GetRegistry().Get(envID)+ tunnel, ok = GetRegistry().Get(envID).Get()return ok && tunnel != nil && !tunnel.Conn.IsClosed()}, time.Second, 10*time.Millisecond)diff --git a/backend/pkg/libarcane/edge/registry.go b/backend/pkg/libarcane/edge/registry.goindex 62bfb6c05..16c8d28eb 100644--- a/backend/pkg/libarcane/edge/registry.go+++ b/backend/pkg/libarcane/edge/registry.go@@ -1,6 +1,8 @@package edgeimport (+ "github.com/samber/mo"+"log/slog""sync""time"@@ -79,11 +81,11 @@ func NewTunnelRegistry() *TunnelRegistry {}// Get retrieves a tunnel by environment ID-func (r *TunnelRegistry) Get(envID string) (*AgentTunnel, bool) {+func (r *TunnelRegistry) Get(envID string) mo.Option[*AgentTunnel] {r.mu.RLock()defer r.mu.RUnlock()tunnel, ok := r.tunnels[envID]- return tunnel, ok+ return mo.TupleToOption(tunnel, ok)}// Register adds a tunnel to the registry, closing any existing tunnel for the same envdiff --git a/backend/pkg/libarcane/edge/registry_test.go b/backend/pkg/libarcane/edge/registry_test.goindex e33724bb7..ca55cb39f 100644--- a/backend/pkg/libarcane/edge/registry_test.go+++ b/backend/pkg/libarcane/edge/registry_test.go@@ -41,13 +41,13 @@ func TestTunnelRegistry(t *testing.T) {r.Register(envID, tunnel)// Get- got, ok := r.Get(envID)+ got, ok := r.Get(envID).Get()assert.True(t, ok)assert.Equal(t, tunnel, got)// Unregisterr.Unregister(envID)- _, ok = r.Get(envID)+ _, ok = r.Get(envID).Get()assert.False(t, ok)// Test Connection Closed after Unregister@@ -71,7 +71,7 @@ func TestTunnelRegistry_RegisterReplace(t *testing.T) {r.Register(envID, tunnel2)// Check replacement- got, ok := r.Get(envID)+ got, ok := r.Get(envID).Get()assert.True(t, ok)assert.Equal(t, tunnel2, got)@@ -106,7 +106,7 @@ func TestTunnelRegistry_RegisterSessionRejectsCompetingAgent(t *testing.T) {assert.False(t, drainPrevious)assert.Equal(t, "another edge agent session is already active", reason)- got, ok := r.Get(envID)+ got, ok := r.Get(envID).Get()assert.True(t, ok)assert.Equal(t, tunnel1, got)assert.False(t, tunnel1.Conn.IsClosed())@@ -137,7 +137,7 @@ func TestTunnelRegistry_RegisterSessionReplacesSameAgentInstance(t *testing.T) {assert.Equal(t, "", reason)assert.True(t, tunnel1.Conn.IsClosed())- got, ok := r.Get(envID)+ got, ok := r.Get(envID).Get()assert.True(t, ok)assert.Equal(t, tunnel2, got)}@@ -161,7 +161,7 @@ func TestTunnelRegistry_CleanupStale(t *testing.T) {removed := r.CleanupStale(5 * time.Minute)assert.Equal(t, 1, removed)- _, ok := r.Get(envID)+ _, ok := r.Get(envID).Get()assert.False(t, ok)assert.True(t, tunnel.Conn.IsClosed())}diff --git a/backend/pkg/libarcane/edge/remenv_test.go b/backend/pkg/libarcane/edge/remenv_test.goindex 99b39cff2..40e4b8d54 100644--- a/backend/pkg/libarcane/edge/remenv_test.go+++ b/backend/pkg/libarcane/edge/remenv_test.go@@ -270,14 +270,14 @@ func newTestRemenvClientInternal(timeout time.Duration) *remenv.Client {return nil}- if _, ok := RequestTunnelAndWait(ctx, envID, DefaultTunnelDemandTTL, DefaultTunnelAcquireTimeout()); ok {+ if _, ok := RequestTunnelAndWait(ctx, envID, DefaultTunnelDemandTTL, DefaultTunnelAcquireTimeout()).Get(); ok {return nil}return fmt.Errorf("edge agent is not connected (no active tunnel)")},DoFunc: func(ctx context.Context, envID, method, path string, headers map[string]string, body []byte) (*remenv.Response, error) {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok {return nil, fmt.Errorf("no active tunnel for environment %s", envID)}@@ -438,7 +438,7 @@ func TestRemenvClient_EdgeWithGRPCTunnel(t *testing.T) {}()require.Eventually(t, func() bool {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()return ok && tunnel != nil && !tunnel.Conn.IsClosed()}, time.Second, 10*time.Millisecond)diff --git a/backend/pkg/libarcane/edge/server.go b/backend/pkg/libarcane/edge/server.goindex 32b3bc2c9..a09d8cf21 100644--- a/backend/pkg/libarcane/edge/server.go+++ b/backend/pkg/libarcane/edge/server.go@@ -16,6 +16,7 @@ import ("github.com/google/uuid""github.com/gorilla/websocket""github.com/labstack/echo/v4"+ "github.com/samber/mo""google.golang.org/grpc""google.golang.org/grpc/codes""google.golang.org/grpc/credentials"@@ -290,7 +291,7 @@ func (s *TunnelServer) Connect(stream grpc.BidiStreamingServer[tunnelpb.AgentMesreturn status.Error(codes.Unauthenticated, "first message must be register")}- envID, ok := resolvedEnvironmentIDFromContextInternal(ctx)+ envID, ok := resolvedEnvironmentIDFromContextInternal(ctx).Get()if !ok || envID == "" {token := strings.TrimSpace(register.GetAgentToken())if token == "" {@@ -666,17 +667,17 @@ func (s *contextualServerStream) Context() context.Context {return s.ctx}-func resolvedEnvironmentIDFromContextInternal(ctx context.Context) (string, bool) {+func resolvedEnvironmentIDFromContextInternal(ctx context.Context) mo.Option[string] {if ctx == nil {- return "", false+ return mo.None[string]()}envID, ok := ctx.Value(resolvedEnvironmentIDKey{}).(string)if !ok || strings.TrimSpace(envID) == "" {- return "", false+ return mo.None[string]()}- return envID, true+ return mo.Some(envID)}func (s *TunnelServer) requireCertificateIdentityInternal(state *tls.ConnectionState, envID string) error {diff --git a/backend/pkg/libarcane/edge/server_test.go b/backend/pkg/libarcane/edge/server_test.goindex fb40a7bf0..2053c2417 100644--- a/backend/pkg/libarcane/edge/server_test.go+++ b/backend/pkg/libarcane/edge/server_test.go@@ -82,7 +82,7 @@ func TestTunnelServer_HandleConnect(t *testing.T) {var tunnel *AgentTunnelrequire.Eventually(t, func() bool {var ok bool- tunnel, ok = reg.Get("env-connected")+ tunnel, ok = reg.Get("env-connected").Get()return ok && tunnel != nil && tunnel.SessionID != ""}, time.Second, 10*time.Millisecond)assert.Equal(t, "agent-connected", tunnel.AgentInstance)@@ -644,7 +644,7 @@ func TestTunnelServer_ManageConnectedTunnel_RegistersBeforeSendingGRPCRegisterReconn := ®isterResponseOrderConn{recvErr: io.EOF}conn.sendHook = func(msg *TunnelMessage) error {require.Equal(t, MessageTypeRegisterResponse, msg.Type)- _, ok := server.registry.Get(envID)+ _, ok := server.registry.Get(envID).Get()assert.True(t, ok, "gRPC tunnel should already be registered when the register response is sent")return nil}@@ -652,6 +652,6 @@ func TestTunnelServer_ManageConnectedTunnel_RegistersBeforeSendingGRPCRegisterRetunnel := NewAgentTunnelWithConn(envID, conn)server.manageConnectedTunnel(context.Background(), context.Background(), tunnel)- _, ok := server.registry.Get(envID)+ _, ok := server.registry.Get(envID).Get()assert.False(t, ok)}diff --git a/backend/pkg/libarcane/edge/transport.go b/backend/pkg/libarcane/edge/transport.goindex 44abb6c13..adda5ed75 100644--- a/backend/pkg/libarcane/edge/transport.go+++ b/backend/pkg/libarcane/edge/transport.go@@ -1,6 +1,8 @@package edgeimport (+ "github.com/samber/mo"+"net/url""strings""time"@@ -152,27 +154,27 @@ func UsePollEdgeTransport(cfg *Config) bool {}// GetActiveTunnelTransport returns the currently active tunnel transport for an environment.-func GetActiveTunnelTransport(envID string) (string, bool) {- tunnel, ok := GetRegistry().Get(envID)+func GetActiveTunnelTransport(envID string) mo.Option[string] {+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {- return "", false+ return mo.None[string]()}switch tunnel.Conn.(type) {case *GRPCManagerTunnelConn, *GRPCAgentTunnelConn:- return EdgeTransportGRPC, true+ return mo.Some(EdgeTransportGRPC)case *TunnelConn:- return EdgeTransportWebSocket, true+ return mo.Some(EdgeTransportWebSocket)default:- return "", false+ return mo.None[string]()}}// GetTunnelRuntimeState returns live metadata for an active tunnel.-func GetTunnelRuntimeState(envID string) (*TunnelRuntimeState, bool) {- tunnel, ok := GetRegistry().Get(envID)+func GetTunnelRuntimeState(envID string) mo.Option[*TunnelRuntimeState] {+ tunnel, ok := GetRegistry().Get(envID).Get()if !ok || tunnel == nil || tunnel.Conn == nil || tunnel.Conn.IsClosed() {- return nil, false+ return mo.None[*TunnelRuntimeState]()}state := &TunnelRuntimeState{}@@ -192,5 +194,5 @@ func GetTunnelRuntimeState(envID string) (*TunnelRuntimeState, bool) {state.Capabilities = append([]string(nil), tunnel.Capabilities...)state.State = tunnel.State- return state, true+ return mo.Some(state)}diff --git a/backend/pkg/libarcane/edge/transport_test.go b/backend/pkg/libarcane/edge/transport_test.goindex 696cede01..f9c04ef2b 100644--- a/backend/pkg/libarcane/edge/transport_test.go+++ b/backend/pkg/libarcane/edge/transport_test.go@@ -65,7 +65,7 @@ func TestUsePollEdgeTransport(t *testing.T) {func TestGetActiveTunnelTransport(t *testing.T) {t.Run("returns false when tunnel is missing", func(t *testing.T) {- transport, ok := GetActiveTunnelTransport("env-missing")+ transport, ok := GetActiveTunnelTransport("env-missing").Get()assert.False(t, ok)assert.Equal(t, "", transport)})@@ -78,7 +78,7 @@ func TestGetActiveTunnelTransport(t *testing.T) {tunnel := NewAgentTunnelWithConn(envID, NewGRPCManagerTunnelConn(nil))GetRegistry().Register(envID, tunnel)- transport, ok := GetActiveTunnelTransport(envID)+ transport, ok := GetActiveTunnelTransport(envID).Get()assert.True(t, ok)assert.Equal(t, EdgeTransportGRPC, transport)})@@ -94,7 +94,7 @@ func TestGetActiveTunnelTransport(t *testing.T) {tunnel := newWebSocketAgentTunnel(envID, conn)GetRegistry().Register(envID, tunnel)- transport, ok := GetActiveTunnelTransport(envID)+ transport, ok := GetActiveTunnelTransport(envID).Get()assert.True(t, ok)assert.Equal(t, EdgeTransportWebSocket, transport)})@@ -108,7 +108,7 @@ func TestGetActiveTunnelTransport(t *testing.T) {_ = tunnel.Conn.Close()GetRegistry().Register(envID, tunnel)- transport, ok := GetActiveTunnelTransport(envID)+ transport, ok := GetActiveTunnelTransport(envID).Get()assert.False(t, ok)assert.Equal(t, "", transport)})@@ -121,7 +121,7 @@ func TestGetActiveTunnelTransport(t *testing.T) {tunnel := NewAgentTunnelWithConn(envID, &unknownTunnelConn{})GetRegistry().Register(envID, tunnel)- transport, ok := GetActiveTunnelTransport(envID)+ transport, ok := GetActiveTunnelTransport(envID).Get()assert.False(t, ok)assert.Equal(t, "", transport)})@@ -129,7 +129,7 @@ func TestGetActiveTunnelTransport(t *testing.T) {func TestGetTunnelRuntimeState(t *testing.T) {t.Run("returns false when tunnel is missing", func(t *testing.T) {- state, ok := GetTunnelRuntimeState("env-missing-runtime")+ state, ok := GetTunnelRuntimeState("env-missing-runtime").Get()assert.False(t, ok)assert.Nil(t, state)})@@ -146,7 +146,7 @@ func TestGetTunnelRuntimeState(t *testing.T) {tunnel.Capabilities = []string{"container.list"}GetRegistry().Register(envID, tunnel)- state, ok := GetTunnelRuntimeState(envID)+ state, ok := GetTunnelRuntimeState(envID).Get()assert.True(t, ok)if assert.NotNil(t, state) {assert.Equal(t, EdgeTransportGRPC, state.Transport)@@ -168,7 +168,7 @@ func TestGetTunnelRuntimeState(t *testing.T) {_ = tunnel.Conn.Close()GetRegistry().Register(envID, tunnel)- state, ok := GetTunnelRuntimeState(envID)+ state, ok := GetTunnelRuntimeState(envID).Get()assert.False(t, ok)assert.Nil(t, state)})@@ -405,7 +405,7 @@ func waitForBenchmarkTunnel(b *testing.B, envID string) *AgentTunnel {deadline := time.Now().Add(2 * time.Second)for time.Now().Before(deadline) {- tunnel, ok := GetRegistry().Get(envID)+ tunnel, ok := GetRegistry().Get(envID).Get()if ok && tunnel != nil {return tunnel}diff --git a/backend/pkg/libarcane/inspect_compat.go b/backend/pkg/libarcane/inspect_compat.goindex 0272533b2..54459bcde 100644--- a/backend/pkg/libarcane/inspect_compat.go+++ b/backend/pkg/libarcane/inspect_compat.go@@ -17,6 +17,7 @@ import (containertypes "github.com/moby/moby/api/types/container"networktypes "github.com/moby/moby/api/types/network""github.com/moby/moby/client"+ "github.com/samber/mo")// WrapDockerAPIClientForInspectCompatibility wraps a Docker API client so@@ -231,16 +232,16 @@ func normalizeContainerInspectRawJSONInternal(raw []byte) ([]byte, bool, error)changed := false- networkSettings, ok := asMapInternal(payload["NetworkSettings"])+ networkSettings, ok := asMapInternal(payload["NetworkSettings"]).Get()if ok {changed = normalizeAddressStringFieldInternal(networkSettings, "Gateway") || changedchanged = normalizeAddressStringFieldInternal(networkSettings, "IPv6Gateway") || changedchanged = normalizeAddressWithPrefixFieldInternal(networkSettings, "IPAddress", "IPPrefixLen") || changedchanged = normalizeAddressWithPrefixFieldInternal(networkSettings, "GlobalIPv6Address", "GlobalIPv6PrefixLen") || changed- if networks, ok := asMapInternal(networkSettings["Networks"]); ok {+ if networks, ok := asMapInternal(networkSettings["Networks"]).Get(); ok {for _, endpointAny := range networks {- endpoint, ok := asMapInternal(endpointAny)+ endpoint, ok := asMapInternal(endpointAny).Get()if !ok {continue}@@ -250,7 +251,7 @@ func normalizeContainerInspectRawJSONInternal(raw []byte) ([]byte, bool, error)changed = normalizeAddressWithPrefixFieldInternal(endpoint, "IPAddress", "IPPrefixLen") || changedchanged = normalizeAddressWithPrefixFieldInternal(endpoint, "GlobalIPv6Address", "GlobalIPv6PrefixLen") || changed- if ipam, ok := asMapInternal(endpoint["IPAMConfig"]); ok {+ if ipam, ok := asMapInternal(endpoint["IPAMConfig"]).Get(); ok {changed = normalizeAddressStringFieldInternal(ipam, "IPv4Address") || changedchanged = normalizeAddressStringFieldInternal(ipam, "IPv6Address") || changedchanged = normalizeAddressStringSliceFieldInternal(ipam, "LinkLocalIPs") || changed@@ -278,7 +279,7 @@ func normalizeNetworkListRawJSONInternal(raw []byte) ([]byte, bool, error) {changed := falsefor _, item := range payload {- networkPayload, ok := asMapInternal(item)+ networkPayload, ok := asMapInternal(item).Get()if !ok {continue}@@ -316,10 +317,10 @@ func normalizeNetworkInspectRawJSONInternal(raw []byte) ([]byte, bool, error) {func normalizeNetworkObjectInternal(payload map[string]any) bool {changed := false- if ipam, ok := asMapInternal(payload["IPAM"]); ok {- if configs, ok := asSliceInternal(ipam["Config"]); ok {+ if ipam, ok := asMapInternal(payload["IPAM"]).Get(); ok {+ if configs, ok := asSliceInternal(ipam["Config"]).Get(); ok {for _, configAny := range configs {- config, ok := asMapInternal(configAny)+ config, ok := asMapInternal(configAny).Get()if !ok {continue}@@ -330,9 +331,9 @@ func normalizeNetworkObjectInternal(payload map[string]any) bool {}}}- if containers, ok := asMapInternal(payload["Containers"]); ok {+ if containers, ok := asMapInternal(payload["Containers"]).Get(); ok {for _, endpointAny := range containers {- endpoint, ok := asMapInternal(endpointAny)+ endpoint, ok := asMapInternal(endpointAny).Get()if !ok {continue}@@ -350,7 +351,7 @@ func normalizeAddressStringFieldInternal(obj map[string]any, key string) bool {return false}- normalized, changed := normalizeAddressStringInternal(raw)+ normalized, changed := normalizeAddressStringInternal(raw).Get()if !changed {return false}@@ -398,7 +399,7 @@ func normalizeAddressWithPrefixFieldInternal(obj map[string]any, addrKey, prefix}func normalizeAddressStringSliceFieldInternal(obj map[string]any, key string) bool {- values, ok := asSliceInternal(obj[key])+ values, ok := asSliceInternal(obj[key]).Get()if !ok {return false}@@ -409,7 +410,7 @@ func normalizeAddressStringSliceFieldInternal(obj map[string]any, key string) boif !ok {continue}- normalized, fieldChanged := normalizeAddressStringInternal(raw)+ normalized, fieldChanged := normalizeAddressStringInternal(raw).Get()if !fieldChanged {continue}@@ -424,7 +425,7 @@ func normalizeAddressStringSliceFieldInternal(obj map[string]any, key string) bo}func normalizeAuxiliaryAddressesInternal(obj map[string]any, key string) bool {- auxMap, ok := asMapInternal(obj[key])+ auxMap, ok := asMapInternal(obj[key]).Get()if !ok {return false}@@ -435,7 +436,7 @@ func normalizeAuxiliaryAddressesInternal(obj map[string]any, key string) bool {if !ok {continue}- normalized, fieldChanged := normalizeAddressStringInternal(raw)+ normalized, fieldChanged := normalizeAddressStringInternal(raw).Get()if !fieldChanged {continue}@@ -474,22 +475,28 @@ func normalizePrefixStringFieldInternal(obj map[string]any, key string) bool {return true}-func normalizeAddressStringInternal(raw string) (string, bool) {+func normalizeAddressStringInternal(raw string) mo.Option[string] {trimmed := strings.TrimSpace(raw)if trimmed == "" {- return raw, false+ return mo.None[string]()}if _, err := netip.ParseAddr(trimmed); err == nil {- return trimmed, trimmed != raw+ if trimmed != raw {+ return mo.Some(trimmed)+ }+ return mo.None[string]()}prefix, err := netip.ParsePrefix(trimmed)if err != nil {- return raw, false+ return mo.None[string]()}normalized := prefix.Addr().String()- return normalized, normalized != raw+ if normalized != raw {+ return mo.Some(normalized)+ }+ return mo.None[string]()}func prefixLenMissingInternal(value any) bool {@@ -516,14 +523,14 @@ func prefixLenMissingInternal(value any) bool {}}-func asMapInternal(value any) (map[string]any, bool) {- out, ok := value.(map[string]any)- return out, ok+func asMapInternal(value any) mo.Option[map[string]any] {+ mapped, ok := value.(map[string]any)+ return mo.TupleToOption(mapped, ok)}-func asSliceInternal(value any) ([]any, bool) {- out, ok := value.([]any)- return out, ok+func asSliceInternal(value any) mo.Option[[]any] {+ slice, ok := value.([]any)+ return mo.TupleToOption(slice, ok)}func buildNetworkListQueryInternal(options client.NetworkListOptions) (url.Values, error) {diff --git a/backend/pkg/libarcane/inspect_compat_test.go b/backend/pkg/libarcane/inspect_compat_test.goindex a736070f2..d9a92a5fb 100644--- a/backend/pkg/libarcane/inspect_compat_test.go+++ b/backend/pkg/libarcane/inspect_compat_test.go@@ -90,7 +90,7 @@ func TestNormalizeContainerInspectRawJSONInternal_NormalizesTopLevelNetworkSettipayload := map[string]any{}require.NoError(t, json.Unmarshal(normalized, &payload))- networkSettings, ok := asMapInternal(payload["NetworkSettings"])+ networkSettings, ok := asMapInternal(payload["NetworkSettings"]).Get()require.True(t, ok)assert.Equal(t, "172.18.0.1", networkSettings["Gateway"])assert.Equal(t, "172.18.0.20", networkSettings["IPAddress"])@@ -200,7 +200,7 @@ func TestNormalizeNetworkListRawJSONInternal(t *testing.T) {}func TestNormalizeAddressStringInternal_TrimsWhitespaceAroundValidAddress(t *testing.T) {- normalized, changed := normalizeAddressStringInternal(" 172.18.0.1 ")+ normalized, changed := normalizeAddressStringInternal(" 172.18.0.1 ").Get()assert.True(t, changed)assert.Equal(t, "172.18.0.1", normalized)}diff --git a/backend/pkg/libarcane/startup/runtime_identity.go b/backend/pkg/libarcane/startup/runtime_identity.goindex f8aa8d69b..589edb292 100644--- a/backend/pkg/libarcane/startup/runtime_identity.go+++ b/backend/pkg/libarcane/startup/runtime_identity.go@@ -9,6 +9,7 @@ import ("strings"pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/samber/mo")const (@@ -232,13 +233,13 @@ func configureRuntimeDockerConfigEnvInternal(cfg *RuntimeIdentityConfig, setenvreturn configDir, nil}-func runtimeIdentitySupplementaryGroupsInternal(dockerHost string, resolveSocketGroup func(string) (uint32, bool)) []uint32 {- socketPath, ok := dockerSocketPathInternal(dockerHost)+func runtimeIdentitySupplementaryGroupsInternal(dockerHost string, resolveSocketGroup func(string) mo.Option[uint32]) []uint32 {+ socketPath, ok := dockerSocketPathInternal(dockerHost).Get()if !ok {return nil}- socketGID, ok := resolveSocketGroup(socketPath)+ socketGID, ok := resolveSocketGroup(socketPath).Get()if !ok {return nil}@@ -246,15 +247,15 @@ func runtimeIdentitySupplementaryGroupsInternal(dockerHost string, resolveSocketreturn []uint32{socketGID}}-func dockerSocketPathInternal(raw string) (string, bool) {+func dockerSocketPathInternal(raw string) mo.Option[string] {value := strings.TrimSpace(raw)if value == "" {- return defaultDockerSocketPath, true+ return mo.Some(defaultDockerSocketPath)}parsed, err := url.Parse(value)if err != nil || parsed.Scheme != "unix" {- return "", false+ return mo.None[string]()}if parsed.Host != "" || parsed.Path != "" {@@ -262,11 +263,11 @@ func dockerSocketPathInternal(raw string) (string, bool) {if !strings.HasPrefix(socketPath, "/") {socketPath = "/" + socketPath}- return filepath.Clean(socketPath), true+ return mo.Some(filepath.Clean(socketPath))}if parsed.Opaque == "" {- return "", false+ return mo.None[string]()}socketPath := strings.TrimPrefix(parsed.Opaque, "//")@@ -274,7 +275,7 @@ func dockerSocketPathInternal(raw string) (string, bool) {socketPath = "/" + socketPath}- return filepath.Clean(socketPath), true+ return mo.Some(filepath.Clean(socketPath))}func prepareWritablePathsInternal(uid int, gid int, mountpoints map[string]struct{}, projectsDir string) error {diff --git a/backend/pkg/libarcane/startup/runtime_identity_linux.go b/backend/pkg/libarcane/startup/runtime_identity_linux.goindex 07605a226..d343c32ed 100644--- a/backend/pkg/libarcane/startup/runtime_identity_linux.go+++ b/backend/pkg/libarcane/startup/runtime_identity_linux.go@@ -10,6 +10,8 @@ import ("os/exec""os/signal""syscall"++ "github.com/samber/mo")func reexecWithRuntimeIdentityInternal(ctx context.Context, req runtimeIdentityRequest) error {@@ -73,16 +75,16 @@ func reexecWithRuntimeIdentityInternal(ctx context.Context, req runtimeIdentityR}}-func resolveSocketGroupInternal(socketPath string) (uint32, bool) {+func resolveSocketGroupInternal(socketPath string) mo.Option[uint32] {info, err := os.Stat(socketPath)if err != nil {- return 0, false+ return mo.None[uint32]()}stat, ok := info.Sys().(*syscall.Stat_t)if !ok {- return 0, false+ return mo.None[uint32]()}- return stat.Gid, true+ return mo.Some(stat.Gid)}diff --git a/backend/pkg/libarcane/startup/runtime_identity_test.go b/backend/pkg/libarcane/startup/runtime_identity_test.goindex c5aecc635..15f46a766 100644--- a/backend/pkg/libarcane/startup/runtime_identity_test.go+++ b/backend/pkg/libarcane/startup/runtime_identity_test.go@@ -7,6 +7,7 @@ import ("strconv""testing"+ "github.com/samber/mo""github.com/stretchr/testify/require")@@ -294,9 +295,9 @@ func TestRuntimeIdentitySupplementaryGroups(t *testing.T) {t.Run("maps default docker socket group when docker host unset", func(t *testing.T) {groups := runtimeIdentitySupplementaryGroupsInternal("",- func(socketPath string) (uint32, bool) {+ func(socketPath string) mo.Option[uint32] {require.Equal(t, defaultDockerSocketPath, socketPath)- return 997, true+ return mo.Some(uint32(997))},)@@ -306,9 +307,9 @@ func TestRuntimeIdentitySupplementaryGroups(t *testing.T) {t.Run("maps custom unix docker host socket group", func(t *testing.T) {groups := runtimeIdentitySupplementaryGroupsInternal("unix:///tmp/docker.sock",- func(socketPath string) (uint32, bool) {+ func(socketPath string) mo.Option[uint32] {require.Equal(t, "/tmp/docker.sock", socketPath)- return 998, true+ return mo.Some(uint32(998))},)@@ -320,9 +321,9 @@ func TestRuntimeIdentitySupplementaryGroups(t *testing.T) {groups := runtimeIdentitySupplementaryGroupsInternal("tcp://docker:2375",- func(string) (uint32, bool) {+ func(string) mo.Option[uint32] {called = true- return 0, false+ return mo.None[uint32]()},)@@ -333,7 +334,7 @@ func TestRuntimeIdentitySupplementaryGroups(t *testing.T) {t.Run("skips socket group when socket lookup fails", func(t *testing.T) {groups := runtimeIdentitySupplementaryGroupsInternal("unix:///tmp/missing.sock",- func(string) (uint32, bool) { return 0, false },+ func(string) mo.Option[uint32] { return mo.None[uint32]() },)require.Nil(t, groups)diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine.go b/backend/pkg/libarcane/swarm/stack_deploy_engine.goindex 0c4e8c554..209ca0443 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine.go@@ -25,6 +25,7 @@ import ("github.com/moby/moby/api/types/network""github.com/moby/moby/api/types/swarm"dockerclient "github.com/moby/moby/client"+ "github.com/samber/mo")type resourceMeta struct {@@ -1090,7 +1091,7 @@ func convertIPAM(cfg composegotypes.IPAMConfig) *network.IPAM {}subnet := parsePrefix(pool.Subnet)ipRange := parsePrefix(pool.IPRange)- gateway, _ := parseAddr(pool.Gateway)+ gateway := parseAddr(pool.Gateway).OrEmpty()pools = append(pools, network.IPAMConfig{Subnet: subnet,Gateway: gateway,@@ -1109,7 +1110,7 @@ func parseIPList(values []string) []netip.Addr {}out := make([]netip.Addr, 0, len(values))for _, value := range values {- addr, ok := parseAddr(value)+ addr, ok := parseAddr(value).Get()if ok {out = append(out, addr)}@@ -1117,16 +1118,16 @@ func parseIPList(values []string) []netip.Addr {return out}-func parseAddr(value string) (netip.Addr, bool) {+func parseAddr(value string) mo.Option[netip.Addr] {value = strings.TrimSpace(value)if value == "" {- return netip.Addr{}, false+ return mo.None[netip.Addr]()}addr, err := netip.ParseAddr(value)if err != nil {- return netip.Addr{}, false+ return mo.None[netip.Addr]()}- return addr, true+ return mo.Some(addr)}func parsePrefix(value string) netip.Prefix {@@ -1147,7 +1148,7 @@ func parseAuxAddresses(values map[string]string) map[string]netip.Addr {}out := make(map[string]netip.Addr, len(values))for key, value := range values {- if addr, ok := parseAddr(value); ok {+ if addr, ok := parseAddr(value).Get(); ok {out[key] = addr}}@@ -1250,17 +1251,14 @@ func convertFileMode(mode *composegotypes.FileMode) *uint32 {if mode == nil {return nil}- if result, ok := toUint32FromInt64(int64(*mode)); ok {- return &result- }- return nil+ return toUint32FromInt64(int64(*mode)).ToPointer()}-func toUint32FromInt64(value int64) (uint32, bool) {+func toUint32FromInt64(value int64) mo.Option[uint32] {if value < 0 || value > int64(^uint32(0)) {- return 0, false+ return mo.None[uint32]()}- return uint32(value), true+ return mo.Some(uint32(value))}func normalizeResolveImageMode(value string) (string, error) {diff --git a/backend/pkg/libarcane/volumehelper/helper.go b/backend/pkg/libarcane/volumehelper/helper.goindex 5a580bcac..7a445ed75 100644--- a/backend/pkg/libarcane/volumehelper/helper.go+++ b/backend/pkg/libarcane/volumehelper/helper.go@@ -13,6 +13,7 @@ import ("github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/mount""github.com/moby/moby/client"+ "github.com/samber/mo")// RuntimeImage describes the Arcane runtime image that can run internal helper@@ -84,7 +85,7 @@ func ResolveHelperImage(ctx context.Context, dockerClient *client.Client) (strin}}- if fallback, ok := ResolveArcaneRuntimeImage(ctx, dockerClient); ok && strings.TrimSpace(fallback.Image) != "" {+ if fallback, ok := ResolveArcaneRuntimeImage(ctx, dockerClient).Get(); ok && strings.TrimSpace(fallback.Image) != "" {return fallback.Image, nil}@@ -93,11 +94,11 @@ func ResolveHelperImage(ctx context.Context, dockerClient *client.Client) (strin// ResolveArcaneRuntimeImage resolves the current Arcane or Arcane agent image// so internal helper commands can run without pulling an external helper image.-func ResolveArcaneRuntimeImage(ctx context.Context, dockerClient *client.Client) (RuntimeImage, bool) {+func ResolveArcaneRuntimeImage(ctx context.Context, dockerClient *client.Client) mo.Option[RuntimeImage] {hostname, _ := os.Hostname()if hostname != "" {if inspect, err := libarcane.ContainerInspectWithCompatibility(ctx, dockerClient, hostname, client.ContainerInspectOptions{}); err == nil && inspect.Container.Config != nil && strings.TrimSpace(inspect.Container.Config.Image) != "" {- return buildRuntimeImageInternal(inspect.Container.Config.Image, inspect.Container.Config.Entrypoint, inspect.Container.Config.Cmd, "hostname"), true+ return mo.Some(buildRuntimeImageInternal(inspect.Container.Config.Image, inspect.Container.Config.Entrypoint, inspect.Container.Config.Cmd, "hostname"))}}@@ -109,18 +110,18 @@ func ResolveArcaneRuntimeImage(ctx context.Context, dockerClient *client.Client)continue}- if resolved, ok := resolveRuntimeImageFromContainersInternal(ctx, dockerClient, containers.Items, label, true); ok {- return resolved, true+ if resolved, ok := resolveRuntimeImageFromContainersInternal(ctx, dockerClient, containers.Items, label, true).Get(); ok {+ return mo.Some(resolved)}- if resolved, ok := resolveRuntimeImageFromContainersInternal(ctx, dockerClient, containers.Items, label, false); ok {- return resolved, true+ if resolved, ok := resolveRuntimeImageFromContainersInternal(ctx, dockerClient, containers.Items, label, false).Get(); ok {+ return mo.Some(resolved)}}- return RuntimeImage{}, false+ return mo.None[RuntimeImage]()}-func resolveRuntimeImageFromContainersInternal(ctx context.Context, dockerClient *client.Client, containers []container.Summary, label string, runningOnly bool) (RuntimeImage, bool) {+func resolveRuntimeImageFromContainersInternal(ctx context.Context, dockerClient *client.Client, containers []container.Summary, label string, runningOnly bool) mo.Option[RuntimeImage] {source := "arcane-label"if strings.Contains(label, ".agent=") {source = "arcane-agent-label"@@ -135,14 +136,14 @@ func resolveRuntimeImageFromContainersInternal(ctx context.Context, dockerClient}inspect, err := libarcane.ContainerInspectWithCompatibility(ctx, dockerClient, c.ID, client.ContainerInspectOptions{})if err == nil && inspect.Container.Config != nil && strings.TrimSpace(inspect.Container.Config.Image) != "" {- return buildRuntimeImageInternal(inspect.Container.Config.Image, inspect.Container.Config.Entrypoint, inspect.Container.Config.Cmd, source), true+ return mo.Some(buildRuntimeImageInternal(inspect.Container.Config.Image, inspect.Container.Config.Entrypoint, inspect.Container.Config.Cmd, source))}if strings.TrimSpace(c.Image) != "" {- return buildRuntimeImageInternal(c.Image, nil, nil, source), true+ return mo.Some(buildRuntimeImageInternal(c.Image, nil, nil, source))}}- return RuntimeImage{}, false+ return mo.None[RuntimeImage]()}func buildRuntimeImageInternal(image string, entrypoint []string, command []string, source string) RuntimeImage {diff --git a/backend/pkg/projects/container_mounts.go b/backend/pkg/projects/container_mounts.goindex e1fab89ee..7656dac0b 100644--- a/backend/pkg/projects/container_mounts.go+++ b/backend/pkg/projects/container_mounts.go@@ -58,7 +58,7 @@ func GetHostPathForContainerPath(ctx context.Context, dockerCli *client.Client,return "", err}- if host, ok := ResolveHostPath(mounts, containerPath); ok {+ if host, ok := ResolveHostPath(mounts, containerPath).Get(); ok {return host, nil}diff --git a/backend/pkg/projects/custom_labels.go b/backend/pkg/projects/custom_labels.goindex 41d080d85..861f83e8d 100644--- a/backend/pkg/projects/custom_labels.go+++ b/backend/pkg/projects/custom_labels.go@@ -149,7 +149,7 @@ func extractArcaneComposeMetadata(project *composetypes.Project) ArcaneComposeMe}func parseArcaneBlockInternal(block any) (IconSet, []string) {- arcaneBlock, ok := utils.AsStringMap(block)+ arcaneBlock, ok := utils.AsStringMap(block).Get()if !ok {return IconSet{}, nil}@@ -344,7 +344,7 @@ func parseIncludePaths(composeFilePath string) ([]string, error) {// It supports both map[string]string and []string label formats.func FindArcaneIconSet(labels any) IconSet {iconSet := IconSet{}- if labelMap, ok := utils.AsStringMap(labels); ok {+ if labelMap, ok := utils.AsStringMap(labels).Get(); ok {for key, value := range labelMap {assignArcaneIconValueInternal(&iconSet, key, utils.ToString(value))}diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex a131703ab..537d20006 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -14,6 +14,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/config"pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/types/v2/project"+ "github.com/samber/mo""go.yaml.in/yaml/v4")@@ -51,7 +52,7 @@ func resolveProjectsDirectoryPath(projectsDirectory string) string {return filepath.Clean(projectsDirectory)}- if backendRoot, ok := findBackendModuleRoot(); ok {+ if backendRoot, ok := findBackendModuleRoot().Get(); ok {return filepath.Clean(filepath.Join(backendRoot, projectsDirectory))}@@ -63,10 +64,10 @@ func resolveProjectsDirectoryPath(projectsDirectory string) string {return filepath.Clean(projectsDirectory)}-func findBackendModuleRoot() (string, bool) {+func findBackendModuleRoot() mo.Option[string] {cwd, err := os.Getwd()if err != nil {- return "", false+ return mo.None[string]()}candidates := []string{@@ -76,11 +77,11 @@ func findBackendModuleRoot() (string, bool) {for _, candidate := range candidates {if isBackendModuleRoot(candidate) {- return candidate, true+ return mo.Some(candidate)}}- return "", false+ return mo.None[string]()}func isBackendModuleRoot(path string) bool {diff --git a/backend/pkg/projects/includes.go b/backend/pkg/projects/includes.goindex a0afc1a42..298c0a368 100644--- a/backend/pkg/projects/includes.go+++ b/backend/pkg/projects/includes.go@@ -9,6 +9,7 @@ import ("strings"pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/samber/mo""go.yaml.in/yaml/v4")@@ -50,12 +51,12 @@ func NewMissingIncludeStubLoader(projectPath string) *MissingIncludeStubLoader {}func (l *MissingIncludeStubLoader) Accept(path string) bool {- _, ok := l.resolveMissingIncludeInternal(path)+ _, ok := l.resolveMissingIncludeInternal(path).Get()return ok}func (l *MissingIncludeStubLoader) Load(_ context.Context, path string) (string, error) {- validatedPath, ok := l.resolveMissingIncludeInternal(path)+ validatedPath, ok := l.resolveMissingIncludeInternal(path).Get()if !ok {return "", fmt.Errorf("include file is not eligible for validation stub: %s", path)}@@ -95,19 +96,19 @@ func (l *MissingIncludeStubLoader) Dir(path string) string {return filepath.Dir(path)}-func (l *MissingIncludeStubLoader) resolveMissingIncludeInternal(path string) (string, bool) {+func (l *MissingIncludeStubLoader) resolveMissingIncludeInternal(path string) mo.Option[string] {validatedPath, err := ValidateIncludePathForWrite(l.projectPath, path)if err != nil {- return "", false+ return mo.None[string]()}if _, err := os.Stat(validatedPath); err == nil {- return "", false+ return mo.None[string]()} else if !errors.Is(err, os.ErrNotExist) {- return "", false+ return mo.None[string]()}- return validatedPath, true+ return mo.Some(validatedPath)}// Cleanup removes any temporary validation stub files created by the loader.diff --git a/backend/pkg/projects/load.go b/backend/pkg/projects/load.goindex 71311ae8c..74b36a65f 100644--- a/backend/pkg/projects/load.go+++ b/backend/pkg/projects/load.go@@ -21,6 +21,7 @@ import ("github.com/docker/compose/v5/pkg/api""github.com/docker/go-units""github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/samber/mo")// ProjectFileCandidates enumerates known project files: base compose names,@@ -416,7 +417,7 @@ func ResolveRelativeProjectPaths(project *composetypes.Project, workdir string)for i := range service.Volumes {v := &service.Volumes[i]if v.Type == composetypes.VolumeTypeBind {- if resolved, ok := resolvePathRelative(workdir, v.Source); ok {+ if resolved, ok := resolvePathRelative(workdir, v.Source).Get(); ok {v.Source = resolvedmodified = true}@@ -428,23 +429,23 @@ func ResolveRelativeProjectPaths(project *composetypes.Project, workdir string)}for name, secret := range project.Secrets {- if resolved, ok := resolvePathRelative(workdir, secret.File); ok {+ if resolved, ok := resolvePathRelative(workdir, secret.File).Get(); ok {secret.File = resolvedproject.Secrets[name] = secret}}for name, config := range project.Configs {- if resolved, ok := resolvePathRelative(workdir, config.File); ok {+ if resolved, ok := resolvePathRelative(workdir, config.File).Get(); ok {config.File = resolvedproject.Configs[name] = config}}}-func resolvePathRelative(workdir, candidate string) (string, bool) {+func resolvePathRelative(workdir, candidate string) mo.Option[string] {if candidate == "" || filepath.IsAbs(candidate) || workdir == "" {- return filepath.Clean(candidate), false+ return mo.None[string]()}- return filepath.Clean(filepath.Join(workdir, candidate)), true+ return mo.Some(filepath.Clean(filepath.Join(workdir, candidate)))}diff --git a/backend/pkg/projects/path_mapper.go b/backend/pkg/projects/path_mapper.goindex 7ebc4b5b8..506735884 100644--- a/backend/pkg/projects/path_mapper.go+++ b/backend/pkg/projects/path_mapper.go@@ -6,6 +6,7 @@ import ("strings"composetypes "github.com/compose-spec/compose-go/v2/types"+ "github.com/samber/mo")// HostMount is one container→host mount (bind or named volume) from Arcane's own@@ -62,8 +63,8 @@ func NewPathMapperFromMounts(mounts []HostMount) *PathMapper {// ResolveHostPath returns the host-side path for containerPath by selecting the// longest-prefix mount whose Destination contains it and appending the trailing relative-// segment to that mount's Source. ok is false when no mount contains the path.-func ResolveHostPath(mounts []HostMount, containerPath string) (string, bool) {+// segment to that mount's Source. It returns None when no mount contains the path.+func ResolveHostPath(mounts []HostMount, containerPath string) mo.Option[string] {cleaned := filepath.Clean(containerPath)var (@@ -84,7 +85,7 @@ func ResolveHostPath(mounts []HostMount, containerPath string) (string, bool) {}}if bestLen < 0 {- return "", false+ return mo.None[string]()}host := bestSource@@ -101,7 +102,7 @@ func ResolveHostPath(mounts []HostMount, containerPath string) (string, bool) {}host += bestRel}- return host, true+ return mo.Some(host)}// ContainerToHost translates a container path to host path@@ -113,7 +114,7 @@ func (pm *PathMapper) ContainerToHost(containerPath string) (string, error) {// Auto-discovery mode: resolve against Arcane's real mount table so nested,// independently bind-mounted directories map to their own host path.if len(pm.mounts) > 0 {- if host, ok := ResolveHostPath(pm.mounts, containerPath); ok {+ if host, ok := ResolveHostPath(pm.mounts, containerPath).Get(); ok {return host, nil}return filepath.Clean(containerPath), nil // outside all mounts: leave unchangeddiff --git a/backend/pkg/scheduler/job_schedule_integration_test.go b/backend/pkg/scheduler/job_schedule_integration_test.goindex 04ba77d3e..dc39bb23d 100644--- a/backend/pkg/scheduler/job_schedule_integration_test.go+++ b/backend/pkg/scheduler/job_schedule_integration_test.go@@ -29,7 +29,7 @@ func TestDeprecatedImagePollingSchedulePersistsWithoutRuntimeJob(t *testing.T) {jobService.SetScheduler(lifecycleCtx, jobScheduler)jobScheduler.StartScheduler()- _, ok := jobScheduler.GetJobRuntimeState("image-polling")+ _, ok := jobScheduler.GetJobRuntimeState("image-polling").Get()require.False(t, ok)require.Empty(t, jobScheduler.cron.Entries())@@ -45,7 +45,7 @@ func TestDeprecatedImagePollingSchedulePersistsWithoutRuntimeJob(t *testing.T) {require.Equal(t, requestedSchedule, persisted.Value)require.Equal(t, requestedSchedule, settingsService.GetStringSetting(ctx, "pollingInterval", ""))- _, ok = jobScheduler.GetJobRuntimeState("image-polling")+ _, ok = jobScheduler.GetJobRuntimeState("image-polling").Get()require.False(t, ok)require.Empty(t, jobScheduler.cron.Entries())@@ -73,7 +73,7 @@ func TestDeprecatedImagePollingSchedulePersistsWithoutRuntimeJob(t *testing.T) {closeJobScheduleTestDatabaseInternal(t, restartDB)})- _, ok = restartScheduler.GetJobRuntimeState("image-polling")+ _, ok = restartScheduler.GetJobRuntimeState("image-polling").Get()require.False(t, ok)require.Empty(t, restartScheduler.cron.Entries())require.Equal(t, requestedSchedule, restartSettingsService.GetStringSetting(ctx, "pollingInterval", ""))@@ -87,7 +87,7 @@ func TestDeprecatedImagePollingSchedulePersistsWithoutRuntimeJob(t *testing.T) {_, err = restartJobService.UpdateJobSchedules(ctx, jobschedule.Update{PollingInterval: &disabledSchedule})require.NoError(t, err)- _, ok = restartScheduler.GetJobRuntimeState("image-polling")+ _, ok = restartScheduler.GetJobRuntimeState("image-polling").Get()require.False(t, ok)require.Empty(t, restartScheduler.cron.Entries())diff --git a/backend/pkg/scheduler/scheduler.go b/backend/pkg/scheduler/scheduler.goindex 1cc282c7c..96d4356d5 100644--- a/backend/pkg/scheduler/scheduler.go+++ b/backend/pkg/scheduler/scheduler.go@@ -9,6 +9,7 @@ import (schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/robfig/cron/v3"+ "github.com/samber/mo")// cronScheduleParser is the shared parser for all cron settings: six fields@@ -95,31 +96,31 @@ func (js *JobScheduler) RunBusWatcherNow(ctx context.Context, watcherID string)return watcher.RunNow(ctx)}-func (js *JobScheduler) GetJob(jobID string) (schedulertypes.Job, bool) {+func (js *JobScheduler) GetJob(jobID string) mo.Option[schedulertypes.Job] {js.mu.Lock()defer js.mu.Unlock()job, ok := js.jobsByID[jobID]- return job, ok+ return mo.TupleToOption(job, ok)}// GetJobRuntimeState returns the schedule currently installed for a registered job.-func (js *JobScheduler) GetJobRuntimeState(jobID string) (schedulertypes.JobRuntimeState, bool) {+func (js *JobScheduler) GetJobRuntimeState(jobID string) mo.Option[schedulertypes.JobRuntimeState] {js.mu.Lock()defer js.mu.Unlock()if _, ok := js.jobsByID[jobID]; !ok {- return schedulertypes.JobRuntimeState{}, false+ return mo.None[schedulertypes.JobRuntimeState]()}state := schedulertypes.JobRuntimeState{Schedule: js.schedules[jobID]}entryID, ok := js.entryIDs[jobID]if !ok {- return state, true+ return mo.Some(state)}entry := js.cron.Entry(entryID)if entry.ID == 0 {- return state, true+ return mo.Some(state)}state.Scheduled = true@@ -131,7 +132,7 @@ func (js *JobScheduler) GetJobRuntimeState(jobID string) (schedulertypes.JobRuntstate.NextRun = new(nextRun)}- return state, true+ return mo.Some(state)}// HasJob reports whether a job with the given name is currently registered.diff --git a/backend/pkg/scheduler/scheduler_test.go b/backend/pkg/scheduler/scheduler_test.goindex b390ce814..7ac71ba63 100644--- a/backend/pkg/scheduler/scheduler_test.go+++ b/backend/pkg/scheduler/scheduler_test.go@@ -281,7 +281,7 @@ func TestJobScheduler_AddJob_UpsertReplacesEntryWithoutLeaking(t *testing.T) {require.Len(t, js.cron.Entries(), 1)require.NotEqual(t, firstEntry, js.entryIDs[job.Name()])- state, ok := js.GetJobRuntimeState(job.Name())+ state, ok := js.GetJobRuntimeState(job.Name()).Get()require.True(t, ok)require.True(t, state.Scheduled)require.Equal(t, "*/10 * * * * *", state.Schedule)@@ -303,7 +303,7 @@ func TestJobScheduler_AddJob_InvalidRescheduleKeepsExistingEntry(t *testing.T) {require.Equal(t, firstEntry, js.entryIDs[job.Name()])require.Len(t, js.cron.Entries(), 1)- state, ok := js.GetJobRuntimeState(job.Name())+ state, ok := js.GetJobRuntimeState(job.Name()).Get()require.True(t, ok)require.True(t, state.Scheduled)require.Equal(t, "*/5 * * * * *", state.Schedule)diff --git a/backend/pkg/utils/cache/cache_util.go b/backend/pkg/utils/cache/cache_util.goindex 972aa2705..ae6a72258 100644--- a/backend/pkg/utils/cache/cache_util.go+++ b/backend/pkg/utils/cache/cache_util.go@@ -7,6 +7,7 @@ import ("time""github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/samber/mo""golang.org/x/sync/singleflight")@@ -77,11 +78,11 @@ func retryInvalidatedFetchInternal(ctx context.Context, err error) (bool, error)}// Get returns the cached value for key, if present.-func (c *KeyedCache[K, T]) Get(key K) (T, bool) {+func (c *KeyedCache[K, T]) Get(key K) mo.Option[T] {c.mu.RLock()+ defer c.mu.RUnlock()cached, ok := c.entries[key]- c.mu.RUnlock()- return cached, ok+ return mo.TupleToOption(cached, ok)}// Set stores value for key, replacing any existing entry.diff --git a/backend/pkg/utils/cache/cache_util_test.go b/backend/pkg/utils/cache/cache_util_test.goindex 4c119eb5e..abb440d7d 100644--- a/backend/pkg/utils/cache/cache_util_test.go+++ b/backend/pkg/utils/cache/cache_util_test.go@@ -13,25 +13,25 @@ import (func TestKeyedCacheGetSet(t *testing.T) {c := NewKeyed[string, *int]()- if _, ok := c.Get("missing"); ok {+ if _, ok := c.Get("missing").Get(); ok {t.Fatal("expected miss for unset key")}c.Set("hit", new(42))- got, ok := c.Get("hit")+ got, ok := c.Get("hit").Get()if !ok || got == nil || *got != 42 {t.Fatalf("expected cached value 42, got %v (ok=%v)", got, ok)}// Nil values are valid entries and must report as hits.c.Set("nil-entry", nil)- got, ok = c.Get("nil-entry")+ got, ok = c.Get("nil-entry").Get()if !ok || got != nil {t.Fatalf("expected nil hit, got %v (ok=%v)", got, ok)}c.Invalidate("hit")- if _, ok := c.Get("hit"); ok {+ if _, ok := c.Get("hit").Get(); ok {t.Fatal("expected miss after invalidate")}}@@ -297,11 +297,11 @@ func TestKeyedCacheInvalidationDoesNotPublishInFlightFetch(t *testing.T) {t.Fatalf("expected two generation-specific keyed fetches, got %d", got)}- value, ok := c.Get("target")+ value, ok := c.Get("target").Get()if !ok || value != "fresh" {t.Fatalf("expected keyed cache to retain fresh value, got %q (ok=%v)", value, ok)}- _, otherPresent := c.Get("other")+ _, otherPresent := c.Get("other").Get()if otherPresent != test.otherEntryPresent {t.Fatalf("unexpected unrelated entry state: got present=%v, want %v", otherPresent, test.otherEntryPresent)}diff --git a/backend/pkg/utils/cache/ttl.go b/backend/pkg/utils/cache/ttl.goindex 0dd8b4338..347b916ba 100644--- a/backend/pkg/utils/cache/ttl.go+++ b/backend/pkg/utils/cache/ttl.go@@ -3,6 +3,8 @@ package cacheimport ("sync""time"++ "github.com/samber/mo")type entry[V any] struct {@@ -25,15 +27,15 @@ func NewTTL[V any](ttl time.Duration) *TTL[V] {}}-func (c *TTL[V]) Get(key string) (V, bool) {+func (c *TTL[V]) Get(key string) mo.Option[V] {c.mu.RLock()defer c.mu.RUnlock()- e, ok := c.entries[key]+ e, exists := c.entries[key]+ e, ok := mo.TupleToOption(e, exists).Get()if !ok || time.Now().After(e.expiresAt) {- var zero V- return zero, false+ return mo.None[V]()}- return e.value, true+ return mo.Some(e.value)}func (c *TTL[V]) Put(key string, value V) {diff --git a/backend/pkg/utils/jwtclaims/jwt.go b/backend/pkg/utils/jwtclaims/jwt.goindex ca6ab0ba6..29232c598 100644--- a/backend/pkg/utils/jwtclaims/jwt.go+++ b/backend/pkg/utils/jwtclaims/jwt.go@@ -4,8 +4,12 @@ import ("crypto/rand""encoding/base64"json "encoding/json/v2"+ "errors""fmt""strings"++ "github.com/samber/mo"+ "github.com/samber/mo/result")// GetStringClaim extracts a string claim from a map@@ -126,38 +130,43 @@ func CheckOrGenerateJwtSecret(jwtSecret string, requireExplicit bool) []byte {// ParseJWTClaims decodes and unmarshals the payload part of a JWTfunc ParseJWTClaims(idToken string) map[string]any {- parts := strings.Split(idToken, ".")- if len(parts) < 2 {- return nil- }- payload, err := base64.RawURLEncoding.DecodeString(parts[1])- if err != nil {- return nil- }- var claims map[string]any- if err := json.Unmarshal(payload, &claims); err != nil {- return nil- }- return claims+ return result.Pipe3(+ mo.Ok(idToken),+ result.FlatMap(func(token string) mo.Result[[]string] {+ parts := strings.Split(token, ".")+ if len(parts) < 2 {+ return mo.Err[[]string](errors.New("JWT has no payload"))+ }+ return mo.Ok(parts)+ }),+ result.FlatMap(func(parts []string) mo.Result[[]byte] {+ return mo.TupleToResult(base64.RawURLEncoding.DecodeString(parts[1]))+ }),+ result.FlatMap(func(payload []byte) mo.Result[map[string]any] {+ var claims map[string]any+ err := json.Unmarshal(payload, &claims)+ return mo.TupleToResult(claims, err)+ }),+ ).OrElse(nil)}// GetByPath extracts a value from a nested map using a dot-separated path-func GetByPath(m map[string]any, path string) (any, bool) {+func GetByPath(m map[string]any, path string) mo.Option[any] {if m == nil {- return nil, false+ return mo.None[any]()}keys := strings.Split(path, ".")var cur any = mfor _, k := range keys {obj, ok := cur.(map[string]any)if !ok {- return nil, false+ return mo.None[any]()}v, ok := obj[k]if !ok {- return nil, false+ return mo.None[any]()}cur = v}- return cur, true+ return mo.Some(cur)}diff --git a/backend/pkg/utils/ptr_util.go b/backend/pkg/utils/ptr_util.godeleted file mode 100644index d4cdae38e..000000000--- a/backend/pkg/utils/ptr_util.go+++ /dev/null@@ -1,28 +0,0 @@-package utils--import "strings"--func DerefString(p *string) string {- if p == nil {- return ""- }- return *p-}--func StringPtrFromTrimmed(value string) *string {- trimmed := strings.TrimSpace(value)- if trimmed == "" {- return nil- }- return &trimmed-}--func StringPtrEqual(a, b *string) bool {- if a == nil && b == nil {- return true- }- if a == nil || b == nil {- return false- }- return *a == *b-}diff --git a/backend/pkg/utils/strings.go b/backend/pkg/utils/strings.goindex c145006fe..3e02e8c74 100644--- a/backend/pkg/utils/strings.go+++ b/backend/pkg/utils/strings.go@@ -6,6 +6,8 @@ import ("fmt""reflect""strings"++ "github.com/samber/mo")// ToString converts any value to a trimmed string.@@ -50,19 +52,19 @@ func Collect[T any](value any, mapper func(any) T) []T {}// AsStringMap attempts to convert any map-like interface to map[string]any.-func AsStringMap(value any) (map[string]any, bool) {+func AsStringMap(value any) mo.Option[map[string]any] {if value == nil {- return nil, false+ return mo.None[map[string]any]()}switch v := value.(type) {case map[string]any:- return v, true+ return mo.Some(v)case map[string]string:res := make(map[string]any, len(v))for k, val := range v {res[k] = val}- return res, true+ return mo.Some(res)case map[any]any:res := make(map[string]any, len(v))for k, val := range v {@@ -70,7 +72,10 @@ func AsStringMap(value any) (map[string]any, bool) {res[s] = val}}- return res, len(res) > 0+ if len(res) > 0 {+ return mo.Some(res)+ }+ return mo.None[map[string]any]()}// Named map types (e.g. compose-go's types.Labels) don't match the cases above.rv := reflect.ValueOf(value)@@ -79,9 +84,9 @@ func AsStringMap(value any) (map[string]any, bool) {for iter := rv.MapRange(); iter.Next(); {res[iter.Key().String()] = iter.Value().Interface()}- return res, true+ return mo.Some(res)}- return nil, false+ return mo.None[map[string]any]()}// UniqueNonEmptyStrings returns unique, non-empty, trimmed strings.diff --git a/backend/pkg/utils/update_value_util.go b/backend/pkg/utils/update_value_util.goindex 1559d3e79..89637ce94 100644--- a/backend/pkg/utils/update_value_util.go+++ b/backend/pkg/utils/update_value_util.go@@ -1,43 +1,24 @@package utils-// UpdateIfChanged updates the target value if it differs from the new value.-// It returns true if an update occurred.-// Supported types: *string, *bool, **string.-// For *string and *bool targets, if the value is a pointer of the same type,-// the update only happens if the value pointer is not nil.-func UpdateIfChanged(target any, value any) bool {- switch t := target.(type) {- case *string:- if v, ok := value.(string); ok {- if *t != v {- *t = v- return true- }- } else if v, ok := value.(*string); ok && v != nil {- if *t != *v {- *t = *v- return true- }- }- case *bool:- if v, ok := value.(bool); ok {- if *t != v {- *t = v- return true- }- } else if v, ok := value.(*bool); ok && v != nil {- if *t != *v {- *t = *v- return true- }- }- case **string:- if v, ok := value.(*string); ok {- if (*t == nil && v != nil) || (*t != nil && v == nil) || (*t != nil && v != nil && **t != *v) {- *t = v- return true- }- }+import "github.com/samber/mo"++// ApplyChanged updates target when value is present and differs from the current value.+func ApplyChanged[T comparable](target *T, value mo.Option[T]) bool {+ next, ok := value.Get()+ if !ok || *target == next {+ return false+ }++ *target = next+ return true+}++// ApplyNullable updates target to the optional value when it differs from the current value.+func ApplyNullable[T comparable](target **T, value mo.Option[T]) bool {+ if mo.PointerToOption(*target) == value {+ return false}- return false++ *target = value.ToPointer()+ return true}diff --git a/backend/pkg/utils/update_value_util_test.go b/backend/pkg/utils/update_value_util_test.goindex 264d32d72..8de7d87f4 100644--- a/backend/pkg/utils/update_value_util_test.go+++ b/backend/pkg/utils/update_value_util_test.go@@ -3,96 +3,27 @@ package utilsimport ("testing"+ "github.com/samber/mo""github.com/stretchr/testify/assert")-func TestUpdateIfChanged(t *testing.T) {- t.Run("string target with string value", func(t *testing.T) {- target := "initial"- updated := UpdateIfChanged(&target, "new")- assert.True(t, updated)- assert.Equal(t, "new", target)+func TestApplyChanged(t *testing.T) {+ target := "initial"- updated = UpdateIfChanged(&target, "new")- assert.False(t, updated)- assert.Equal(t, "new", target)- })-- t.Run("string target with *string value", func(t *testing.T) {- target := "initial"- newValue := "new"- updated := UpdateIfChanged(&target, &newValue)- assert.True(t, updated)- assert.Equal(t, "new", target)-- updated = UpdateIfChanged(&target, &newValue)- assert.False(t, updated)- assert.Equal(t, "new", target)-- var nilValue *string- updated = UpdateIfChanged(&target, nilValue)- assert.False(t, updated)- assert.Equal(t, "new", target)- })-- t.Run("bool target with bool value", func(t *testing.T) {- target := false- updated := UpdateIfChanged(&target, true)- assert.True(t, updated)- assert.True(t, target)-- updated = UpdateIfChanged(&target, true)- assert.False(t, updated)- assert.True(t, target)- })-- t.Run("bool target with *bool value", func(t *testing.T) {- target := false- newValue := true- updated := UpdateIfChanged(&target, &newValue)- assert.True(t, updated)- assert.True(t, target)-- updated = UpdateIfChanged(&target, &newValue)- assert.False(t, updated)- assert.True(t, target)-- var nilValue *bool- updated = UpdateIfChanged(&target, nilValue)- assert.False(t, updated)- assert.True(t, target)- })-- t.Run("*string target with *string value", func(t *testing.T) {- target := new("initial")- newValue := "new"-- // Update from value to new value- updated := UpdateIfChanged(&target, &newValue)- assert.True(t, updated)- assert.Equal(t, "new", *target)-- // Update with same value- updated = UpdateIfChanged(&target, &newValue)- assert.False(t, updated)- assert.Equal(t, "new", *target)-- // Update to nil- var nilValue *string- updated = UpdateIfChanged(&target, nilValue)- assert.True(t, updated)- assert.Nil(t, target)+ assert.True(t, ApplyChanged(&target, mo.Some("new")))+ assert.Equal(t, "new", target)+ assert.False(t, ApplyChanged(&target, mo.Some("new")))+ assert.False(t, ApplyChanged(&target, mo.None[string]()))+ assert.Equal(t, "new", target)+}- // Update from nil to value- updated = UpdateIfChanged(&target, &newValue)- assert.True(t, updated)- assert.Equal(t, "new", *target)- })+func TestApplyNullable(t *testing.T) {+ target := new("initial")- t.Run("unsupported types", func(t *testing.T) {- target := 10- updated := UpdateIfChanged(&target, 20)- assert.False(t, updated)- assert.Equal(t, 10, target)- })+ assert.True(t, ApplyNullable(&target, mo.Some("new")))+ assert.Equal(t, "new", *target)+ assert.False(t, ApplyNullable(&target, mo.Some("new")))+ assert.True(t, ApplyNullable(&target, mo.None[string]()))+ assert.Nil(t, target)+ assert.False(t, ApplyNullable(&target, mo.None[string]()))}