From d6f0d66362967ba78e9b0632ec40e970f1804d0e Mon Sep 17 00:00:00 2001 From: Chuang Wang Date: Mon, 28 Nov 2022 10:45:59 -0800 Subject: [PATCH] Remove `predicate.buildConfig.tasks[i].ref` field Related to https://github.com/tektoncd/chains/pull/436#discussion_r973143588. Prior, pipeline level provenance had a `ref` field in the `predicate.buildConfig` section. In this commit, we remove this `ref` field from buildconfig in favor of `buildConfig.tasks[i].invocation.configSource` https://github.com/tektoncd/chains/pull/554 because configsource should be enough to record the source information that we need to track the origin of the remote definitions. Since `predicate.buildConfig` is pretty much free text, this deletion shouldn't introduce backward incompatible changes. Signed-off-by: Chuang Wang --- .../formats/intotoite6/intotoite6_test.go | 32 +++++-------------- .../intotoite6/pipelinerun/pipelinerun.go | 4 --- .../intotoite6/pipelinerun/provenance_test.go | 32 +++++-------------- 3 files changed, 16 insertions(+), 52 deletions(-) diff --git a/pkg/chains/formats/intotoite6/intotoite6_test.go b/pkg/chains/formats/intotoite6/intotoite6_test.go index 67bb872ed1..046892b0f6 100644 --- a/pkg/chains/formats/intotoite6/intotoite6_test.go +++ b/pkg/chains/formats/intotoite6/intotoite6_test.go @@ -172,12 +172,8 @@ func TestPipelineRunCreatePayload(t *testing.T) { BuildConfig: pipelinerun.BuildConfig{ Tasks: []pipelinerun.TaskAttestation{ { - Name: "git-clone", - After: nil, - Ref: v1beta1.TaskRef{ - Name: "git-clone", - Kind: "ClusterTask", - }, + Name: "git-clone", + After: nil, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -219,12 +215,8 @@ func TestPipelineRunCreatePayload(t *testing.T) { }, }, { - Name: "build", - After: []string{"git-clone"}, - Ref: v1beta1.TaskRef{ - Name: "build", - Kind: "ClusterTask", - }, + Name: "build", + After: []string{"git-clone"}, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -360,12 +352,8 @@ func TestPipelineRunCreatePayloadChildRefs(t *testing.T) { BuildConfig: pipelinerun.BuildConfig{ Tasks: []pipelinerun.TaskAttestation{ { - Name: "git-clone", - After: nil, - Ref: v1beta1.TaskRef{ - Name: "git-clone", - Kind: "ClusterTask", - }, + Name: "git-clone", + After: nil, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -407,12 +395,8 @@ func TestPipelineRunCreatePayloadChildRefs(t *testing.T) { }, }, { - Name: "build", - After: []string{"git-clone"}, - Ref: v1beta1.TaskRef{ - Name: "build", - Kind: "ClusterTask", - }, + Name: "build", + After: []string{"git-clone"}, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", diff --git a/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go b/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go index 7e8b5b8c40..a4b826d9df 100644 --- a/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go +++ b/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go @@ -140,10 +140,6 @@ func buildConfig(pro *objects.PipelineRunObject, logger *zap.SugaredLogger) Buil Results: tr.Status.TaskRunResults, } - if t.TaskRef != nil { - task.Ref = *t.TaskRef - } - tasks = append(tasks, task) if i < len(pSpec.Tasks) { last = task.Name diff --git a/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go b/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go index 7de591a096..0c3c97be45 100644 --- a/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go +++ b/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go @@ -76,12 +76,8 @@ func TestBuildConfig(t *testing.T) { expected := BuildConfig{ Tasks: []TaskAttestation{ { - Name: "git-clone", - After: nil, - Ref: v1beta1.TaskRef{ - Name: "git-clone", - Kind: "ClusterTask", - }, + Name: "git-clone", + After: nil, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -123,12 +119,8 @@ func TestBuildConfig(t *testing.T) { }, }, { - Name: "build", - After: []string{"git-clone"}, - Ref: v1beta1.TaskRef{ - Name: "build", - Kind: "ClusterTask", - }, + Name: "build", + After: []string{"git-clone"}, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -252,12 +244,8 @@ func TestBuildConfigTaskOrder(t *testing.T) { expected := BuildConfig{ Tasks: []TaskAttestation{ { - Name: "git-clone", - After: nil, - Ref: v1beta1.TaskRef{ - Name: "git-clone", - Kind: "ClusterTask", - }, + Name: "git-clone", + After: nil, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded", @@ -299,12 +287,8 @@ func TestBuildConfigTaskOrder(t *testing.T) { }, }, { - Name: "build", - After: []string{"git-clone"}, - Ref: v1beta1.TaskRef{ - Name: "build", - Kind: "ClusterTask", - }, + Name: "build", + After: []string{"git-clone"}, StartedOn: e1BuildStart, FinishedOn: e1BuildFinished, Status: "Succeeded",