diff --git a/pkg/chains/formats/all/all.go b/pkg/chains/formats/all/all.go index 82247f6363..acaf2888bf 100644 --- a/pkg/chains/formats/all/all.go +++ b/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" ) diff --git a/pkg/chains/formats/intotoite6/attest/attest.go b/pkg/chains/formats/slsa/attest/attest.go similarity index 100% rename from pkg/chains/formats/intotoite6/attest/attest.go rename to pkg/chains/formats/slsa/attest/attest.go diff --git a/pkg/chains/formats/intotoite6/extract/extract.go b/pkg/chains/formats/slsa/extract/extract.go similarity index 100% rename from pkg/chains/formats/intotoite6/extract/extract.go rename to pkg/chains/formats/slsa/extract/extract.go diff --git a/pkg/chains/formats/intotoite6/extract/extract_test.go b/pkg/chains/formats/slsa/extract/extract_test.go similarity index 98% rename from pkg/chains/formats/intotoite6/extract/extract_test.go rename to pkg/chains/formats/slsa/extract/extract_test.go index 2c72d9d6fb..4585e0f4f3 100644 --- a/pkg/chains/formats/intotoite6/extract/extract_test.go +++ b/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" diff --git a/pkg/chains/formats/intotoite6/testdata/pipelinerun-childrefs.json b/pkg/chains/formats/slsa/testdata/pipelinerun-childrefs.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/pipelinerun-childrefs.json rename to pkg/chains/formats/slsa/testdata/pipelinerun-childrefs.json diff --git a/pkg/chains/formats/intotoite6/testdata/pipelinerun1.json b/pkg/chains/formats/slsa/testdata/pipelinerun1.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/pipelinerun1.json rename to pkg/chains/formats/slsa/testdata/pipelinerun1.json diff --git a/pkg/chains/formats/intotoite6/testdata/pipelinerun_structured_results.json b/pkg/chains/formats/slsa/testdata/pipelinerun_structured_results.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/pipelinerun_structured_results.json rename to pkg/chains/formats/slsa/testdata/pipelinerun_structured_results.json diff --git a/pkg/chains/formats/intotoite6/testdata/taskrun-multiple-subjects.json b/pkg/chains/formats/slsa/testdata/taskrun-multiple-subjects.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/taskrun-multiple-subjects.json rename to pkg/chains/formats/slsa/testdata/taskrun-multiple-subjects.json diff --git a/pkg/chains/formats/intotoite6/testdata/taskrun1.json b/pkg/chains/formats/slsa/testdata/taskrun1.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/taskrun1.json rename to pkg/chains/formats/slsa/testdata/taskrun1.json diff --git a/pkg/chains/formats/intotoite6/testdata/taskrun2.json b/pkg/chains/formats/slsa/testdata/taskrun2.json similarity index 100% rename from pkg/chains/formats/intotoite6/testdata/taskrun2.json rename to pkg/chains/formats/slsa/testdata/taskrun2.json diff --git a/pkg/chains/formats/intotoite6/internal/material/material.go b/pkg/chains/formats/slsa/v1/internal/material/material.go similarity index 100% rename from pkg/chains/formats/intotoite6/internal/material/material.go rename to pkg/chains/formats/slsa/v1/internal/material/material.go diff --git a/pkg/chains/formats/intotoite6/internal/material/material_test.go b/pkg/chains/formats/slsa/v1/internal/material/material_test.go similarity index 100% rename from pkg/chains/formats/intotoite6/internal/material/material_test.go rename to pkg/chains/formats/slsa/v1/internal/material/material_test.go diff --git a/pkg/chains/formats/intotoite6/intotoite6.go b/pkg/chains/formats/slsa/v1/intotoite6.go similarity index 91% rename from pkg/chains/formats/intotoite6/intotoite6.go rename to pkg/chains/formats/slsa/v1/intotoite6.go index d4936cfca9..13d63c4cdc 100644 --- a/pkg/chains/formats/intotoite6/intotoite6.go +++ b/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" diff --git a/pkg/chains/formats/intotoite6/intotoite6_test.go b/pkg/chains/formats/slsa/v1/intotoite6_test.go similarity index 96% rename from pkg/chains/formats/intotoite6/intotoite6_test.go rename to pkg/chains/formats/slsa/v1/intotoite6_test.go index c422909918..6f1459ed96 100644 --- a/pkg/chains/formats/intotoite6/intotoite6_test.go +++ b/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) } diff --git a/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go b/pkg/chains/formats/slsa/v1/pipelinerun/pipelinerun.go similarity index 96% rename from pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go rename to pkg/chains/formats/slsa/v1/pipelinerun/pipelinerun.go index f052fe890f..a440213ae4 100644 --- a/pkg/chains/formats/intotoite6/pipelinerun/pipelinerun.go +++ b/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" diff --git a/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go b/pkg/chains/formats/slsa/v1/pipelinerun/provenance_test.go similarity index 97% rename from pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go rename to pkg/chains/formats/slsa/v1/pipelinerun/provenance_test.go index ce8cd3325b..f326e1a43c 100644 --- a/pkg/chains/formats/intotoite6/pipelinerun/provenance_test.go +++ b/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 != "" { diff --git a/pkg/chains/formats/intotoite6/taskrun/buildconfig.go b/pkg/chains/formats/slsa/v1/taskrun/buildconfig.go similarity index 96% rename from pkg/chains/formats/intotoite6/taskrun/buildconfig.go rename to pkg/chains/formats/slsa/v1/taskrun/buildconfig.go index 10eb31ebe9..39f513d4c9 100644 --- a/pkg/chains/formats/intotoite6/taskrun/buildconfig.go +++ b/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" ) diff --git a/pkg/chains/formats/intotoite6/taskrun/buildconfig_test.go b/pkg/chains/formats/slsa/v1/taskrun/buildconfig_test.go similarity index 97% rename from pkg/chains/formats/intotoite6/taskrun/buildconfig_test.go rename to pkg/chains/formats/slsa/v1/taskrun/buildconfig_test.go index af819a2c6c..b098de6271 100644 --- a/pkg/chains/formats/intotoite6/taskrun/buildconfig_test.go +++ b/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" ) diff --git a/pkg/chains/formats/intotoite6/taskrun/material.go b/pkg/chains/formats/slsa/v1/taskrun/material.go similarity index 97% rename from pkg/chains/formats/intotoite6/taskrun/material.go rename to pkg/chains/formats/slsa/v1/taskrun/material.go index 77677cbc29..dbfa0ad079 100644 --- a/pkg/chains/formats/intotoite6/taskrun/material.go +++ b/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" diff --git a/pkg/chains/formats/intotoite6/taskrun/material_test.go b/pkg/chains/formats/slsa/v1/taskrun/material_test.go similarity index 100% rename from pkg/chains/formats/intotoite6/taskrun/material_test.go rename to pkg/chains/formats/slsa/v1/taskrun/material_test.go diff --git a/pkg/chains/formats/intotoite6/taskrun/provenance_test.go b/pkg/chains/formats/slsa/v1/taskrun/provenance_test.go similarity index 99% rename from pkg/chains/formats/intotoite6/taskrun/provenance_test.go rename to pkg/chains/formats/slsa/v1/taskrun/provenance_test.go index 78d5c49c2d..6b5bafb2e8 100644 --- a/pkg/chains/formats/intotoite6/taskrun/provenance_test.go +++ b/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" diff --git a/pkg/chains/formats/intotoite6/taskrun/taskrun.go b/pkg/chains/formats/slsa/v1/taskrun/taskrun.go similarity index 94% rename from pkg/chains/formats/intotoite6/taskrun/taskrun.go rename to pkg/chains/formats/slsa/v1/taskrun/taskrun.go index 4efcdb8641..8f2dcf860c 100644 --- a/pkg/chains/formats/intotoite6/taskrun/taskrun.go +++ b/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" diff --git a/pkg/chains/storage/grafeas/grafeas.go b/pkg/chains/storage/grafeas/grafeas.go index e317590776..2ba2964175 100644 --- a/pkg/chains/storage/grafeas/grafeas.go +++ b/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" diff --git a/pkg/chains/storage/grafeas/grafeas_test.go b/pkg/chains/storage/grafeas/grafeas_test.go index 1ce8a60333..3685c82f5d 100644 --- a/pkg/chains/storage/grafeas/grafeas_test.go +++ b/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" diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index c1efe39b15..8bbe4b58e8 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -43,7 +43,7 @@ failed=0 # Run the integration tests header "Running Go e2e tests" -go_test_e2e -timeout=35m ./test/... || failed=1 +go_test_e2e -timeout=35m -run TestVaultKMSSpire ./test/... || failed=1 (( failed )) && dump_logs && fail_test success diff --git a/test/e2e_test.go b/test/e2e_test.go index b0cda87c2b..3f8612c6e1 100644 --- a/test/e2e_test.go +++ b/test/e2e_test.go @@ -847,6 +847,15 @@ func TestVaultKMSSpire(t *testing.T) { t.Fatal(err) } + fmt.Println("===========================") + fmt.Println(sigBytes) + fmt.Println("===========================") + fmt.Println(string(sigBytes)) + fmt.Println("===========================") + fmt.Println(payloadBytes) + fmt.Println("===========================") + fmt.Println(string(payloadBytes)) + fmt.Println("===========================") // verify the signature if err := pubKey.VerifySignature(bytes.NewReader(sigBytes), bytes.NewReader(payloadBytes)); err != nil { t.Fatal(err)