Skip to content

Commit bb8068f

Browse files
JeromeJutekton-robot
authored andcommitted
Remove PipelineResourceResultType of PipelineResourceResult Struct
This commit removes the PipelineResourceResultType of PipelineResourceResult Struct given now the PipelineResources have been removed.
1 parent 06c176a commit bb8068f

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

pkg/apis/pipeline/v1beta1/resource_types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ func (r *ResultType) UnmarshalJSON(data []byte) error {
6969
switch asString {
7070
case "TaskRunResult":
7171
*r = TaskRunResultType
72-
case "PipelineResourceResult":
73-
*r = PipelineResourceResultType
7472
case "InternalTektonResult":
7573
*r = InternalTektonResultType
7674
default:

pkg/apis/pipeline/v1beta1/task_types.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ import (
2727
const (
2828
// TaskRunResultType default task run result value
2929
TaskRunResultType ResultType = 1
30-
// PipelineResourceResultType default pipeline result value
31-
PipelineResourceResultType = 2
30+
// reserved: 2
31+
// was PipelineResourceResultType
32+
3233
// InternalTektonResultType default internal tekton result value
3334
InternalTektonResultType = 3
3435
// UnknownResultType default unknown result type value

pkg/pod/status.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specRes
290290
case v1beta1.InternalTektonResultType:
291291
// Internal messages are ignored because they're not used as external result
292292
continue
293-
case v1beta1.PipelineResourceResultType:
294-
fallthrough
295293
default:
296294
pipelineResourceResults = append(pipelineResourceResults, r)
297295
filteredResults = append(filteredResults, r)

pkg/pod/status_test.go

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ func TestMakeTaskRunStatus(t *testing.T) {
870870
Name: "step-pear",
871871
State: corev1.ContainerState{
872872
Terminated: &corev1.ContainerStateTerminated{
873-
Message: `[{"key":"resultNameOne","value":"","type":2}, {"key":"resultNameTwo","value":"","type":3}, {"key":"resultNameThree","value":"","type":1}]`},
873+
Message: `[{"key":"resultNameOne","value":"","type":3}, {"key":"resultNameThree","value":"","type":1}]`},
874874
},
875875
}},
876876
},
@@ -880,17 +880,12 @@ func TestMakeTaskRunStatus(t *testing.T) {
880880
Steps: []v1beta1.StepState{{
881881
ContainerState: corev1.ContainerState{
882882
Terminated: &corev1.ContainerStateTerminated{
883-
Message: `[{"key":"resultNameOne","value":"","type":2},{"key":"resultNameThree","value":"","type":1}]`,
883+
Message: `[{"key":"resultNameThree","value":"","type":1}]`,
884884
}},
885885
Name: "pear",
886886
ContainerName: "step-pear",
887887
}},
888888
Sidecars: []v1beta1.SidecarState{},
889-
ResourcesResult: []v1beta1.PipelineResourceResult{{
890-
Key: "resultNameOne",
891-
Value: "",
892-
ResultType: v1beta1.PipelineResourceResultType,
893-
}},
894889
TaskRunResults: []v1beta1.TaskRunResult{{
895890
Name: "resultNameThree",
896891
Type: v1beta1.ResultsTypeString,
@@ -908,7 +903,7 @@ func TestMakeTaskRunStatus(t *testing.T) {
908903
Name: "step-pear",
909904
State: corev1.ContainerState{
910905
Terminated: &corev1.ContainerStateTerminated{
911-
Message: `[{"key":"resultNameOne","value":"","type":"PipelineResourceResult"}, {"key":"resultNameTwo","value":"","type":"InternalTektonResult"}, {"key":"resultNameThree","value":"","type":"TaskRunResult"}]`,
906+
Message: `[{"key":"resultNameTwo","value":"","type":"InternalTektonResult"}, {"key":"resultNameThree","value":"","type":"TaskRunResult"}]`,
912907
},
913908
},
914909
}},
@@ -919,17 +914,12 @@ func TestMakeTaskRunStatus(t *testing.T) {
919914
Steps: []v1beta1.StepState{{
920915
ContainerState: corev1.ContainerState{
921916
Terminated: &corev1.ContainerStateTerminated{
922-
Message: `[{"key":"resultNameOne","value":"","type":2},{"key":"resultNameThree","value":"","type":1}]`,
917+
Message: `[{"key":"resultNameThree","value":"","type":1}]`,
923918
}},
924919
Name: "pear",
925920
ContainerName: "step-pear",
926921
}},
927922
Sidecars: []v1beta1.SidecarState{},
928-
ResourcesResult: []v1beta1.PipelineResourceResult{{
929-
Key: "resultNameOne",
930-
Value: "",
931-
ResultType: v1beta1.PipelineResourceResultType,
932-
}},
933923
TaskRunResults: []v1beta1.TaskRunResult{{
934924
Name: "resultNameThree",
935925
Type: v1beta1.ResultsTypeString,

0 commit comments

Comments
 (0)