fix: use distribution to parse references (#275)

* fix: use distribution to parse references

fixes #273

* fix: keep docker.io if it was specified

* fix: remove library/ if it was added

Author: noah

pkg/image/image.go

@@ -5,6 +5,8 @@ import (
 	"time"
 
 	"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
+
+	"github.com/distribution/distribution/v3/reference"
 )
 
 type ContainerImage struct {
@@ -22,6 +24,40 @@ type ContainerImageList []*ContainerImage
 
 // NewFromIdentifier parses an image identifier and returns a populated ContainerImage
 func NewFromIdentifier(identifier string) *ContainerImage {
+	imgRef := identifier
+	alias := ""
+	if strings.Contains(identifier, "=") {
+		n := strings.SplitN(identifier, "=", 2)
+		imgRef = n[1]
+		alias = n[0]
+	}
+	if parsed, err := reference.ParseNormalizedNamed(imgRef); err == nil {
+		img := ContainerImage{}
+		img.RegistryURL = reference.Domain(parsed)
+		// remove default registry for backwards-compatibility
+		if img.RegistryURL == "docker.io" && !strings.HasPrefix(imgRef, "docker.io") {
+			img.RegistryURL = ""
+		}
+		img.ImageAlias = alias
+		img.ImageName = reference.Path(parsed)
+		// if library/ was added to the image name, remove it
+		if !strings.HasPrefix(imgRef, "library/") {
+			img.ImageName = strings.TrimPrefix(img.ImageName, "library/")
+		}
+		if digested, ok := parsed.(reference.Digested); ok {
+			img.ImageTag = &tag.ImageTag{
+				TagDigest: string(digested.Digest()),
+			}
+		} else if tagged, ok := parsed.(reference.Tagged); ok {
+			img.ImageTag = &tag.ImageTag{
+				TagName: tagged.Tag(),
+			}
+		}
+		img.original = identifier
+		return &img
+	}
+
+	// if distribution couldn't parse it, fall back to the legacy parsing logic
 	img := ContainerImage{}
 	img.RegistryURL = getRegistryFromIdentifier(identifier)
 	img.ImageAlias, img.ImageName, img.ImageTag = getImageTagFromIdentifier(identifier)

pkg/image/image_test.go

@@ -22,6 +22,26 @@ func Test_ParseImageTags(t *testing.T) {
 		assert.Equal(t, "jannfis/test-image", image.GetFullNameWithoutTag())
 	})
 
+	t.Run("Single element image name is unmodified", func(t *testing.T) {
+		image := NewFromIdentifier("test-image")
+		assert.Empty(t, image.RegistryURL)
+		assert.Empty(t, image.ImageAlias)
+		assert.Equal(t, "test-image", image.ImageName)
+		require.Nil(t, image.ImageTag)
+		assert.Equal(t, "test-image", image.GetFullNameWithTag())
+		assert.Equal(t, "test-image", image.GetFullNameWithoutTag())
+	})
+
+	t.Run("library image name is unmodified", func(t *testing.T) {
+		image := NewFromIdentifier("library/test-image")
+		assert.Empty(t, image.RegistryURL)
+		assert.Empty(t, image.ImageAlias)
+		assert.Equal(t, "library/test-image", image.ImageName)
+		require.Nil(t, image.ImageTag)
+		assert.Equal(t, "library/test-image", image.GetFullNameWithTag())
+		assert.Equal(t, "library/test-image", image.GetFullNameWithoutTag())
+	})
+
 	t.Run("Parse valid image name with registry info", func(t *testing.T) {
 		image := NewFromIdentifier("gcr.io/jannfis/test-image:0.1")
 		assert.Equal(t, "gcr.io", image.RegistryURL)
@@ -33,6 +53,17 @@ func Test_ParseImageTags(t *testing.T) {
 		assert.Equal(t, "gcr.io/jannfis/test-image", image.GetFullNameWithoutTag())
 	})
 
+	t.Run("Parse valid image name with default registry info", func(t *testing.T) {
+		image := NewFromIdentifier("docker.io/jannfis/test-image:0.1")
+		assert.Equal(t, "docker.io", image.RegistryURL)
+		assert.Empty(t, image.ImageAlias)
+		assert.Equal(t, "jannfis/test-image", image.ImageName)
+		require.NotNil(t, image.ImageTag)
+		assert.Equal(t, "0.1", image.ImageTag.TagName)
+		assert.Equal(t, "docker.io/jannfis/test-image:0.1", image.GetFullNameWithTag())
+		assert.Equal(t, "docker.io/jannfis/test-image", image.GetFullNameWithoutTag())
+	})
+
 	t.Run("Parse valid image name with digest tag", func(t *testing.T) {
 		image := NewFromIdentifier("gcr.io/jannfis/test-image@sha256:abcde")
 		assert.Equal(t, "gcr.io", image.RegistryURL)
@@ -70,6 +101,13 @@ func Test_ParseImageTags(t *testing.T) {
 		assert.Equal(t, "jannfis/test-image", image.ImageName)
 		assert.Nil(t, image.ImageTag)
 	})
+	t.Run("#273 classic-web=registry:5000/classic-web", func(t *testing.T) {
+		image := NewFromIdentifier("classic-web=registry:5000/classic-web")
+		assert.Equal(t, "registry:5000", image.RegistryURL)
+		assert.Equal(t, "classic-web", image.ImageAlias)
+		assert.Equal(t, "classic-web", image.ImageName)
+		assert.Nil(t, image.ImageTag)
+	})
 }
 
 func Test_ImageToString(t *testing.T) {