Cut configuration and CLI over to output cache and debug surfaces

internal/core/config/config.go

@@ -1,21 +1,18 @@
 package config
 
 import (
-	"path/filepath"
-	"strings"
-
-	"gitea.maximumdirect.net/eric/notarius/internal/core/diagnostics"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 )
 
-const SupportedFileConfigVersion = 2
+const SupportedFileConfigVersion = 3
 
 type Config struct {
 	Scriptorium ScriptoriumConfig                   `json:"scriptorium,omitempty"`
 	Pipelines   map[string]pipeline.PipelineProfile `json:"pipelines"`
 	Concurrency ConcurrencyConfig                   `json:"concurrency"`
-	Diagnostics DiagnosticsConfig                   `json:"diagnostics"`
-	Workspace   WorkspaceConfig                     `json:"workspace"`
+	Output      OutputConfig                        `json:"output"`
+	Cache       CacheConfig                         `json:"cache"`
+	Debug       DebugConfig                         `json:"debug"`
 }
 
 type ScriptoriumConfig struct {
@@ -31,37 +28,25 @@ type ConcurrencyConfig struct {
 	defaultedExtractWorkers  int
 }
 
-type DiagnosticsConfig struct {
-	WorkDir   string                    `json:"work_dir"`
-	Retention diagnostics.RetentionMode `json:"retention"`
+type OutputConfig struct {
+	Directory string `json:"directory"`
 }
 
-type WorkspaceConfig struct {
-	Directory   string                     `json:"directory,omitempty"`
-	ChunkCache  WorkspaceChunkCacheConfig  `json:"chunk_cache"`
-	Diagnostics WorkspaceDiagnosticsConfig `json:"diagnostics"`
-	Resume      WorkspaceResumeConfig      `json:"resume"`
-	Debug       WorkspaceDebugConfig       `json:"debug"`
+type CacheConfig struct {
+	ChunkPlans  ChunkPlanCacheConfig  `json:"chunk_plans"`
+	Checkpoints CheckpointCacheConfig `json:"checkpoints"`
 }
 
-type WorkspaceChunkCacheConfig struct {
-	Mode      pipeline.ChunkCacheMode `json:"mode"`
+type ChunkPlanCacheConfig struct {
 	Directory string                  `json:"directory,omitempty"`
+	Mode      pipeline.ChunkCacheMode `json:"mode"`
 }
 
-type WorkspaceDiagnosticsConfig struct {
-	Enabled      bool                      `json:"enabled"`
-	Retention    diagnostics.RetentionMode `json:"retention,omitempty"`
-	enabledSet   bool
-	retentionSet bool
+type CheckpointCacheConfig struct {
+	Directory string `json:"directory,omitempty"`
 }
-
-type WorkspaceResumeConfig struct {
-	Enabled bool `json:"enabled"`
-}
-
-type WorkspaceDebugConfig struct {
-	Enabled bool `json:"enabled"`
+type DebugConfig struct {
+	Directory string `json:"directory"`
 }
 
 func Default() Config {
@@ -72,46 +57,12 @@ func Default() Config {
 			StageWorkers:            map[string]int{"extract": 1},
 			defaultedExtractWorkers: 1,
 		},
-		Diagnostics: DiagnosticsConfig{
-			WorkDir:   "/tmp/notarius",
-			Retention: diagnostics.RetentionAuto,
-		},
-		Workspace: WorkspaceConfig{
-			ChunkCache: WorkspaceChunkCacheConfig{Mode: pipeline.ChunkCacheAuto},
-			Diagnostics: WorkspaceDiagnosticsConfig{
-				Enabled: true,
-			},
-		},
+		Output: OutputConfig{Directory: "./notarius-output"},
+		Cache:  CacheConfig{ChunkPlans: ChunkPlanCacheConfig{Mode: pipeline.ChunkCacheAuto}},
+		Debug:  DebugConfig{Directory: "./notarius-debug"},
 	}
 }
 
-func (c *Config) RecomputeEffectiveDiagnostics() {
-	if c == nil {
-		return
-	}
-	if dir := c.workspaceDirectory(); dir != "" {
-		c.Diagnostics.WorkDir = filepath.Join(dir, "diagnostics")
-	}
-	if c.Workspace.Diagnostics.retentionSet {
-		c.Diagnostics.Retention = c.Workspace.Diagnostics.Retention
-	}
-}
-
-func (c Config) DiagnosticsEnabled() bool {
-	if !c.Workspace.Diagnostics.enabledSet {
-		return true
-	}
-	return c.Workspace.Diagnostics.Enabled
-}
-
-func (c Config) workspaceDirectory() string {
-	dir := strings.TrimSpace(c.Workspace.Directory)
-	if dir == "" {
-		return ""
-	}
-	return filepath.Clean(dir)
-}
-
 func cloneConfig(in Config) Config {
 	out := in
 	out.Concurrency.StageWorkers = cloneIntMap(in.Concurrency.StageWorkers)