Adopt ConfigKit and Go toolchain baseline

This commit is contained in:
2026-11-17 21:59:19 +00:00
parent 65d0e518e5
commit 341fe93e3b
45 changed files with 101 additions and 101 deletions

View File

@@ -5,7 +5,7 @@ import (
"sort"
"strings"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
)
@@ -83,7 +83,7 @@ func declarationDefinitionSources(cfg *PipelineConfig, declaration configkit.Pat
pathsByID := pipelineSourcePaths(cfg)
seen := map[string]struct{}{}
for _, change := range cfg.resolution.configkitMetadata.History(declaration) {
if change.Origin.Layer != configkit.LayerBase && change.Origin.Layer != configkit.LayerOverlay {
if change.Origin.Layer != configkit.LayerMain && change.Origin.Layer != configkit.LayerOverlay {
continue
}
for _, location := range change.Origin.Locations {

View File

@@ -343,7 +343,7 @@ characters:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
pipeline := `config:
imports:
- path: families/summary.yml
- path: families/notes.yml
@@ -420,7 +420,7 @@ characters:
classes: [{name: wizard}]
`)
pipeline := `configkit:
pipeline := `config:
imports:
- path: definitions/parent.yml
- path: definitions/child.yml

View File

@@ -1,6 +1,6 @@
package config
import configkit "gitea.maximumdirect.net/eric/ConfigKit"
import configkit "go.maximumdirect.net/configkit"
// Config is the resolved combined configuration from pipeline.yml,
// campaign.yml, and session.yml.

View File

@@ -1,6 +1,6 @@
package config
import configkit "gitea.maximumdirect.net/eric/ConfigKit"
import configkit "go.maximumdirect.net/configkit"
// MarshalYAML exposes only public credential reference names. Resolved values
// remain available solely through ConfigKit's explicit trusted accessor.

View File

@@ -3,7 +3,7 @@ package config
import (
"fmt"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
)
const maxConfigDocumentBytes int64 = 8 << 20

View File

@@ -11,7 +11,7 @@ import (
func TestSingleSourceDocumentsRejectConfigKitDirectives(t *testing.T) {
dir := t.TempDir()
campaignPath := filepath.Join(dir, "campaign.yml")
if err := os.WriteFile(campaignPath, []byte("configkit:\n imports: []\ncampaign_id: sample\n"), 0o644); err != nil {
if err := os.WriteFile(campaignPath, []byte("config:\n imports: []\ncampaign_id: sample\n"), 0o644); err != nil {
t.Fatal(err)
}
tests := []struct {
@@ -20,11 +20,11 @@ func TestSingleSourceDocumentsRejectConfigKitDirectives(t *testing.T) {
}{
{name: "campaign", load: func() error { _, err := LoadCampaign(campaignPath); return err }},
{name: "session", load: func() error {
_, err := LoadSessionBytesWithOptions("session.yml", []byte("configkit:\n imports: []\nsession_id: sample\n"), SessionLoadOptions{})
_, err := LoadSessionBytesWithOptions("session.yml", []byte("config:\n imports: []\nsession_id: sample\n"), SessionLoadOptions{})
return err
}},
{name: "party", load: func() error {
_, err := ParseParty([]byte("configkit:\n imports: []\nschema_version: narratio.party.v1\ncharacters: {}\n"))
_, err := ParseParty([]byte("config:\n imports: []\nschema_version: narratio.party.v1\ncharacters: {}\n"))
return err
}},
}

View File

@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
"gopkg.in/yaml.v3"
)

View File

@@ -8,7 +8,7 @@ import (
"strings"
"unicode"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
"gopkg.in/yaml.v3"
)

View File

@@ -8,7 +8,7 @@ import (
"reflect"
"strings"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
)
type pipelineResolutionMetadata struct {
@@ -185,7 +185,7 @@ func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution
cfg.Publish.Outputs[index] = output
}
if defaultedOutput {
resolution.Record(configkit.Keys("publish", "outputs"), configkit.ChangeDerivedDefault, "publish output entry defaults")
resolution.RecordDerivedDefault(configkit.Keys("publish", "outputs"), "publish output entry defaults")
}
}
before := cloneNotariusForResolution(cfg.Notarius)
@@ -194,7 +194,7 @@ func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution
return nil
}
if !reflect.DeepEqual(before, cfg.Notarius) {
resolution.Record(configkit.Keys("notarius"), configkit.ChangeNormalization, "canonical Notarius configuration")
resolution.RecordNormalization(configkit.Keys("notarius"), "canonical Notarius configuration")
}
if cfg.Publish != nil {
destinations := deriveMissingPublishDestinations(cfg.Publish, cfg.Scriptorium, cfg.Notarius)
@@ -206,7 +206,7 @@ func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution
if len(destinations) > 0 {
// ConfigKit compares sequences atomically; child records alone do not
// cover the list mutation when requiredness was already explicit.
resolution.Record(configkit.Keys("publish", "outputs"), configkit.ChangeNormalization, "derived publish destinations")
resolution.RecordNormalization(configkit.Keys("publish", "outputs"), "derived publish destinations")
}
}
return nil
@@ -260,7 +260,7 @@ func pipelineMetadataFromConfigKit(result *configkit.Result[PipelineConfig], opt
resolved.sources = append(resolved.sources, path)
if index == 0 {
resolved.rootPath = path
} else if source.Layer == configkit.LayerBase {
} else if source.Layer == configkit.LayerMain {
resolved.imports = append(resolved.imports, path)
}
if source.Layer == configkit.LayerOverlay {

View File

@@ -7,12 +7,12 @@ import (
"strings"
"testing"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
)
func TestPipelineConfigKitImportsOverlayAndBaseSelection(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: config/workspace.yml
- path: config/artifact.yml
@@ -70,7 +70,7 @@ whisperx:
func TestPipelineOverlayDoesNotDiscoverLegacyDirectory(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", "configkit:\n imports:\n - path: profiles/shared.yml\n")
writePipelineFixture(t, dir, "pipeline.yml", "config:\n imports:\n - path: profiles/shared.yml\n")
writePipelineFixture(t, dir, "profiles/shared.yml", "workspace:\n root: /srv/base\n")
writePipelineFixture(t, dir, "profiles/testing.yml", "workspace:\n root: /srv/old\n")
if base, err := LoadPipeline(filepath.Join(dir, "pipeline.yml")); err != nil || base.Workspace.Root != "/srv/base" {
@@ -111,7 +111,7 @@ characters:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
pipeline := `config:
imports:
- path: first.yml
- path: second.yml
@@ -165,7 +165,7 @@ whisperx:
t.Run("structural conflict remains a loader error", func(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: first.yml
- path: second.yml
@@ -182,7 +182,7 @@ whisperx:
func TestPipelineInheritancePreservesPresenceAndPathBases(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: config/parent.yml
- path: config/children.yml
@@ -282,7 +282,7 @@ whisperx:
func TestPipelineInheritanceRetainsZeroTimeoutForDomainValidation(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: artifacts.yml
whisperx:
@@ -315,7 +315,7 @@ whisperx:
func TestPipelineExplicitEmptyTimeoutDoesNotReceiveDefault(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: timeout.yml
whisperx:
@@ -340,7 +340,7 @@ whisperx:
func TestInheritedNotariusPathsKeepPipelineRootBase(t *testing.T) {
dir := t.TempDir()
pipelinePath := writePipelineFixture(t, dir, "pipeline.yml", `configkit:
pipelinePath := writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: profiles/notarius.yml
whisperx:
@@ -383,7 +383,7 @@ characters:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
pipeline := `config:
imports:
- path: artifacts/parent.yml
- path: artifacts/child.yml
@@ -668,7 +668,7 @@ func TestNotariusCacheControlProfileReplacementAndNullReset(t *testing.T) {
func TestPipelineConfigKitAllowsOneBaseDeclarationWithProfileOverride(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePipelineFixture(t, dir, "pipeline.yml", `config:
imports:
- path: artifact.yml
whisperx: