WIP

Author: errordeveloper

attest/manifest/manifest.go

@@ -16,7 +16,7 @@ var (
 )
 
 type DirContents struct {
-	types.GenericStatement[SourceDirectory]
+	types.GenericStatement[SourceDirectoryContents]
 }
 
 type SourceDirectory struct {
@@ -25,14 +25,16 @@ type SourceDirectory struct {
 	VCSEntries *types.PathCheckSummaryCollection `json:"vcsEntries"`
 }
 
+type SourceDirectoryContents struct {
+	SourceDirectory `json:"containedInDirectory"`
+}
+
 func MakeDirContentsStatement(dir string, entries *types.PathCheckSummaryCollection) types.Statement {
 	return &DirContents{
-		types.MakeStatement[SourceDirectory](
+		types.MakeStatement[SourceDirectoryContents](
 			ManifestDirPredicateType,
-			struct {
-				SourceDirectory `json:"containedInDirectory"`
-			}{
-				SourceDirectory{
+			SourceDirectoryContents{
+				SourceDirectory: SourceDirectory{
 					Path:       dir,
 					VCSEntries: entries,
 				},
@@ -44,7 +46,7 @@ func MakeDirContentsStatement(dir string, entries *types.PathCheckSummaryCollect
 
 func MakeDirContentsStatementFrom(statement types.Statement) DirContents {
 	dirContents := DirContents{
-		GenericStatement: attestTypes.GenericStatement[SourceDirectory]{},
+		GenericStatement: attestTypes.GenericStatement[SourceDirectoryContents]{},
 	}
 	dirContents.ConvertFrom(statement)
 	return dirContents
@@ -63,3 +65,7 @@ func (a SourceDirectory) Compare(b SourceDirectory) types.Cmp {
 	cmp := a.VCSEntries.Compare(*b.VCSEntries)
 	return &cmp
 }
+
+func (a SourceDirectoryContents) Compare(b SourceDirectoryContents) types.Cmp {
+	return a.SourceDirectory.Compare(b.SourceDirectory)
+}

attest/types/types.go

@@ -134,12 +134,12 @@ type StamentConverter[T any] struct {
 }
 
 func (s *GenericStatement[T]) ConvertFrom(statement Statement) error {
-	predicate, ok := s.GetPredicate().(ComparablePredicate[T])
+	predicate, ok := statement.GetPredicate().(ComparablePredicate[T])
 	if !ok {
-		return fmt.Errorf("cannot convert statement with predicte of type %T into %T", s.GetPredicate(), GenericStatement[T]{})
+		return fmt.Errorf("cannot convert statement with predicte of type %T into %T", statement.GetPredicate(), GenericStatement[T]{})
 	}
 
-	*s = MakeStatement[T](s.GetType(), predicate, s.GetSubject()...)
+	*s = MakeStatement[T](statement.GetType(), predicate, statement.GetSubject()...)
 	return nil
 }
 
@@ -392,8 +392,9 @@ func comparePathCheckSummaries(a, b PathCheckSummary) int {
 	return cmp.Compare(a.Common().Path, b.Common().Path)
 }
 
-func (p Predicate[T]) GetType() string   { return p.Type }
-func (p Predicate[T]) GetPredicate() any { return p.ComparablePredicate }
+func (p Predicate[T]) GetType() string           { return p.Type }
+func (p Predicate[T]) GetPredicate() any         { return p.ComparablePredicate }
+func (p Predicate[T]) GetUnderlyingPredicate() T { return p.ComparablePredicate.(T) }
 
 func (p Predicate[T]) Compare(b any) Cmp {
 	if b, ok := b.(Predicate[T]); ok {

oci/artefact.go

@@ -13,6 +13,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"golang.org/x/mod/semver"
+
 	ociclient "github.com/fluxcd/pkg/oci"
 	"github.com/go-git/go-git/v5/utils/ioutil"
 	"github.com/google/go-containerregistry/pkg/compression"
@@ -25,6 +27,7 @@ import (
 
 	"github.com/errordeveloper/tape/attest/manifest"
 	attestTypes "github.com/errordeveloper/tape/attest/types"
+	"github.com/errordeveloper/tape/attest/vcs/git"
 	manifestTypes "github.com/errordeveloper/tape/manifest/types"
 )
 
@@ -224,10 +227,6 @@ func (c *Client) PushArtefact(ctx context.Context, destinationRef, sourceDir str
 	}
 	defer os.RemoveAll(tmpDir)
 
-	_, err = SemVerFromAttestations(ctx, sourceAttestations...)
-	if err != nil {
-		return "", err
-	}
 	tmpFile := filepath.Join(tmpDir, "artefact.tgz")
 
 	outputFile, err := os.OpenFile(tmpFile, os.O_RDWR|os.O_CREATE|os.O_EXCL, regularFileMode)
@@ -255,7 +254,11 @@ func (c *Client) PushArtefact(ctx context.Context, destinationRef, sourceDir str
 	}
 	hash := hex.EncodeToString(c.hash.Sum(nil))
 	tag := repo.Tag(manifestTypes.ConfigImageTagPrefix + hash)
-	tagAlias := tag.Context().Tag(manifestTypes.ConfigImageTagPrefix + hash[:7])
+
+	tagAliases := append(
+		SemVerTagsFromAttestations(ctx, tag, sourceAttestations...),
+		tag.Context().Tag(manifestTypes.ConfigImageTagPrefix+hash[:7]),
+	)
 
 	if timestamp == nil {
 		timestamp = new(time.Time)
@@ -346,25 +349,51 @@ func (c *Client) PushArtefact(ctx context.Context, destinationRef, sourceDir str
 		return "", fmt.Errorf("pushing index failed: %w", err)
 	}
 
-	if err := remote.Tag(tagAlias, index, c.remoteWithContext(ctx)...); err != nil {
-		return "", fmt.Errorf("adding alias tagging failed: %w", err)
+	for i := range tagAliases {
+		if err := remote.Tag(tagAliases[i], index, c.remoteWithContext(ctx)...); err != nil {
+			return "", fmt.Errorf("adding alias tagging failed: %w", err)
+		}
 	}
 
-	return tagAlias.String() + "@" + digest.String(), err
+	return tagAliases[0].String() + "@" + digest.String(), err
 }
 
-func SemVerFromAttestations(ctx context.Context, sourceAttestations ...attestTypes.Statement) (string, error) {
+func SemVerTagsFromAttestations(ctx context.Context, tag name.Tag, sourceAttestations ...attestTypes.Statement) []name.Tag {
 	statements := attestTypes.FilterByPredicateType(manifest.ManifestDirPredicateType, sourceAttestations)
-	if len(statements) == 0 {
-		return "", fmt.Errorf("VCS provinance attestion (%q) not found", manifest.ManifestDirPredicateType)
+	if len(statements) != 1 {
+		return []name.Tag{}
 	}
-	if len(statements) > 1 {
-		return "", fmt.Errorf("too many attestations of type %q found, expected 1", manifest.ManifestDirPredicateType)
+
+	entries := manifest.MakeDirContentsStatementFrom(statements[0]).GetUnderlyingPredicate().VCSEntries
+	if len(entries.EntryGroups) != 1 && len(entries.Providers) != 1 ||
+		entries.Providers[0] != git.ProviderName {
+		return []name.Tag{}
+	}
+	if len(entries.EntryGroups[0]) == 0 {
+		return []name.Tag{}
+	}
+	groupSummary, ok := entries.EntryGroups[0][0].Full().(*git.GitSummary)
+	if !ok {
+		return []name.Tag{}
+	}
+	if len(groupSummary.Reference.Tags) == 0 {
+		return []name.Tag{}
 	}
 
-	_ = manifest.MakeDirContentsStatementFrom(statements[0])
+	tags := make([]name.Tag, 0, len(groupSummary.Reference.Tags))
 
-	return "", nil
+	// TODO: detect tags with groupSummary.Path+"/" as prefix and priorities them
+	for i := range groupSummary.Reference.Tags {
+		t := groupSummary.Reference.Tags[i].Name
+		fmt.Println(t)
+		if semver.IsValid(t) {
+			tags = append(tags, tag.Context().Tag(t))
+		}
+	}
+	if len(tags) == 0 {
+		return []name.Tag{}
+	}
+	return tags
 }
 
 func makeDescriptorWithPlatform() Descriptor {