diff --git a/cmd/git-init/main.go b/cmd/git-init/main.go index b01d0380a1b..5affbc423e6 100644 --- a/cmd/git-init/main.go +++ b/cmd/git-init/main.go @@ -61,19 +61,13 @@ func main() { resourceName := os.Getenv("TEKTON_RESOURCE_NAME") output := []v1beta1.PipelineResourceResult{ { - Key: "commit", - Value: commit, - ResourceRef: &v1beta1.PipelineResourceRef{ - Name: resourceName, - }, + Key: "commit", + Value: commit, ResourceName: resourceName, }, { - Key: "url", - Value: fetchSpec.URL, - ResourceRef: &v1beta1.PipelineResourceRef{ - Name: resourceName, - }, + Key: "url", + Value: fetchSpec.URL, ResourceName: resourceName, }, } diff --git a/cmd/imagedigestexporter/main.go b/cmd/imagedigestexporter/main.go index 53db04d9a6a..33496dab427 100644 --- a/cmd/imagedigestexporter/main.go +++ b/cmd/imagedigestexporter/main.go @@ -67,17 +67,11 @@ func main() { Key: "digest", Value: digest.String(), ResourceName: imageResource.Name, - ResourceRef: &v1beta1.PipelineResourceRef{ - Name: imageResource.Name, - }, }) output = append(output, v1beta1.PipelineResourceResult{ Key: "url", Value: imageResource.URL, ResourceName: imageResource.Name, - ResourceRef: &v1beta1.PipelineResourceRef{ - Name: imageResource.Name, - }, }) } diff --git a/docs/deprecations.md b/docs/deprecations.md index 806715d3a2b..ff12f9cc421 100644 --- a/docs/deprecations.md +++ b/docs/deprecations.md @@ -19,11 +19,10 @@ being deprecated. | Feature Being Deprecated | Deprecation Announcement | [API Compatibility Policy](https://github.com/tektoncd/pipeline/tree/main/api_compatibility_policy.md) | Earliest Date or Release of Removal | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|-------------------------------------| -| [The `TaskRun.Status.ResourceResults.ResourceRef` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2694) | [v0.14.0](https://github.com/tektoncd/pipeline/releases/tag/v0.14.0) | Beta | April 30 2021 | | [The `PipelineRun.Spec.ServiceAccountNames` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2614) | [v0.15.0](https://github.com/tektoncd/pipeline/releases/tag/v0.15.0) | Beta | May 15 2021 | | [`PipelineRunCancelled` is deprecated and will be removed](https://github.com/tektoncd/pipeline/issues/4611) | [v0.25.0](https://github.com/tektoncd/pipeline/releases/tag/v0.25.0) | Beta | July 12 2022 | | [`PipelineResources` are deprecated.](https://github.com/tektoncd/community/blob/main/teps/0074-deprecate-pipelineresources.md) | [v0.30.0](https://github.com/tektoncd/pipeline/releases/tag/v0.30.0) | Alpha | Dec 20 2021 | | [The `PipelineRun.Status.TaskRuns` and `PipelineRun.Status.Runs` fields are deprecated and will be removed.](https://github.com/tektoncd/community/blob/main/teps/0100-embedded-taskruns-and-runs-status-in-pipelineruns.md) | v0.35.0 | Beta | Jan 25, 2023 | | [PipelineRun.Timeout is deprecated and will be removed](https://github.com/tektoncd/community/blob/main/teps/0046-finallytask-execution-post-timeout.md) | v0.36.0 (to be released) | Beta | Feb 25, 2023 | -| [Several fields of Task.Step are deprecated](https://github.com/tektoncd/pipeline/issues/4737) | v0.36.0 (to be released) | Beta | Feb 25, 2023 | \ No newline at end of file +| [Several fields of Task.Step are deprecated](https://github.com/tektoncd/pipeline/issues/4737) | v0.36.0 (to be released) | Beta | Feb 25, 2023 | diff --git a/docs/pipelineruns.md b/docs/pipelineruns.md index 7c745a45172..a4aa01fc3e9 100644 --- a/docs/pipelineruns.md +++ b/docs/pipelineruns.md @@ -941,8 +941,7 @@ taskRuns: podName: triggers-release-nightly-frwmw-build-pod resourcesResult: - key: commit - resourceRef: - name: git-source-triggers-frwmw + resourceName: git-source-triggers-frwmw value: 9ab5a1234166a89db352afa28f499d596ebb48db startTime: "2020-05-04T02:05:07Z" steps: diff --git a/docs/resources.md b/docs/resources.md index 6b107143299..d2efeb57a05 100644 --- a/docs/resources.md +++ b/docs/resources.md @@ -240,8 +240,7 @@ For an example of what this output looks like: resourcesResult: - key: digest value: sha256:a08412a4164b85ae521b0c00cf328e3aab30ba94a526821367534b81e51cb1cb - resourceRef: - name: skaffold-image-leeroy-web + resourceName: skaffold-image-leeroy-web ``` ### Description @@ -380,8 +379,7 @@ When used as an input, the Git resource includes the exact commit fetched in the resourceResults: - key: commit value: 6ed7aad5e8a36052ee5f6079fc91368e362121f7 - resourceRef: - name: skaffold-git + resourceName: skaffold-git ``` #### Using a fork @@ -663,8 +661,7 @@ status: resourcesResult: - key: "digest" value: "sha256:eed29cd0b6feeb1a92bc3c4f977fd203c63b376a638731c88cacefe3adb1c660" - resourceRef: - name: skaffold-image-leeroy-web + resourceName: skaffold-image-leeroy-web # ... ``` diff --git a/examples/v1alpha1/taskruns/cloud-event.yaml b/examples/v1alpha1/taskruns/cloud-event.yaml index 04e2745ff11..1dc3c401a11 100644 --- a/examples/v1alpha1/taskruns/cloud-event.yaml +++ b/examples/v1alpha1/taskruns/cloud-event.yaml @@ -139,7 +139,7 @@ spec: print("Got it!") taskrun = json.loads(response.read().decode('utf-8')) digest = taskrun['taskRun']['status']['resourcesResult'][0]['value'] - image_name = taskrun['taskRun']['status']['resourcesResult'][0]['resourceRef']['name'] + image_name = taskrun['taskRun']['status']['resourcesResult'][0]['resourceName'] print("Got digest %s for image %s" % (digest, image_name)) if image_name == "myimage" and digest: break diff --git a/examples/v1beta1/taskruns/cloud-event.yaml b/examples/v1beta1/taskruns/cloud-event.yaml index 5d02f1375c3..1302233b2ed 100644 --- a/examples/v1beta1/taskruns/cloud-event.yaml +++ b/examples/v1beta1/taskruns/cloud-event.yaml @@ -141,7 +141,7 @@ spec: print("Got it!") taskrun = json.loads(response.read().decode('utf-8')) digest = taskrun['taskRun']['status']['resourcesResult'][0]['value'] - image_name = taskrun['taskRun']['status']['resourcesResult'][0]['resourceRef']['name'] + image_name = taskrun['taskRun']['status']['resourcesResult'][0]['resourceName'] print("Got digest %s for image %s" % (digest, image_name)) if image_name == "myimage" and digest: break diff --git a/pkg/apis/pipeline/v1beta1/openapi_generated.go b/pkg/apis/pipeline/v1beta1/openapi_generated.go index 72ad203b36b..294409a481e 100644 --- a/pkg/apis/pipeline/v1beta1/openapi_generated.go +++ b/pkg/apis/pipeline/v1beta1/openapi_generated.go @@ -1228,12 +1228,6 @@ func schema_pkg_apis_pipeline_v1beta1_PipelineResourceResult(ref common.Referenc Format: "", }, }, - "resourceRef": { - SchemaProps: spec.SchemaProps{ - Description: "The field ResourceRef should be deprecated and removed in the next API version. See https://github.com/tektoncd/pipeline/issues/2694 for more information.", - Ref: ref("github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1.PipelineResourceRef"), - }, - }, "type": { SchemaProps: spec.SchemaProps{ Type: []string{"integer"}, @@ -1244,8 +1238,6 @@ func schema_pkg_apis_pipeline_v1beta1_PipelineResourceResult(ref common.Referenc Required: []string{"key", "value"}, }, }, - Dependencies: []string{ - "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1.PipelineResourceRef"}, } } diff --git a/pkg/apis/pipeline/v1beta1/resource_types.go b/pkg/apis/pipeline/v1beta1/resource_types.go index 0eda026817a..203a87c40ab 100644 --- a/pkg/apis/pipeline/v1beta1/resource_types.go +++ b/pkg/apis/pipeline/v1beta1/resource_types.go @@ -128,13 +128,10 @@ type PipelineResourceBinding struct { // PipelineResourceResult used to export the image name and digest as json type PipelineResourceResult struct { - Key string `json:"key"` - Value string `json:"value"` - ResourceName string `json:"resourceName,omitempty"` - // The field ResourceRef should be deprecated and removed in the next API version. - // See https://github.com/tektoncd/pipeline/issues/2694 for more information. - ResourceRef *PipelineResourceRef `json:"resourceRef,omitempty"` - ResultType ResultType `json:"type,omitempty"` + Key string `json:"key"` + Value string `json:"value"` + ResourceName string `json:"resourceName,omitempty"` + ResultType ResultType `json:"type,omitempty"` } // ResultType used to find out whether a PipelineResourceResult is from a task result or not diff --git a/pkg/apis/pipeline/v1beta1/swagger.json b/pkg/apis/pipeline/v1beta1/swagger.json index 32a8eb48f79..7800d55c8d5 100644 --- a/pkg/apis/pipeline/v1beta1/swagger.json +++ b/pkg/apis/pipeline/v1beta1/swagger.json @@ -771,10 +771,6 @@ "resourceName": { "type": "string" }, - "resourceRef": { - "description": "The field ResourceRef should be deprecated and removed in the next API version. See https://github.com/tektoncd/pipeline/issues/2694 for more information.", - "$ref": "#/definitions/v1beta1.PipelineResourceRef" - }, "type": { "type": "integer", "format": "int32" diff --git a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go index b24a077dabf..89846e1d64c 100644 --- a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go @@ -419,11 +419,6 @@ func (in *PipelineResourceRef) DeepCopy() *PipelineResourceRef { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PipelineResourceResult) DeepCopyInto(out *PipelineResourceResult) { *out = *in - if in.ResourceRef != nil { - in, out := &in.ResourceRef, &out.ResourceRef - *out = new(PipelineResourceRef) - **out = **in - } return } @@ -1970,9 +1965,7 @@ func (in *TaskRunStatusFields) DeepCopyInto(out *TaskRunStatusFields) { if in.ResourcesResult != nil { in, out := &in.ResourcesResult, &out.ResourcesResult *out = make([]PipelineResourceResult, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } + copy(*out, *in) } if in.TaskRunResults != nil { in, out := &in.TaskRunResults, &out.TaskRunResults diff --git a/pkg/pod/status_test.go b/pkg/pod/status_test.go index 4af72c0f82d..e2c8f4e9dee 100644 --- a/pkg/pod/status_test.go +++ b/pkg/pod/status_test.go @@ -44,7 +44,7 @@ func TestSetTaskRunStatusBasedOnStepStatus(t *testing.T) { Name: "step-bar-0", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }, @@ -52,7 +52,7 @@ func TestSetTaskRunStatusBasedOnStepStatus(t *testing.T) { Name: "step-bar1", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234` + strings.Repeat("a", 3072) + `","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234` + strings.Repeat("a", 3072) + `","resourceName":"source-image"}]`, }, }, }, @@ -60,7 +60,7 @@ func TestSetTaskRunStatusBasedOnStepStatus(t *testing.T) { Name: "step-bar2", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234` + strings.Repeat("a", 3072) + `","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234` + strings.Repeat("a", 3072) + `","resourceName":"source-image"}]`, }, }, }}, @@ -571,7 +571,7 @@ func TestMakeTaskRunStatus(t *testing.T) { Name: "step-foo", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:12345","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"digest","value":"sha256:12345","resourceName":"source-image"}]`, }, }, }}, @@ -582,16 +582,16 @@ func TestMakeTaskRunStatus(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:12345","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"digest","value":"sha256:12345","resourceName":"source-image"}]`, }}, Name: "foo", ContainerName: "step-foo", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:12345", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:12345", + ResourceName: "source-image", }}, // We don't actually care about the time, just that it's not nil CompletionTime: &metav1.Time{Time: time.Now()}, @@ -605,7 +605,7 @@ func TestMakeTaskRunStatus(t *testing.T) { Name: "step-bar", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -616,16 +616,16 @@ func TestMakeTaskRunStatus(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"resultValue","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"resultValue","type":1}]`, }}, Name: "bar", ContainerName: "step-bar", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", @@ -644,7 +644,7 @@ func TestMakeTaskRunStatus(t *testing.T) { Name: "step-banana", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"resultValue", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -655,16 +655,16 @@ func TestMakeTaskRunStatus(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"resultValue","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"resultValue","type":1}]`, }}, Name: "banana", ContainerName: "step-banana", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", @@ -1100,7 +1100,7 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Name: "step-bar", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -1111,16 +1111,16 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"","type":1}]`, }}, Name: "bar", ContainerName: "step-bar", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", @@ -1139,7 +1139,7 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Name: "step-bar", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"hello", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"hello", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -1150,16 +1150,16 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"hello","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"hello","type":1}]`, }}, Name: "bar", ContainerName: "step-bar", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", @@ -1178,7 +1178,7 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Name: "step-bar", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"[\"hello\",\"world\"]", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"[\"hello\",\"world\"]", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -1189,16 +1189,16 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"[\"hello\",\"world\"]","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"[\"hello\",\"world\"]","type":1}]`, }}, Name: "bar", ContainerName: "step-bar", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", @@ -1217,7 +1217,7 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Name: "step-bar", State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"resultName","value":"{\"hello\":\"world\"}", "type":1}, {"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}}]`, + Message: `[{"key":"resultName","value":"{\"hello\":\"world\"}", "type":1}, {"key":"digest","value":"sha256:1234","resourceName":"source-image"}]`, }, }, }}, @@ -1228,16 +1228,16 @@ func TestMakeTaskRunStatusAlpha(t *testing.T) { Steps: []v1beta1.StepState{{ ContainerState: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{ - Message: `[{"key":"digest","value":"sha256:1234","resourceRef":{"name":"source-image"}},{"key":"resultName","value":"{\"hello\":\"world\"}","type":1}]`, + Message: `[{"key":"digest","value":"sha256:1234","resourceName":"source-image"},{"key":"resultName","value":"{\"hello\":\"world\"}","type":1}]`, }}, Name: "bar", ContainerName: "step-bar", }}, Sidecars: []v1beta1.SidecarState{}, ResourcesResult: []v1beta1.PipelineResourceResult{{ - Key: "digest", - Value: "sha256:1234", - ResourceRef: &v1beta1.PipelineResourceRef{Name: "source-image"}, + Key: "digest", + Value: "sha256:1234", + ResourceName: "source-image", }}, TaskRunResults: []v1beta1.TaskRunResult{{ Name: "resultName", diff --git a/test/kaniko_task_test.go b/test/kaniko_task_test.go index b041c666c54..caecbba91ad 100644 --- a/test/kaniko_task_test.go +++ b/test/kaniko_task_test.go @@ -105,8 +105,8 @@ func TestKanikoTaskRun(t *testing.T) { case "url": url = rr.Value } - // Every resource should have a ref with a name - if rr.ResourceRef.Name == "" { + // Every resource should have a resource name + if rr.ResourceName == "" { t.Errorf("Resource ref not set for %v in TaskRun: %v", rr, tr) } }