Skip to content

Commit

Permalink
Updating provenance branding from intotoite to slsa
Browse files Browse the repository at this point in the history 
This PR completes step 1 of Issue
tektoncd#683.

It rebrands `intotoite6` to `slsa`. There is also a new sub-folder: `v1` that contains the existing `intotoite6` format.
A follow up PR will create a new folder `v2` that will contain the
complete build instructions in the provenance.
  • Loading branch information
@chitrangpatel
chitrangpatel committed Jan 18, 2023
1 parent 96c74ec commit b0aaab3
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion pkg/chains/formats/all/all.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package all

import (
_ "github.com/tektoncd/chains/pkg/chains/formats/intotoite6"
_ "github.com/tektoncd/chains/pkg/chains/formats/simple"
_ "github.com/tektoncd/chains/pkg/chains/formats/slsa/v1"
_ "github.com/tektoncd/chains/pkg/chains/formats/tekton"
)
0 ...hains/formats/intotoite6/attest/attest.go → pkg/chains/formats/slsa/attest/attest.go
View file
File renamed without changes.
0 ...ins/formats/intotoite6/extract/extract.go → pkg/chains/formats/slsa/extract/extract.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ormats/intotoite6/extract/extract_test.go → ...ains/formats/slsa/extract/extract_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
intoto "github.com/in-toto/in-toto-golang/in_toto"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
logtesting "knative.dev/pkg/logging/testing"
Expand Down
0 ...oite6/testdata/pipelinerun-childrefs.json → .../slsa/testdata/pipelinerun-childrefs.json
View file
File renamed without changes.
0 ...ats/intotoite6/testdata/pipelinerun1.json → ...s/formats/slsa/testdata/pipelinerun1.json
View file
File renamed without changes.
0 ...tdata/pipelinerun_structured_results.json → ...tdata/pipelinerun_structured_results.json
View file
File renamed without changes.
0 ...6/testdata/taskrun-multiple-subjects.json → ...a/testdata/taskrun-multiple-subjects.json
View file
File renamed without changes.
0 ...formats/intotoite6/testdata/taskrun1.json → ...hains/formats/slsa/testdata/taskrun1.json
View file
File renamed without changes.
0 ...formats/intotoite6/testdata/taskrun2.json → ...hains/formats/slsa/testdata/taskrun2.json
View file
File renamed without changes.
0 .../intotoite6/internal/material/material.go → ...ats/slsa/v1/internal/material/material.go
View file
File renamed without changes.
0 ...toite6/internal/material/material_test.go → ...lsa/v1/internal/material/material_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/chains/formats/intotoite6/intotoite6.go → pkg/chains/formats/slsa/v1/intotoite6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package intotoite6
package v1

