Refactoring status.go and status_test.go files according to suggestions

Author: infernus01

pkg/pod/status.go

@@ -156,16 +156,12 @@ func MakeTaskRunStatus(ctx context.Context, logger *zap.SugaredLogger, tr v1.Tas
 		}
 	}
 
-	var errs []error
-	if err := setTaskRunStatusBasedOnStepStatus(ctx, logger, stepStatuses, &tr, pod.Status.Phase, kubeclient, ts); err != nil {
-		errs = append(errs, err)
-	}
-
+	err := setTaskRunStatusBasedOnStepStatus(ctx, logger, stepStatuses, &tr, pod.Status.Phase, kubeclient, ts)
 	setTaskRunStatusBasedOnSidecarStatus(sidecarStatuses, trs)
 
 	trs.Results = removeDuplicateResults(trs.Results)
 
-	return *trs, errors.Join(errs...)
+	return *trs, err
 }
 
 func createTaskResultsFromStepResults(stepRunRes []v1.TaskRunStepResult, neededStepResults map[string]string) []v1.TaskRunResult {

pkg/pod/status_test.go

@@ -18,7 +18,6 @@ package pod
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"testing"
@@ -105,9 +104,9 @@ func TestSetTaskRunStatusBasedOnStepStatus(t *testing.T) {
 			for _, cs := range c.ContainerStatuses {
 				originalStatuses = append(originalStatuses, *cs.DeepCopy())
 			}
-			merr := setTaskRunStatusBasedOnStepStatus(context.Background(), logger, c.ContainerStatuses, &tr, corev1.PodRunning, kubeclient, &v1.TaskSpec{})
-			if merr != nil {
-				t.Errorf("setTaskRunStatusBasedOnStepStatus: %s", merr)
+			gotErr := setTaskRunStatusBasedOnStepStatus(context.Background(), logger, c.ContainerStatuses, &tr, corev1.PodRunning, kubeclient, &v1.TaskSpec{})
+			if gotErr != nil {
+				t.Errorf("setTaskRunStatusBasedOnStepStatus: %s", gotErr)
 			}
 			if d := cmp.Diff(originalStatuses, c.ContainerStatuses); d != "" {
 				t.Errorf("container statuses changed:  %s", diff.PrintWantGot(d))
@@ -238,12 +237,11 @@ func TestSetTaskRunStatusBasedOnStepStatus_sidecar_logs(t *testing.T) {
 			ctx := config.ToContext(context.Background(), &config.Config{
 				FeatureFlags: featureFlags,
 			})
-			wantErr := errors.Join(c.wantErr)
-			merr := setTaskRunStatusBasedOnStepStatus(ctx, logger, []corev1.ContainerStatus{{}}, &c.tr, pod.Status.Phase, kubeclient, ts)
-			if merr == nil {
+			gotErr := setTaskRunStatusBasedOnStepStatus(ctx, logger, []corev1.ContainerStatus{{}}, &c.tr, pod.Status.Phase, kubeclient, ts)
+			if gotErr == nil {
 				t.Fatalf("Expected error but got nil")
 			}
-			if d := cmp.Diff(wantErr.Error(), merr.Error()); d != "" {
+			if d := cmp.Diff(c.wantErr.Error(), gotErr.Error()); d != "" {
 				t.Errorf("Got unexpected error  %s", diff.PrintWantGot(d))
 			}
 		})

pkg/reconciler/taskrun/taskrun.go

@@ -369,10 +369,7 @@ func (c *Reconciler) finishReconcileUpdateEmitEvents(ctx context.Context, tr *v1
 	// Send k8s events and cloud events (when configured)
 	events.Emit(ctx, beforeCondition, afterCondition, tr)
 
-	var errs []error
-	if previousError != nil {
-		errs = append(errs, previousError)
-	}
+	errs := []error{previousError}
 
 	// If the Run has been completed before and remains so at present,
 	// no need to update the labels and annotations