Honor explicit Notarius working directories

internal/config/effective_digest.go

@@ -98,9 +98,6 @@ func captureLogicalNotariusPaths(cfg *PipelineConfig) {
 	}
 	configPath := normalizeLogicalFilesystemPath(cfg.Notarius.ConfigPath)
 	workingDirectory := normalizeLogicalFilesystemPath(cfg.Notarius.WorkingDirectory)
-	if cfg.Notarius.Enabled && workingDirectory == "" && configPath != "" {
-		workingDirectory = normalizeLogicalFilesystemPath(filepath.Dir(configPath))
-	}
 	cfg.resolution.logicalNotariusConfig = configPath
 	cfg.resolution.logicalNotariusWorking = workingDirectory
 	cfg.resolution.logicalNotariusCaptured = true

internal/config/load.go

@@ -451,12 +451,6 @@ func resolveNotariusPaths(cfg *PipelineConfig, pipelinePath string) error {
 		return fmt.Errorf("resolve pipeline.notarius.config_path: %w", err)
 	}
 	cfg.Notarius.ConfigPath = resolvedConfigPath
-	if strings.TrimSpace(cfg.Notarius.WorkingDirectory) == "" {
-		if resolvedConfigPath != "" {
-			cfg.Notarius.WorkingDirectory = filepath.Dir(resolvedConfigPath)
-		}
-		return nil
-	}
 	workingDirectory, err := resolve(cfg.Notarius.WorkingDirectory)
 	if err != nil {
 		return fmt.Errorf("resolve pipeline.notarius.working_directory: %w", err)

internal/config/notarius_test.go

@@ -99,6 +99,26 @@ notarius:
 	if explicit.Notarius.WorkingDirectory != filepath.Join(dir, "runtime") {
 		t.Fatalf("explicit working_directory = %q, want %q", explicit.Notarius.WorkingDirectory, filepath.Join(dir, "runtime"))
 	}
+
+	for _, value := range []string{`""`, `"   "`} {
+		t.Run("explicit blank "+value, func(t *testing.T) {
+			blankPath := filepath.Join(t.TempDir(), "pipeline.yml")
+			blankYAML := strings.Replace(pipelineYAML, "  pipeline_id: dnd-session\n", "  pipeline_id: dnd-session\n  working_directory: "+value+"\n", 1)
+			if err := os.WriteFile(blankPath, []byte(blankYAML), 0o644); err != nil {
+				t.Fatal(err)
+			}
+			blank, err := LoadPipeline(blankPath)
+			if err != nil {
+				t.Fatalf("LoadPipeline(explicit blank working directory) error = %v", err)
+			}
+			if blank.Notarius.WorkingDirectory != "" {
+				t.Fatalf("explicit blank working_directory = %q, want empty", blank.Notarius.WorkingDirectory)
+			}
+			if err := ValidatePipelineConfig(blank); err == nil || !strings.Contains(err.Error(), "working_directory is required") {
+				t.Fatalf("ValidatePipelineConfig() error = %v, want required working directory", err)
+			}
+		})
+	}
 }
 
 func TestNotariusRelativePathsDoNotMakeEffectiveDigestLocationDependent(t *testing.T) {