eric/narratio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

Remove retired cleanup manifest state

Browse Source
This commit is contained in:
Eric Rakestraw
2026-09-05 15:30:31 +00:00
parent adc60aa588
commit 078f661e3a
10 changed files with 84 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/manifest/store.go
View File

@@ -1,6 +1,7 @@
package manifest
import (
"bytes"
"context"
"encoding/json"
"fmt"
@@ -69,7 +70,16 @@ func (s *LocalStore) LoadReader(ctx context.Context, source io.Reader) (*Manifes
}
var m Manifest
if err := json.Unmarshal(data, &m); err != nil {
decoder := json.NewDecoder(bytes.NewReader(data))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&m); err != nil {
return nil, fmt.Errorf("decode manifest: %w", err)
}
var trailing any
if err := decoder.Decode(&trailing); err != io.EOF {
if err == nil {
return nil, fmt.Errorf("decode manifest: multiple JSON values are not allowed")
}
return nil, fmt.Errorf("decode manifest: %w", err)
}
@@ -104,9 +114,6 @@ func (s *LocalStore) Save(ctx context.Context, path string, m *Manifest) error {
if err := validateManifestIdentities(m.SessionID, m.Campaign, m.RunID); err != nil {
return fmt.Errorf("save manifest: %w", err)
}
if err := validatePostPublishCleanup(m.PostPublishCleanup); err != nil {
return fmt.Errorf("save manifest: %w", err)
}
if err := validateSessionStages(m.Stages); err != nil {
return fmt.Errorf("save manifest: %w", err)
}
@@ -149,9 +156,6 @@ func validateLoadedManifest(m *Manifest) error {
if err := validateManifestIdentities(m.SessionID, m.Campaign, m.RunID); err != nil {
return err
}
if err := validatePostPublishCleanup(m.PostPublishCleanup); err != nil {
return err
}
if err := validateSessionStages(m.Stages); err != nil {
return err
}
@@ -175,27 +179,6 @@ func normalizeManifest(m *Manifest) {
}
}
func validatePostPublishCleanup(cleanup *PostPublishCleanup) error {
if cleanup == nil {
return nil
}
if err := pathsafe.ValidateOpaqueSegment(cleanup.CommittedRunID); err != nil {
return fmt.Errorf("post_publish_cleanup.committed_run_id is not a portable opaque identifier: %w", err)
}
if strings.TrimSpace(cleanup.RemoteCommitKey) == "" || strings.TrimSpace(cleanup.CurrentCommitPointerKey) == "" {
return fmt.Errorf("post_publish_cleanup commit identity is required")
}
if len(cleanup.Targets) == 0 {
return fmt.Errorf("post_publish_cleanup.targets is required")
}
for index, target := range cleanup.Targets {
if strings.TrimSpace(target.Policy) == "" || strings.TrimSpace(target.Root) == "" || strings.TrimSpace(target.Path) == "" {
return fmt.Errorf("post_publish_cleanup.targets[%d] policy, root, and path are required", index)
}
}
return nil
}
func validateManifestIdentities(sessionID, campaign, runID string) error {
identities := []struct {
field string