feat(taskspec): create Status.Steps even without StepActions

With this change, TaskRun.Status.Steps are now populated even when there
is only inline steps defined.

Author: Maximilien-R

pkg/reconciler/taskrun/resources/taskspec.go

@@ -197,9 +197,24 @@ func updateTaskRunProvenance(taskRun *v1.TaskRun, stepName string, stepIndex int
 
 // GetStepActionsData extracts the StepActions and merges them with the inlined Step specification.
 func GetStepActionsData(ctx context.Context, taskSpec v1.TaskSpec, taskRun *v1.TaskRun, tekton clientset.Interface, k8s kubernetes.Interface, requester remoteresource.Requester) ([]v1.Step, error) {
-	// If there are no step-ref to resolve, return immediately
+	steps := make([]v1.Step, len(taskSpec.Steps))
+
+	// Init step states and known step states indexes lookup map
+	if taskRun.Status.Steps == nil {
+		taskRun.Status.Steps = []v1.StepState{}
+	}
+	stepStatusIndex := make(map[string]int, len(taskRun.Status.Steps))
+	for i, stepState := range taskRun.Status.Steps {
+		stepStatusIndex[stepState.Name] = i
+	}
+
+	// If there are no step-ref to resolve, return immediately with nil provenance
 	if !hasStepRefs(&taskSpec) {
-		return taskSpec.Steps, nil
+		for i, step := range taskSpec.Steps {
+			steps[i] = step
+			updateTaskRunProvenance(taskRun, step.Name, i, nil, stepStatusIndex) // create StepState with nil provenance
+		}
+		return steps, nil
 	}
 
 	// Phase 1: Concurrently resolve all StepActions
@@ -229,15 +244,6 @@ func GetStepActionsData(ctx context.Context, taskSpec v1.TaskSpec, taskRun *v1.T
 	}
 
 	// Phase 2: Sequentially merge results into the final step list and update status
-	if taskRun.Status.Steps == nil {
-		taskRun.Status.Steps = []v1.StepState{}
-	}
-	stepStatusIndex := make(map[string]int, len(taskRun.Status.Steps))
-	for i, stepState := range taskRun.Status.Steps {
-		stepStatusIndex[stepState.Name] = i
-	}
-
-	steps := make([]v1.Step, len(taskSpec.Steps))
 	for i, step := range taskSpec.Steps {
 		if step.Ref == nil {
 			steps[i] = step

pkg/reconciler/taskrun/resources/taskspec_test.go

@@ -737,7 +737,8 @@ spec:
 			Status: v1.TaskRunStatus{
 				TaskRunStatusFields: v1.TaskRunStatusFields{
 					Steps: []v1.StepState{{
-						Name: "step1",
+						Name:       "step1",
+						Provenance: &v1.Provenance{},
 					}},
 				},
 			},
@@ -804,7 +805,20 @@ spec:
 					},
 				},
 			},
-			want: v1.TaskRunStatus{},
+			want: v1.TaskRunStatus{
+				TaskRunStatusFields: v1.TaskRunStatusFields{
+					Steps: []v1.StepState{
+						{
+							Name:       "first-inline",
+							Provenance: &v1.Provenance{},
+						},
+						{
+							Name:       "second-inline",
+							Provenance: &v1.Provenance{},
+						},
+					},
+				},
+			},
 		}, {
 			name: "StepAction only",
 			tr: &v1.TaskRun{

test/step_when_test.go

@@ -238,7 +238,7 @@ spec:
 			}
 			var ops cmp.Options
 			ops = append(ops, cmpopts.IgnoreFields(corev1.ContainerStateTerminated{}, "StartedAt", "FinishedAt", "ContainerID", "Message"))
-			ops = append(ops, cmpopts.IgnoreFields(v1.StepState{}, "ImageID"))
+			ops = append(ops, cmpopts.IgnoreFields(v1.StepState{Provenance: &v1.Provenance{}}, "ImageID"))
 			if d := cmp.Diff(taskrun.Status.Steps, tc.expected, ops); d != "" {
 				t.Fatalf("-got, +want: %v", d)
 			}
@@ -454,7 +454,7 @@ spec:
 			}
 			var ops cmp.Options
 			ops = append(ops, cmpopts.IgnoreFields(corev1.ContainerStateTerminated{}, "StartedAt", "FinishedAt", "ContainerID", "Message"))
-			ops = append(ops, cmpopts.IgnoreFields(v1.StepState{}, "ImageID"))
+			ops = append(ops, cmpopts.IgnoreFields(v1.StepState{Provenance: &v1.Provenance{}}, "ImageID"))
 			if d := cmp.Diff(taskrun.Status.Steps, tc.expected, ops); d != "" {
 				t.Fatalf("-got, +want: %v", d)
 			}

test/stepaction_results_test.go

@@ -224,12 +224,14 @@ status:
         - name: result1
           type: string
           value: inlined-step
+      provenance: {}
     - name: step2
       container: step-step2
       results:
         - name: result1
           type: string
           value: step-action
+      provenance: {}
 `, namespace))
 	return taskRun, expectedTaskRun
 }

test/taskrun_test.go

@@ -279,6 +279,7 @@ spec:
 							Reason:   "Completed",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},
@@ -308,6 +309,7 @@ spec:
 							Reason:   "Completed",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},
@@ -336,6 +338,7 @@ spec:
 							Reason:   "Error",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},
@@ -365,6 +368,7 @@ spec:
 							Reason:   "Error",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},
@@ -397,6 +401,7 @@ spec:
 							Reason:   "Error",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 				{
 					Container:         "step-second",
@@ -408,6 +413,7 @@ spec:
 							Reason:   "Error",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},
@@ -437,6 +443,7 @@ spec:
 							Reason:   "TaskRunCancelled",
 						},
 					},
+					Provenance: &v1.Provenance{},
 				},
 			},
 		},