import (
"context"
"fmt"

"github.com/tektoncd/chains/pkg/chains/formats"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/pipelinerun"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/taskrun"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/pipelinerun"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/taskrun"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/chains/pkg/config"
"knative.dev/pkg/logging"
Expand Down
26 changes: 13 additions & 13 deletions ...ins/formats/intotoite6/intotoite6_test.go → ...chains/formats/slsa/v1/intotoite6_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package intotoite6
package v1

import (
"testing"
"time"

"github.com/tektoncd/chains/pkg/chains/formats"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/pipelinerun"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/taskrun"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/pipelinerun"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/taskrun"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/chains/pkg/config"
"github.com/tektoncd/chains/pkg/internal/objectloader"
Expand All @@ -42,7 +42,7 @@ var e1BuildFinished = time.Unix(1617011415, 0)
func TestTaskRunCreatePayload1(t *testing.T) {
ctx := logtesting.TestContextWithLogger(t)

tr, err := objectloader.TaskRunFromFile("testdata/taskrun1.json")
tr, err := objectloader.TaskRunFromFile("../testdata/taskrun1.json")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestTaskRunCreatePayload1(t *testing.T) {

func TestPipelineRunCreatePayload(t *testing.T) {
ctx := logtesting.TestContextWithLogger(t)
pr, err := objectloader.PipelineRunFromFile("testdata/pipelinerun1.json")
pr, err := objectloader.PipelineRunFromFile("../testdata/pipelinerun1.json")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -336,11 +336,11 @@ func TestPipelineRunCreatePayload(t *testing.T) {
},
}

tr1, err := objectloader.TaskRunFromFile("testdata/taskrun1.json")
tr1, err := objectloader.TaskRunFromFile("../testdata/taskrun1.json")
if err != nil {
t.Errorf("error reading taskrun1: %s", err.Error())
}
tr2, err := objectloader.TaskRunFromFile("testdata/taskrun2.json")
tr2, err := objectloader.TaskRunFromFile("../testdata/taskrun2.json")
if err != nil {
t.Errorf("error reading taskrun: %s", err.Error())
}
Expand All @@ -361,7 +361,7 @@ func TestPipelineRunCreatePayload(t *testing.T) {
}
func TestPipelineRunCreatePayloadChildRefs(t *testing.T) {
ctx := logtesting.TestContextWithLogger(t)
pr, err := objectloader.PipelineRunFromFile("testdata/pipelinerun-childrefs.json")
pr, err := objectloader.PipelineRunFromFile("../testdata/pipelinerun-childrefs.json")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -548,11 +548,11 @@ func TestPipelineRunCreatePayloadChildRefs(t *testing.T) {
},
}

tr1, err := objectloader.TaskRunFromFile("testdata/taskrun1.json")
tr1, err := objectloader.TaskRunFromFile("../testdata/taskrun1.json")
if err != nil {
t.Errorf("error reading taskrun1: %s", err.Error())
}
tr2, err := objectloader.TaskRunFromFile("testdata/taskrun2.json")
tr2, err := objectloader.TaskRunFromFile("../testdata/taskrun2.json")
if err != nil {
t.Errorf("error reading taskrun: %s", err.Error())
}
Expand All @@ -573,7 +573,7 @@ func TestPipelineRunCreatePayloadChildRefs(t *testing.T) {

func TestTaskRunCreatePayload2(t *testing.T) {
ctx := logtesting.TestContextWithLogger(t)
tr, err := objectloader.TaskRunFromFile("testdata/taskrun2.json")
tr, err := objectloader.TaskRunFromFile("../testdata/taskrun2.json")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -646,7 +646,7 @@ func TestTaskRunCreatePayload2(t *testing.T) {
func TestMultipleSubjects(t *testing.T) {
ctx := logtesting.TestContextWithLogger(t)

tr, err := objectloader.TaskRunFromFile("testdata/taskrun-multiple-subjects.json")
tr, err := objectloader.TaskRunFromFile("../testdata/taskrun-multiple-subjects.json")
if err != nil {
t.Fatal(err)
}
Expand Down
8 changes: 4 additions & 4 deletions ...ats/intotoite6/pipelinerun/pipelinerun.go → ...ormats/slsa/v1/pipelinerun/pipelinerun.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
intoto "github.com/in-toto/in-toto-golang/in_toto"
slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
"github.com/tektoncd/chains/pkg/artifacts"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/internal/material"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/taskrun"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/internal/material"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/taskrun"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"go.uber.org/zap"
Expand Down
14 changes: 7 additions & 7 deletions ...intotoite6/pipelinerun/provenance_test.go → ...ts/slsa/v1/pipelinerun/provenance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/google/go-containerregistry/pkg/name"
intoto "github.com/in-toto/in-toto-golang/in_toto"
slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/chains/pkg/internal/objectloader"
"github.com/tektoncd/chains/test"
Expand All @@ -39,8 +39,8 @@ var e1BuildStart = time.Unix(1617011400, 0)
var e1BuildFinished = time.Unix(1617011415, 0)

func init() {
pro = createPro("../testdata/pipelinerun1.json")
proStructuredResults = createPro("../testdata/pipelinerun_structured_results.json")
pro = createPro("../../testdata/pipelinerun1.json")
proStructuredResults = createPro("../../testdata/pipelinerun_structured_results.json")
}

func createPro(path string) *objects.PipelineRunObject {
Expand All @@ -49,11 +49,11 @@ func createPro(path string) *objects.PipelineRunObject {
if err != nil {
panic(err)
}
tr1, err := objectloader.TaskRunFromFile("../testdata/taskrun1.json")
tr1, err := objectloader.TaskRunFromFile("../../testdata/taskrun1.json")
if err != nil {
panic(err)
}
tr2, err := objectloader.TaskRunFromFile("../testdata/taskrun2.json")
tr2, err := objectloader.TaskRunFromFile("../../testdata/taskrun2.json")
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -400,7 +400,7 @@ func TestBuildConfigTaskOrder(t *testing.T) {
WhenExpressions: tt.whenExpressions,
RunAfter: tt.runAfter,
}
pro := createPro("../testdata/pipelinerun1.json")
pro := createPro("../../testdata/pipelinerun1.json")
pro.Status.PipelineSpec.Tasks[BUILD_TASK] = pt
got := buildConfig(pro, logtesting.TestLogger(t))
if diff := cmp.Diff(expected, got); diff != "" {
Expand Down
2 changes: 1 addition & 1 deletion ...formats/intotoite6/taskrun/buildconfig.go → ...ns/formats/slsa/v1/taskrun/buildconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package taskrun

import (
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
)
Expand Down
2 changes: 1 addition & 1 deletion ...ts/intotoite6/taskrun/buildconfig_test.go → ...rmats/slsa/v1/taskrun/buildconfig_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/ghodss/yaml"
"github.com/google/go-cmp/cmp"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
)
Expand Down
4 changes: 2 additions & 2 deletions ...ns/formats/intotoite6/taskrun/material.go → ...hains/formats/slsa/v1/taskrun/material.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
"github.com/tektoncd/chains/pkg/artifacts"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/internal/material"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/v1/internal/material"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
Expand Down
0 ...rmats/intotoite6/taskrun/material_test.go → .../formats/slsa/v1/taskrun/material_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ats/intotoite6/taskrun/provenance_test.go → ...ormats/slsa/v1/taskrun/provenance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/in-toto/in-toto-golang/in_toto"
"github.com/tektoncd/chains/pkg/artifacts"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions ...ins/formats/intotoite6/taskrun/taskrun.go → ...chains/formats/slsa/v1/taskrun/taskrun.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package taskrun
import (
intoto "github.com/in-toto/in-toto-golang/in_toto"
slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/attest"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/attest"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion pkg/chains/storage/grafeas/grafeas.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/pkg/errors"
"github.com/sigstore/cosign/pkg/types"
"github.com/tektoncd/chains/pkg/chains/formats"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/chains/pkg/config"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/chains/storage/grafeas/grafeas_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
intoto "github.com/in-toto/in-toto-golang/in_toto"
slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
"github.com/tektoncd/chains/pkg/chains/formats"
"github.com/tektoncd/chains/pkg/chains/formats/intotoite6/extract"
"github.com/tektoncd/chains/pkg/chains/formats/slsa/extract"
"github.com/tektoncd/chains/pkg/chains/objects"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"google.golang.org/grpc"
Expand Down

0 comments on commit b0aaab3

Please sign in to comment.