Fix up after review

internal/test/test.go

@@ -6,12 +6,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/docker/attest/pkg/attestation"
-	"github.com/docker/attest/pkg/oci"
 	"github.com/docker/attest/pkg/policy"
 	"github.com/docker/attest/pkg/signerverifier"
 	"github.com/docker/attest/pkg/tlog"
@@ -83,14 +81,6 @@ func Setup(t *testing.T) (context.Context, dsse.SignerVerifier) {
 	return ctx, signer
 }
 
-func GetMockSigner(ctx context.Context) (dsse.SignerVerifier, error) {
-	priv, err := os.ReadFile(filepath.Join("..", "..", "test", "testdata", "test-signing-key.pem"))
-	if err != nil {
-		return nil, err
-	}
-	return signerverifier.LoadKeyPair(priv)
-}
-
 type AnnotatedStatement struct {
 	OCIDescriptor   *v1.Descriptor
 	InTotoStatement *intoto.Statement
@@ -194,32 +184,3 @@ func ExtractAnnotatedStatements(path string, mediaType string) ([]*AnnotatedStat
 	}
 	return ExtractStatementsFromIndex(mfs, mediaType)
 }
-
-type MockResolver struct {
-	Envs []*attestation.Envelope
-}
-
-func (r MockResolver) Attestations(ctx context.Context, mediaType string) ([]*attestation.Envelope, error) {
-	return r.Envs, nil
-}
-
-func (r MockResolver) ImageName(ctx context.Context) (string, error) {
-	return "library/alpine:latest", nil
-}
-
-func (r MockResolver) ImageDescriptor(ctx context.Context) (*v1.Descriptor, error) {
-	digest, err := v1.NewHash("sha256:da8b190665956ea07890a0273e2a9c96bfe291662f08e2860e868eef69c34620")
-	if err != nil {
-		return nil, err
-	}
-	return &v1.Descriptor{
-		Digest:    digest,
-		Size:      1234,
-		MediaType: "application/vnd.oci.image.manifest.v1+json",
-	}, nil
-
-}
-
-func (r MockResolver) ImagePlatform(ctx context.Context) (*v1.Platform, error) {
-	return oci.ParsePlatform("linux/amd64")
-}

pkg/attest/sign_test.go

@@ -140,6 +140,7 @@ func TestAddSignedLayerAnnotations(t *testing.T) {
 				SubjectDescriptor: &v1.Descriptor{},
 			}
 			err := manifest.AddAttestation(ctx, signer, originalLayer.Statement, opts)
+			require.NoError(t, err)
 
 			newImg, err := manifest.BuildAttestationImage(attestation.WithReplacedLayers(tc.replace))
 			require.NoError(t, err)
@@ -236,6 +237,7 @@ func TestSimpleStatementSigning(t *testing.T) {
 
 			indexName := fmt.Sprintf("%s/repo:root", u.Host)
 			output, err := oci.ParseImageSpecs(indexName)
+			require.NoError(t, err)
 			err = mirror.SaveReferrers(manifest, output)
 			require.NoError(t, err)
 		})

pkg/mirror/mirror_test.go

@@ -1,7 +1,6 @@
 package mirror
 
 import (
-	"context"
 	"fmt"
 	"net/http/httptest"
 	"net/url"
@@ -38,6 +37,7 @@ func TestSavingIndex(t *testing.T) {
 	require.NoError(t, err)
 
 	ociOutput, err := oci.ParseImageSpecs("oci://" + outputLayout)
+	require.NoError(t, err)
 	err = SaveIndex(ociOutput, attIdx.Index, indexName)
 	require.NoError(t, err)
 }
@@ -61,6 +61,7 @@ func TestSavingImage(t *testing.T) {
 	require.NoError(t, err)
 
 	ociOutput, err := oci.ParseImageSpec("oci://" + outputLayout)
+	require.NoError(t, err)
 	err = SaveImage(ociOutput, img, indexName)
 	require.NoError(t, err)
 }
@@ -92,13 +93,14 @@ func TestSavingReferrers(t *testing.T) {
 
 	indexName := fmt.Sprintf("%s/repo:root", u.Host)
 	output, err := oci.ParseImageSpecs(indexName)
+	require.NoError(t, err)
 	err = SaveReferrers(manifest, output)
 	require.NoError(t, err)
 
-	reg := &MockRegistryResolver{
-		subject:      subject,
+	reg := &test.MockRegistryResolver{
+		Subject:      subject,
 		MockResolver: &test.MockResolver{},
-		imageName:    indexName,
+		ImageNameStr: indexName,
 	}
 	require.NoError(t, err)
 	refResolver, err := oci.NewReferrersAttestationResolver(reg)
@@ -107,17 +109,3 @@ func TestSavingReferrers(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, attestations, 1)
 }
-
-type MockRegistryResolver struct {
-	subject   *v1.Descriptor
-	imageName string
-	*test.MockResolver
-}
-
-func (r *MockRegistryResolver) ImageDescriptor(ctx context.Context) (*v1.Descriptor, error) {
-	return r.subject, nil
-}
-
-func (r *MockRegistryResolver) ImageName(ctx context.Context) (string, error) {
-	return r.imageName, nil
-}