return original pipelinerun vs. nil on patch error

gabemontero · chmouel · commit d09e3884d79a · 2023-06-08T15:50:03.000+02:00
diff --git a/pkg/action/patch.go b/pkg/action/patch.go
@@ -38,7 +38,8 @@ func PatchPipelineRun(ctx context.Context, logger *zap.SugaredLogger, whatPatchi
 		return nil
 	})
 	if err != nil {
-		return nil, fmt.Errorf("failed to patch pipelinerun %v/%v with %v: %w", pr.Namespace, whatPatching, pr.Name, err)
+		// return the original PipelineRun, let the caller decide what to do with it after the error is processed
+		return pr, fmt.Errorf("failed to patch pipelinerun %v/%v with %v: %w", pr.Namespace, whatPatching, pr.Name, err)
 	}
 	return patchedPR, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ func PatchPipelineRun(ctx context.Context, logger *zap.SugaredLogger, whatPatchi`
`38`	`38`	`return nil`
`39`	`39`	`})`
`40`	`40`	`if err != nil {`
`41`		`- return nil, fmt.Errorf("failed to patch pipelinerun %v/%v with %v: %w", pr.Namespace, whatPatching, pr.Name, err)`
	`41`	`+ // return the original PipelineRun, let the caller decide what to do with it after the error is processed`
	`42`	`+ return pr, fmt.Errorf("failed to patch pipelinerun %v/%v with %v: %w", pr.Namespace, whatPatching, pr.Name, err)`
`42`	`43`	`}`
`43`	`44`	`return patchedPR, nil`
`44`	`45`	`}`