Updating provenance branding from intotoite to slsa (#684)

This PR completes step 1 of Issue
#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.

pkg/chains/formats/all/all.go

@@ -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"
 )

pkg/chains/formats/intotoite6/extract/extract_test.go → pkg/chains/formats/slsa/extract/extract_test.go

@@ -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"

pkg/chains/formats/intotoite6/intotoite6.go → pkg/chains/formats/slsa/v1/intotoite6.go

@@ -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"

pkg/chains/formats/intotoite6/intotoite6_test.go → pkg/chains/formats/slsa/v1/intotoite6_test.go

@@ -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"
@@ -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)
  }
@@ -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)
  }
@@ -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())
  }
@@ -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)
  }
@@ -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())
  }
@@ -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)
  }
@@ -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)
  }

pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go → pkg/chains/formats/slsa/v1/pipelinerun/pipelinerun.go

@@ -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"

pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go → pkg/chains/formats/slsa/v1/pipelinerun/provenance_test.go

@@ -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"
@@ -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 {
@@ -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)
  }
@@ -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 != "" {

pkg/chains/formats/intotoite6/taskrun/buildconfig.go → pkg/chains/formats/slsa/v1/taskrun/buildconfig.go

@@ -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"
 )

pkg/chains/formats/intotoite6/taskrun/buildconfig_test.go → pkg/chains/formats/slsa/v1/taskrun/buildconfig_test.go

@@ -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"
 )

pkg/chains/formats/intotoite6/taskrun/material.go → pkg/chains/formats/slsa/v1/taskrun/material.go

@@ -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"

pkg/chains/formats/intotoite6/taskrun/provenance_test.go → pkg/chains/formats/slsa/v1/taskrun/provenance_test.go

@@ -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"

pkg/chains/formats/intotoite6/taskrun/taskrun.go → pkg/chains/formats/slsa/v1/taskrun/taskrun.go

@@ -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"

pkg/chains/storage/grafeas/grafeas.go

@@ -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"

pkg/chains/storage/grafeas/grafeas_test.go

@@ -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"