set failure status in each return

Signed-off-by: Prune <prune@lecentre.net>

Author: prune998

internal/promotion/runner/builtin/yaml_merger.go

@@ -66,20 +66,17 @@ func (y *yamlMerger) run(
 	cfg builtin.YAMLMergeConfig,
 ) (promotion.StepResult, error) {
 
-	result := promotion.StepResult{Status: kargoapi.PromotionStepStatusSucceeded}
-	failure := promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}
-
 	// sanity check
 	if len(cfg.InFiles) == 0 || cfg.OutFile == "" {
-		return failure, fmt.Errorf("inFiles and OutFile must not be empty")
+		return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("inFiles and OutFile must not be empty")
 	}
 
 	// Secure join the input paths to prevent path traversal attacks.
 	filePaths := []string{}
 	for _, path := range cfg.InFiles {
 		inFile, err := securejoin.SecureJoin(stepCtx.WorkDir, path)
 		if err != nil {
-			return failure, fmt.Errorf("could not secure join input file %q: %w", path, err)
+			return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("could not secure join input file %q: %w", path, err)
 		}
 
 		// only add existing files
@@ -88,7 +85,7 @@ func (y *yamlMerger) run(
 			if cfg.IgnoreMissingFiles {
 				continue
 			}
-			return failure, fmt.Errorf("input file not found:  %s", inFile)
+			return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("input file not found:  %s", inFile)
 
 		}
 		filePaths = append(filePaths, inFile)
@@ -98,21 +95,22 @@ func (y *yamlMerger) run(
 	// Secure join the output path to prevent path traversal attacks.
 	outFile, err := securejoin.SecureJoin(stepCtx.WorkDir, cfg.OutFile)
 	if err != nil {
-		return failure, fmt.Errorf("could not secure join outFile %q: %w", cfg.OutFile, err)
+		return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("could not secure join outFile %q: %w", cfg.OutFile, err)
 	}
 
 	// ensure output path fully exist
 	if err = os.MkdirAll(filepath.Dir(outFile), 0o700); err != nil {
-		return failure, fmt.Errorf("error creating directory structure %s: %w", filepath.Dir(outFile), err)
+		return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("error creating directory structure %s: %w", filepath.Dir(outFile), err)
 	}
 
 	// Merge files
 	err = yaml.MergeYAMLFiles(filePaths, outFile)
 	if err != nil {
-		return failure, fmt.Errorf("could not merge YAML files: %w", err)
+		return promotion.StepResult{Status: kargoapi.PromotionStepStatusErrored}, fmt.Errorf("could not merge YAML files: %w", err)
 	}
 
 	// Add a commit message fragment to the step's output.
+	result := promotion.StepResult{Status: kargoapi.PromotionStepStatusSucceeded}
 	if commitMsg := y.generateCommitMessage(cfg.OutFile, filePaths); commitMsg != "" {
 		result.Output = map[string]any{
 			"commitMessage": commitMsg,