fixup! wip: fixture: store test fixtures in OCI artifacts

Signed-off-by: Hank Donnay <[email protected]>

Author: hdonnay

test/fixture/fixture.go

@@ -23,7 +23,8 @@ import (
 )
 
 func lookupCaller(t *testing.T) string {
-	pc, _, _, ok := runtime.Caller(3)
+	const module = `github.com/quay/claircore/`
+	pc, _, _, ok := runtime.Caller(2)
 	if !ok {
 		t.Fatal("unable to get caller")
 	}
@@ -33,14 +34,13 @@ func lookupCaller(t *testing.T) string {
 	if idx == -1 {
 		t.Fatalf("weird name: %q", name)
 	}
-	name = name[:idx]
-	return name
+	return strings.TrimPrefix(name[:idx], module)
 }
 
 var (
 	// Alternatively, use ghcr.io ?
 	Registry  = `quay.io`
-	Namespace = `projectclair`
+	Namespace = `projectquay`
 	Tag       = `latest`
 )
 
@@ -69,6 +69,7 @@ const (
 // Fetch ...
 func Fetch[V Value, K Kind[V]](ctx context.Context, t *testing.T) []V {
 	t.Helper()
+	repo := lookupCaller(t)
 	dir := filepath.Join(integration.PackageCacheDir(t), "fixtures")
 	if err := os.Mkdir(dir, 0755); err != nil && !errors.Is(err, fs.ErrExist) {
 		t.Fatal(err)
@@ -78,14 +79,15 @@ func Fetch[V Value, K Kind[V]](ctx context.Context, t *testing.T) []V {
 
 	c := regclient.New(
 		regclient.WithFS(sys),
+		regclient.WithDockerCreds(),
 	)
 	tgt, err := ref.New("ocidir://" + Tag)
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Run("FetchFixtures", func(t *testing.T) {
 		integration.Skip(t)
-		name := fmt.Sprintf("%s/%s/%s:%s", Registry, Namespace, lookupCaller(t), Tag)
+		name := fmt.Sprintf("%s/%s/%s:%s", Registry, Namespace, repo, Tag)
 		t.Logf("pulling fixtues referencing %q", name)
 		remote, err := ref.New(name)
 		if err != nil {
@@ -105,11 +107,13 @@ func Fetch[V Value, K Kind[V]](ctx context.Context, t *testing.T) []V {
 		t.Fatalf("unexpected error with local files: %v", err)
 	}
 
-	list, err := c.ReferrerList(ctx, tgt, scheme.WithReferrerAT(elem.ArtifactType()))
+	at := elem.ArtifactType()
+	list, err := c.ReferrerList(ctx, tgt, scheme.WithReferrerAT(at))
 	if err != nil {
 		t.Fatal(err)
 	}
 	if list.IsEmpty() {
+		t.Logf("no manifests of type %q for %s", at, tgt.CommonName())
 		return nil
 	}
 
@@ -120,14 +124,15 @@ func Fetch[V Value, K Kind[V]](ctx context.Context, t *testing.T) []V {
 		if err != nil {
 			t.Fatalf("error fetching blob: %v", err)
 		}
+		t.Logf("found descriptor: %v", d)
 		// Don't worry too much about the Reader; all tests are transitory, man.
 		var m oci.Manifest
 		if err := json.NewDecoder(rd).Decode(&m); err != nil {
 			t.Fatalf("unexpected error decoding descriptor data: %v", err)
 		}
 		rd.Close()
 		var k K = &out[i]
-		if err := k.Load(ctx, dir, local, tgt, &m); err != nil {
+		if err := k.Load(ctx, t, dir, local, tgt, &m); err != nil {
 			t.Fatalf("tk: %v", err)
 		}
 	}

test/fixture/fixture_test.go

@@ -6,13 +6,11 @@ import (
 )
 
 func TestLookup(t *testing.T) {
-	const want = `github.com/quay/claircore/test/fixture`
+	const want = `test/fixture`
 	var got string
 	// Simulate getting called from a top-level test:
 	func() {
-		func() {
-			got = lookupCaller(t)
-		}()
+		got = lookupCaller(t)
 	}()
 	t.Logf("got: %q, want: %q", got, want)
 	if got != want {

test/fixture/kinds.go

@@ -22,7 +22,7 @@ const artifactTmpl = `application/vnd.claircore.test-fixture.%s.config.v1`
 type Kind[T Value] interface {
 	*T
 	// Load takes an OCIDir so that we can _know_ the path of blobs.
-	Load(context.Context, string, *ocidir.OCIDir, ref.Ref, *oci.Manifest) error
+	Load(context.Context, *testing.T, string, *ocidir.OCIDir, ref.Ref, *oci.Manifest) error
 	ArtifactType() string
 }
 
@@ -54,7 +54,7 @@ type Indexer struct {
 }
 
 func (*Indexer) ArtifactType() string { return fmt.Sprintf(artifactTmpl, `indexer`) }
-func (i *Indexer) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
+func (i *Indexer) Load(ctx context.Context, t *testing.T, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
 	if m.ArtifactType != i.ArtifactType() {
 		return ErrBadArtifactType
 	}
@@ -94,6 +94,7 @@ func (i *Indexer) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r r
 				return err
 			}
 		default: // Skip
+			t.Logf("skipping artifact: %s", l.ArtifactType)
 		}
 	}
 	return nil
@@ -102,28 +103,28 @@ func (i *Indexer) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r r
 type Matcher struct{}
 
 func (*Matcher) ArtifactType() string { return fmt.Sprintf(artifactTmpl, `matcher`) }
-func (ma *Matcher) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
+func (ma *Matcher) Load(ctx context.Context, t *testing.T, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
 	panic("TODO: implement")
 }
 
 type Updater struct{}
 
 func (*Updater) ArtifactType() string { return fmt.Sprintf(artifactTmpl, `updater`) }
-func (u *Updater) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
+func (u *Updater) Load(ctx context.Context, t *testing.T, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
 	panic("TODO: implement")
 }
 
 type MatcherFlow struct{}
 
 func (*MatcherFlow) ArtifactType() string { return fmt.Sprintf(artifactTmpl, `matcher-flow`) }
-func (mf *MatcherFlow) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
+func (mf *MatcherFlow) Load(ctx context.Context, t *testing.T, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
 	panic("TODO: implement")
 }
 
 type Integration struct{}
 
 func (*Integration) ArtifactType() string { return fmt.Sprintf(artifactTmpl, `integration`) }
-func (i *Integration) Load(ctx context.Context, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
+func (i *Integration) Load(ctx context.Context, t *testing.T, root string, dir *ocidir.OCIDir, r ref.Ref, m *oci.Manifest) error {
 	panic("TODO: implement")
 }