Derive artifact catalogs from the selected party without changing configuration

This commit is contained in:
2026-11-20 04:33:02 +00:00
parent c3e6245416
commit 6900cad104
23 changed files with 446 additions and 315 deletions

View File

@@ -285,7 +285,7 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
`,
assert: func(t *testing.T, cfg *Config) {
t.Helper()
artifact := cfg.Pipeline.Scriptorium.Artifacts["session_recap"]
artifact := cfg.ArtifactCatalog.Artifacts["session_recap"]
if artifact.RenderDebug == nil || *artifact.RenderDebug != true {
t.Fatalf("artifact render_debug = %#v, want true", artifact.RenderDebug)
}
@@ -320,8 +320,8 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
if cfg.Pipeline.Scriptorium == nil {
t.Fatal("scriptorium config should be present")
}
if len(cfg.Pipeline.Scriptorium.Artifacts) != 2 {
t.Fatalf("scriptorium.artifacts count = %d, want 2", len(cfg.Pipeline.Scriptorium.Artifacts))
if len(cfg.ArtifactCatalog.Artifacts) != 2 {
t.Fatalf("scriptorium.artifacts count = %d, want 2", len(cfg.ArtifactCatalog.Artifacts))
}
},
},
@@ -418,7 +418,7 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
`,
assert: func(t *testing.T, cfg *Config) {
t.Helper()
dependencies := cfg.Pipeline.Scriptorium.Artifacts["player_handout"].DependsOn
dependencies := cfg.ArtifactCatalog.Artifacts["player_handout"].DependsOn
if len(dependencies) != 1 || dependencies[0] != "session_recap" {
t.Fatalf("inferred dependencies = %#v, want [session_recap]", dependencies)
}
@@ -555,15 +555,12 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
}
return
}
if err != nil {
t.Fatalf("Load() error = %v", err)
if err == nil {
if tt.assert != nil {
tt.assert(t, cfg)
}
err = Validate(cfg)
}
if tt.assert != nil {
tt.assert(t, cfg)
}
err = Validate(cfg)
if len(tt.wantValidateErr) > 0 {
if err == nil {
t.Fatalf("expected validation error containing %q, got nil", tt.wantValidateErr)
@@ -591,10 +588,10 @@ func TestScriptoriumDiagnosticsAreIndependentOfMapInsertionOrder(t *testing.T) {
secondArtifacts["alpha"] = invalidArtifact
secondArtifacts["beta"] = invalidArtifact
firstErr := validateScriptorium(&ScriptoriumConfig{Binary: "scriptorium", Artifacts: firstArtifacts}, nil)
secondErr := validateScriptorium(&ScriptoriumConfig{Binary: "scriptorium", Artifacts: secondArtifacts}, nil)
firstErr := validateConcreteArtifacts(firstArtifacts, nil)
secondErr := validateConcreteArtifacts(secondArtifacts, nil)
if firstErr == nil || secondErr == nil {
t.Fatalf("validateScriptorium() errors = %v / %v, want validation failures", firstErr, secondErr)
t.Fatalf("concrete artifact validation errors = %v / %v, want validation failures", firstErr, secondErr)
}
if firstErr.Error() != secondErr.Error() {
t.Fatalf("equivalent maps produced different diagnostics:\nfirst: %v\nsecond: %v", firstErr, secondErr)
@@ -621,10 +618,9 @@ scriptorium:
`
pipelinePath, sessionPath := writeConfigFiles(t, pipelineYAML, testSessionBaseYAML)
cfg, err := Load(pipelinePath, sessionPath)
if err != nil {
t.Fatalf("Load() error = %v", err)
if err == nil {
err = Validate(cfg)
}
err = Validate(cfg)
if err == nil || !strings.Contains(err.Error(), "pipeline.scriptorium.artifacts.session_recap.inputs.transcript.source") || !strings.Contains(err.Error(), "unsupported") {
t.Fatalf("Validate() error = %v, want source field and unsupported category", err)
}