purl: allow RefToPURL to take a type parameter

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

exporter/containerimage/writer.go

@@ -34,6 +34,7 @@ import (
 	digest "github.com/opencontainers/go-digest"
 	specs "github.com/opencontainers/image-spec/specs-go"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/package-url/packageurl-go"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -235,7 +236,7 @@ func (ic *ImageWriter) Commit(ctx context.Context, inp *exporter.Source, session
 				if name == "" {
 					continue
 				}
-				pl, err := purl.RefToPURL(name, &p.Platform)
+				pl, err := purl.RefToPURL(packageurl.TypeDocker, name, &p.Platform)
 				if err != nil {
 					return nil, err
 				}

solver/llbsolver/provenance/predicate.go

@@ -60,7 +60,7 @@ func slsaMaterials(srcs Sources) ([]slsa.ProvenanceMaterial, error) {
 	out := make([]slsa.ProvenanceMaterial, 0, count)
 
 	for _, s := range srcs.Images {
-		uri, err := purl.RefToPURL(s.Ref, s.Platform)
+		uri, err := purl.RefToPURL(packageurl.TypeDocker, s.Ref, s.Platform)
 		if err != nil {
 			return nil, err
 		}

util/purl/image.go

@@ -14,7 +14,7 @@ import (
 // RefToPURL converts an image reference with optional platform constraint to a package URL.
 // Image references are defined in https://github.com/distribution/distribution/blob/v2.8.1/reference/reference.go#L1
 // Package URLs are defined in https://github.com/package-url/purl-spec
-func RefToPURL(ref string, platform *ocispecs.Platform) (string, error) {
+func RefToPURL(purlType string, ref string, platform *ocispecs.Platform) (string, error) {
 	named, err := reference.ParseNormalizedNamed(ref)
 	if err != nil {
 		return "", errors.Wrapf(err, "failed to parse ref %q", ref)
@@ -52,7 +52,7 @@ func RefToPURL(ref string, platform *ocispecs.Platform) (string, error) {
 		})
 	}
 
-	p := packageurl.NewPackageURL("docker", ns, name, version, qualifiers, "")
+	p := packageurl.NewPackageURL(purlType, ns, name, version, qualifiers, "")
 	return p.ToString(), nil
 }
 

util/purl/image_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/containerd/containerd/platforms"
 	digest "github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
+	packageurl "github.com/package-url/packageurl-go"
 	"github.com/stretchr/testify/require"
 )
 
@@ -74,7 +75,7 @@ func TestRefToPURL(t *testing.T) {
 	for _, tc := range tcases {
 		tc := tc
 		t.Run(tc.ref, func(t *testing.T) {
-			purl, err := RefToPURL(tc.ref, tc.platform)
+			purl, err := RefToPURL(packageurl.TypeDocker, tc.ref, tc.platform)
 			if tc.err {
 				require.Error(t, err)
 				return