Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-v0.59.x] Handle error conditions in CheckMissingResultReferences #8093

Merged
merged 1 commit into from
Jul 4, 2024
Merged

[release-v0.59.x] Handle error conditions in CheckMissingResultReferences #8093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,14 +790,23 @@ func isCustomRunCancelledByPipelineRunTimeout(cr *v1beta1.CustomRun) bool {
func CheckMissingResultReferences(pipelineRunState PipelineRunState, targets PipelineRunState) error {
for _, target := range targets {
for _, resultRef := range v1.PipelineTaskResultRefs(target.PipelineTask) {
referencedPipelineTask := pipelineRunState.ToMap()[resultRef.PipelineTask]
referencedPipelineTask, ok := pipelineRunState.ToMap()[resultRef.PipelineTask]
if !ok {
return fmt.Errorf("Result reference error: Could not find ref \"%s\" in internal pipelineRunState", resultRef.PipelineTask)
}
if referencedPipelineTask.IsCustomTask() {
if len(referencedPipelineTask.CustomRuns) == 0 {
return fmt.Errorf("Result reference error: Internal result ref \"%s\" has zero-length CustomRuns", resultRef.PipelineTask)
}
customRun := referencedPipelineTask.CustomRuns[0]
_, err := findRunResultForParam(customRun, resultRef)
if err != nil {
return err
}
} else {
if len(referencedPipelineTask.TaskRuns) == 0 {
return fmt.Errorf("Result reference error: Internal result ref \"%s\" has zero-length TaskRuns", resultRef.PipelineTask)
}
taskRun := referencedPipelineTask.TaskRuns[0]
_, err := findTaskResultForParam(taskRun, resultRef)
if err != nil {
Expand Down
36 changes: 36 additions & 0 deletions pkg/reconciler/pipelinerun/resources/resultrefresolution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,28 @@ var pipelineRunState = PipelineRunState{{
Value: *v1.NewStructuredValues("$(tasks.kTask.results.I-DO-NOT-EXIST)[*]"),
}},
},
}, {
TaskRunNames: []string{"lTaskRun"},
TaskRuns: []*v1.TaskRun{},
PipelineTask: &v1.PipelineTask{
Name: "lTask",
TaskRef: &v1.TaskRef{Name: "lTask"},
Params: []v1.Param{{
Name: "jParam",
Value: *v1.NewStructuredValues("$(tasks.does-not-exist.results.some-result)"),
}},
},
}, {
TaskRunNames: []string{"mTaskRun"},
TaskRuns: []*v1.TaskRun{},
PipelineTask: &v1.PipelineTask{
Name: "mTask",
TaskRef: &v1.TaskRef{Name: "mTask"},
Params: []v1.Param{{
Name: "mParam",
Value: *v1.NewStructuredValues("$(tasks.lTask.results.aResult)"),
}},
},
}}

func TestResolveResultRefs(t *testing.T) {
Expand Down Expand Up @@ -724,6 +746,20 @@ func TestCheckMissingResultReferences(t *testing.T) {
pipelineRunState[14],
},
wantErr: "Invalid task result reference: Could not find result with name iDoNotExist for task aCustomPipelineTask",
}, {
name: "Invalid: Test result references where ref does not exist in pipelineRunState map",
pipelineRunState: pipelineRunState,
targets: PipelineRunState{
pipelineRunState[18],
},
wantErr: "Result reference error: Could not find ref \"does-not-exist\" in internal pipelineRunState",
}, {
name: "Invalid: Test result references where referencedPipelineTask has no TaskRuns",
pipelineRunState: pipelineRunState,
targets: PipelineRunState{
pipelineRunState[19],
},
wantErr: "Result reference error: Internal result ref \"lTask\" has zero-length TaskRuns",
}} {
t.Run(tt.name, func(t *testing.T) {
err := CheckMissingResultReferences(tt.pipelineRunState, tt.targets)
Expand Down