handle calvar format through allow-tags

Author: r4vi

registry-scanner/pkg/image/matchfunc.go

@@ -4,6 +4,7 @@ import (
 	"regexp"
 
 	"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
+	"github.com/k1LoW/calver"
 )
 
 // MatchFuncAny matches any pattern, i.e. always returns true
@@ -25,3 +26,13 @@ func MatchFuncRegexp(tagName string, args interface{}) bool {
 	}
 	return pattern.Match([]byte(tagName))
 }
+
+// MatchFuncCalVer checks if a tag matches the specified CalVer layout
+func MatchFuncCalVer(tagName string, args interface{}) bool {
+	layoutStr, ok := args.(string)
+	if !ok {
+		return false
+	}
+	_, err := calver.Parse(layoutStr, tagName)
+	return err == nil
+}

registry-scanner/pkg/image/options.go

@@ -175,6 +175,8 @@ func (img *ContainerImage) ParseMatchfunc(val string) (MatchFuncFn, interface{})
 			return MatchFuncNone, nil
 		}
 		return MatchFuncRegexp, re
+	case "calver":
+		return MatchFuncCalVer, opt[1]
 	default:
 		logCtx.Warnf("Unknown match function: %s", opt[0])
 		return MatchFuncNone, nil

registry-scanner/pkg/image/version.go

@@ -1,6 +1,7 @@
 package image
 
 import (
+	"fmt"
 	"path/filepath"
 
 	"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
@@ -98,7 +99,12 @@ func (img *ContainerImage) GetNewestVersionFromTags(vc *VersionConstraint, tagLi
 	case StrategyDigest:
 		availableTags = tagList.SortAlphabetically()
 	case StrategyCalVer:
-		availableTags = tagList.SortByCalVer()
+		layout, ok := vc.MatchArgs.(string)
+		if !ok {
+			logCtx.Errorf("calver layout not specified in allow-tags annotation")
+			return nil, fmt.Errorf("calver layout not specified in allow-tags annotation")
+		}
+		availableTags = tagList.SortByCalVer(layout)
 	}
 
 	considerTags := tag.SortableImageTagList{}

registry-scanner/pkg/image/version_test.go

@@ -76,6 +76,15 @@ func Test_LatestVersion(t *testing.T) {
 		assert.Nil(t, newTag)
 	})
 
+	t.Run("Find the latest version with a calver constraint that is valid", func(t *testing.T) {
+		tagList := newImageTagList([]string{"2021.01.01", "2022.02.02", "2023.05.01", "2025.01.25"})
+		img := NewFromIdentifier("jannfis/test:2021.01.01")
+		vc := VersionConstraint{Constraint: "2022.01.01", Strategy: StrategyCalVer, MatchArgs: "YYYY.MM.DD"}
+		newTag, err := img.GetNewestVersionFromTags(&vc, tagList)
+		assert.NoError(t, err)
+		assert.NotNil(t, newTag)
+	})
+
 	t.Run("Find the latest version with no tags", func(t *testing.T) {
 		tagList := newImageTagList([]string{})
 		img := NewFromIdentifier("jannfis/test:1.0")

registry-scanner/pkg/tag/tag.go

@@ -173,14 +173,14 @@ func (il ImageTagList) SortBySemVer() SortableImageTagList {
 	return sil
 }
 
-func (il ImageTagList) SortByCalVer() SortableImageTagList {
+func (il ImageTagList) SortByCalVer(layout string) SortableImageTagList {
 	il.lock.RLock()
 	defer il.lock.RUnlock()
 	sil := make(SortableImageTagList, 0, len(il.items))
 	calvers := make(calver.Calvers, 0, len(il.items))
 
 	for _, v := range il.items {
-		cv, err := calver.Parse(v.TagName)
+		cv, err := calver.Parse(layout, v.TagName)
 		if err != nil {
 			// Fallback to alphabetical order if parsing fails
 			sil = append(sil, v)