Share provenance snapshots during catalog derivation

This commit is contained in:
2026-11-20 13:42:11 +00:00
parent 846f8470dc
commit 7e65c29a61
3 changed files with 28 additions and 22 deletions

View File

@@ -33,7 +33,7 @@ func EffectiveArtifactCatalog(cfg *PipelineConfig, party ResolvedParty) ([]Effec
return catalog.Records, nil
}
func concreteArtifactRecords(cfg *PipelineConfig, catalog *ArtifactCatalog, party ResolvedParty) []EffectiveArtifactRecord {
func concreteArtifactRecords(catalog *ArtifactCatalog, party ResolvedParty, definitionSources func(configkit.Path) []string) []EffectiveArtifactRecord {
if len(catalog.Artifacts) == 0 {
return []EffectiveArtifactRecord{}
}
@@ -44,7 +44,6 @@ func concreteArtifactRecords(cfg *PipelineConfig, catalog *ArtifactCatalog, part
}
sort.Strings(keys)
records := make([]EffectiveArtifactRecord, 0, len(keys))
pathsByID := pipelineSourcePaths(cfg)
partySources := partyCharacterSourceLookup(party)
for _, key := range keys {
artifact := catalog.Artifacts[key]
@@ -62,7 +61,7 @@ func concreteArtifactRecords(cfg *PipelineConfig, catalog *ArtifactCatalog, part
record.FamilySources = append([]string(nil), catalog.Families.Families[member.Family].Sources...)
record.PartySource = strings.Join(partySources(member.CharacterID), ",")
} else {
record.DefinitionSources = declarationDefinitionSourcesWithIndex(cfg, configkit.Keys("scriptorium", "artifacts", key), pathsByID)
record.DefinitionSources = definitionSources(configkit.Keys("scriptorium", "artifacts", key))
}
record.Dependencies = nonEmptySortedStrings(record.Dependencies)
records = append(records, record)
@@ -124,21 +123,20 @@ func partyCharacterSourceLookup(party ResolvedParty) func(string) []string {
}
}
func artifactFamilyDefinitionSources(cfg *PipelineConfig, key string) []string {
return declarationDefinitionSources(cfg,
configkit.Keys("scriptorium", "artifact_families", key),
)
}
func declarationDefinitionSources(cfg *PipelineConfig, declaration configkit.Path) []string {
return declarationDefinitionSourcesWithIndex(cfg, declaration, pipelineSourcePaths(cfg))
}
func declarationDefinitionSourcesWithIndex(cfg *PipelineConfig, declaration configkit.Path, pathsByID map[string]string) []string {
if cfg.ConfigKitResult() == nil {
return nil
// declarationSourceLookup shares one detached snapshot within a catalog derivation.
func declarationSourceLookup(cfg *PipelineConfig) func(configkit.Path) []string {
result := cfg.ConfigKitResult()
if result == nil {
return func(configkit.Path) []string { return nil }
}
metadata := cfg.ConfigKitResult().Metadata()
metadata := result.Metadata()
pathsByID := pipelineSourcePaths(cfg)
return func(declaration configkit.Path) []string {
return declarationDefinitionSourcesWithIndex(metadata, declaration, pathsByID)
}
}
func declarationDefinitionSourcesWithIndex(metadata configkit.Metadata, declaration configkit.Path, pathsByID map[string]string) []string {
seen := map[string]struct{}{}
for _, change := range metadata.History(declaration) {
if change.Origin.Layer != configkit.LayerMain && change.Origin.Layer != configkit.LayerOverlay {

View File

@@ -6,6 +6,7 @@ import (
"strings"
"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
configkit "go.maximumdirect.net/configkit"
)
const (
@@ -29,8 +30,9 @@ func DeriveArtifactCatalog(cfg *PipelineConfig, party ResolvedParty) (*ArtifactC
return nil, fmt.Errorf("pipeline config is required")
}
result := &ArtifactCatalog{Artifacts: map[string]ScriptoriumArtifactConfig{}}
definitionSources := declarationSourceLookup(cfg)
if cfg.Scriptorium == nil {
return finishArtifactCatalog(cfg, result, party)
return finishArtifactCatalog(cfg, result, party, definitionSources)
}
families := cfg.Scriptorium.ArtifactFamilies
if len(families) > 0 && party.Canonical == nil {
@@ -78,7 +80,7 @@ func DeriveArtifactCatalog(cfg *PipelineConfig, party ResolvedParty) (*ArtifactC
Members: make([]string, 0, len(characters)),
MemberDependencies: append([]string(nil), family.MemberDependencies...),
Publish: cloneArtifactFamilyPublish(family.Publish),
Sources: artifactFamilyDefinitionSources(cfg, familyKey),
Sources: definitionSources(configkit.Keys("scriptorium", "artifact_families", familyKey)),
}
for _, character := range characters {
key := familyKey + "_" + character.ID
@@ -117,10 +119,10 @@ func DeriveArtifactCatalog(cfg *PipelineConfig, party ResolvedParty) (*ArtifactC
}
result.Artifacts = expanded
result.Families = catalog
return finishArtifactCatalog(cfg, result, party)
return finishArtifactCatalog(cfg, result, party, definitionSources)
}
func finishArtifactCatalog(cfg *PipelineConfig, catalog *ArtifactCatalog, party ResolvedParty) (*ArtifactCatalog, error) {
func finishArtifactCatalog(cfg *PipelineConfig, catalog *ArtifactCatalog, party ResolvedParty, definitionSources func(configkit.Path) []string) (*ArtifactCatalog, error) {
resolveArtifactDependencies(catalog.Artifacts, catalog.Families)
for key, member := range catalog.Families.Members {
member.Dependencies = append([]string(nil), catalog.Artifacts[key].DependsOn...)
@@ -132,7 +134,7 @@ func finishArtifactCatalog(cfg *PipelineConfig, catalog *ArtifactCatalog, party
if err := deriveFamilyPublishRules(cfg, catalog); err != nil {
return nil, err
}
catalog.Records = concreteArtifactRecords(cfg, catalog, party)
catalog.Records = concreteArtifactRecords(catalog, party, definitionSources)
return catalog, nil
}