From 4b06fb77a1b93c2ac5735ca3cbd653483db79d36 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Sat, 10 Oct 2026 11:05:59 +1100 Subject: [PATCH] refactor(controlplane): make layerResource decode into a typed value --- internal/app/controlplane/identity_grants.go | 13 +--- internal/app/controlplane/runtime_config.go | 74 +++++++------------- 2 files changed, 29 insertions(+), 58 deletions(-) diff --git a/internal/app/controlplane/identity_grants.go b/internal/app/controlplane/identity_grants.go index 01bf76a7b..ec3c41473 100644 --- a/internal/app/controlplane/identity_grants.go +++ b/internal/app/controlplane/identity_grants.go @@ -2,7 +2,6 @@ package controlplane import ( "context" - "encoding/json" "fmt" "strings" @@ -75,21 +74,13 @@ func validServices(owner string, services []string) error { // each is its own resource, applies without a restart, and a stored value // replaces the file's outright. func layerCredentials(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, out *config.Config) error { - if err := layerResource(ctx, reader, versions, CredentialBindingsKind, func(value []byte) error { - var bindings []credentialBinding - if err := json.Unmarshal(value, &bindings); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, CredentialBindingsKind, func(bindings []credentialBinding) error { out.Containers.Credentials = credentialBindingsSettings(bindings) return nil }); err != nil { return err } - return layerResource(ctx, reader, versions, IdentityGrantsKind, func(value []byte) error { - var doc identityGrants - if err := json.Unmarshal(value, &doc); err != nil { - return err - } + return layerResource(ctx, reader, versions, IdentityGrantsKind, func(doc identityGrants) error { applyIdentityGrants(out, doc) return nil }) diff --git a/internal/app/controlplane/runtime_config.go b/internal/app/controlplane/runtime_config.go index b8e7c04bb..9be6ac0d8 100644 --- a/internal/app/controlplane/runtime_config.go +++ b/internal/app/controlplane/runtime_config.go @@ -68,11 +68,7 @@ func (r storeReader) Query(ctx context.Context, kind string, decode func([]byte) func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReader, base config.Config) (config.Config, map[string]int64, error) { out := base.Clone() versions := map[string]int64{} - if err := layerResource(ctx, reader, versions, ProviderSettingsKind, func(value []byte) error { - var providers map[string]providerDocument - if err := json.Unmarshal(value, &providers); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, ProviderSettingsKind, func(providers map[string]providerDocument) error { out.Providers = make(map[string]config.Provider, len(providers)) for name, provider := range providers { if err := rejectBootDerivedProviderEnv(name, provider); err != nil { @@ -85,11 +81,7 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade return config.Config{}, nil, err } // Stored role assignments replace cfg.Models outright. - if err := layerResource(ctx, reader, versions, ModelRoleAssignmentsKind, func(value []byte) error { - var roles map[string]string - if err := json.Unmarshal(value, &roles); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, ModelRoleAssignmentsKind, func(roles map[string]string) error { out.Models = roles return nil }); err != nil { @@ -103,11 +95,7 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade return config.Config{}, nil, err } out.Chat, versions[ChannelSettingsKind] = chat, chatVersion - if err := layerResource(ctx, reader, versions, SchedulingPolicyKind, func(value []byte) error { - var policy schedulingPolicy - if err := json.Unmarshal(value, &policy); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, SchedulingPolicyKind, func(policy schedulingPolicy) error { interval, err := time.ParseDuration(policy.PollInterval) if err != nil { return err @@ -125,11 +113,7 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade // The two fields are assigned individually, not `out.Review = ...`: a field // added to config.Review later keeps the file's value until the stored // document carries it. - if err := layerResource(ctx, reader, versions, ReviewSettingsKind, func(value []byte) error { - var settings reviewSettings - if err := json.Unmarshal(value, &settings); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, ReviewSettingsKind, func(settings reviewSettings) error { out.Review.PrecisionGate = settings.PrecisionGate out.Review.ApproveBeforePost = settings.ApproveBeforePost return nil @@ -147,11 +131,7 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR out.DiffCapLines = new(policy.DiffCapLines) out.Notify.Webhook = policy.NotifyWebhook - if err := layerResource(ctx, reader, versions, ToolSettingsKind, func(value []byte) error { - var settings toolSettings - if err := json.Unmarshal(value, &settings); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, ToolSettingsKind, func(settings toolSettings) error { headers := make(map[string]map[string]string, len(out.Tools.MCPServers)) fileParallelToolCalls := make(map[string]bool, len(out.Tools.MCPServers)) for _, server := range out.Tools.MCPServers { @@ -184,21 +164,13 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR }); err != nil { return config.Config{}, nil, err } - if err := layerResource(ctx, reader, versions, PluginSettingsKind, func(value []byte) error { - var settings pluginSettings - if err := json.Unmarshal(value, &settings); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, PluginSettingsKind, func(settings pluginSettings) error { out.SkillsDir = settings.SkillsDir return nil }); err != nil { return config.Config{}, nil, err } - if err := layerResource(ctx, reader, versions, ContainerRuntimePoliciesKind, func(value []byte) error { - var policies containerRuntimePolicies - if err := json.Unmarshal(value, &policies); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, ContainerRuntimePoliciesKind, func(policies containerRuntimePolicies) error { // Keep the file-owned Profiles and RegistryAuth across the replacement. profiles := out.Containers.Profiles registryAuth := out.Containers.RegistryAuth @@ -210,11 +182,7 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR return config.Config{}, nil, err } // Stored profiles replace the file's outright. - if err := layerResource(ctx, reader, versions, AgentProfileKind, func(value []byte) error { - var profiles map[string]agentProfile - if err := json.Unmarshal(value, &profiles); err != nil { - return err - } + if err := layerResource(ctx, reader, versions, AgentProfileKind, func(profiles map[string]agentProfile) error { out.Containers.Profiles = agentProfilesSettings(profiles) return nil }); err != nil { @@ -224,9 +192,25 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR return out, versions, err } -// layerResource decodes a stored resource and records its version. A kind -// with no stored value is skipped. -func layerResource(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, decode func([]byte) error) error { +// layerResource decodes a stored JSON resource into a T, applies it and +// records its version. A kind with no stored value is skipped. +func layerResource[T any](ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, apply func(T) error) error { + return layerRaw(ctx, reader, versions, kind, func(value []byte) error { + var v T + if err := json.Unmarshal(value, &v); err != nil { + return err + } + return apply(v) + }) +} + +// layerResourceJSON decodes a stored resource over target, keeping fields +// the stored document omits. +func layerResourceJSON(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, target any) error { + return layerRaw(ctx, reader, versions, kind, func(value []byte) error { return json.Unmarshal(value, target) }) +} + +func layerRaw(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, decode func([]byte) error) error { version, found, err := reader.Query(ctx, kind, decode) if err != nil { return err @@ -237,10 +221,6 @@ func layerResource(ctx context.Context, reader controlplanerpc.ResourceReader, v return nil } -func layerResourceJSON(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, target any) error { - return layerResource(ctx, reader, versions, kind, func(value []byte) error { return json.Unmarshal(value, target) }) -} - // query returns the version of the resource it decoded, so callers that layer // a resource in can report the version they applied. A kind the store holds no // value for is reported as not found rather than as an error: the caller leaves