refactor(oci_reference): support build metadata

Add support for reading/writing semver tags with build metadata to
OCIReference.

Signed-off-by: Erik Cederberg <erik.cederberg@sectra.com>

Author: erikced

pkg/cnab/oci_reference.go

@@ -163,7 +163,7 @@ func (r OCIReference) HasVersion() bool {
 	}
 
 	if tagged, ok := r.Named.(reference.Tagged); ok {
-		_, err := semver.NewVersion(tagged.Tag())
+		_, err := semverFromTag(tagged.Tag())
 		return err == nil
 	}
 	return false
@@ -176,7 +176,7 @@ func (r OCIReference) Version() string {
 	}
 
 	if tagged, ok := r.Named.(reference.Tagged); ok {
-		v, err := semver.NewVersion(tagged.Tag())
+		v, err := semverFromTag(tagged.Tag())
 		if err == nil {
 			return v.String()
 		}
@@ -185,6 +185,7 @@ func (r OCIReference) Version() string {
 }
 
 // WithVersion creates a new reference using the repository and the specified bundle version.
+// If build metadata is present, "+" is conveted to "_".
 func (r OCIReference) WithVersion(version string) (OCIReference, error) {
 	if r.Named == nil {
 		return OCIReference{}, errors.New("OCIReference has not been initialized")
@@ -195,7 +196,7 @@ func (r OCIReference) WithVersion(version string) (OCIReference, error) {
 		return OCIReference{}, fmt.Errorf("invalid bundle version specified %s: %w", version, err)
 	}
 
-	newRef, err := reference.WithTag(r.Named, "v"+v.String())
+	newRef, err := reference.WithTag(r.Named, tagFromSemver(v))
 	if err != nil {
 		return OCIReference{}, err
 	}
@@ -233,3 +234,11 @@ func (r OCIReference) ParseRepositoryInfo() (*registry.RepositoryInfo, error) {
 	}
 	return registry.ParseRepositoryInfo(r.Named)
 }
+
+func semverFromTag(tag string) (*semver.Version, error) {
+	return semver.NewVersion(strings.Replace(tag, "_", "+", 1))
+}
+
+func tagFromSemver(version *semver.Version) string {
+	return fmt.Sprintf("v%s", strings.Replace(version.String(), "+", "_", 1))
+}

pkg/cnab/oci_reference_test.go

@@ -37,11 +37,11 @@ func TestOCIReference(t *testing.T) {
 		},
 		{
 			Name:             "tagged reference",
-			Ref:              MustParseOCIReference("jeremyrickard/porter-do-bundle:v0.1.0"),
+			Ref:              MustParseOCIReference("jeremyrickard/porter-do-bundle:v0.1.0-pre_build.123"),
 			ExpectedRegistry: "docker.io",
 			ExpectedRepo:     "jeremyrickard/porter-do-bundle",
-			ExpectedTag:      "v0.1.0",
-			ExpectedVersion:  "0.1.0",
+			ExpectedTag:      "v0.1.0-pre_build.123",
+			ExpectedVersion:  "0.1.0-pre+build.123",
 		},
 		{
 			Name:             "no tag",
@@ -131,6 +131,14 @@ func TestOCIReference_WithVersion(t *testing.T) {
 		assert.Equal(t, "v1.2.3", result.Tag())
 	})
 
+	t.Run("semver with build metadata", func(t *testing.T) {
+		ref := MustParseOCIReference("getporter/porter-hello")
+
+		result, err := ref.WithVersion("1.2.3+git0a2b3c4d")
+		require.NoError(t, err)
+		assert.Equal(t, "v1.2.3_git0a2b3c4d", result.Tag())
+	})
+
 	t.Run("invalid semver", func(t *testing.T) {
 		ref := MustParseOCIReference("getporter/porter-hello")