Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix: Check for semver constraint matching in application webhook handler (#21634) (#21648)

Browse source 
Signed-off-by: eadred <eadred77@googlemail.com>
This commit is contained in:
Eadred 2025-03-27 15:26:02 +00:00 committed by GitHub
parent 344b434cc5
commit 4a987ddbf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
util/webhook/webhook.go
View file

@ -14,6 +14,7 @@ import (
bb "github.com/ktrysmt/go-bitbucket"
"github.com/Masterminds/semver/v3"
"github.com/go-playground/webhooks/v6/azuredevops"
"github.com/go-playground/webhooks/v6/bitbucket"
bitbucketserver "github.com/go-playground/webhooks/v6/bitbucket-server"
@ -491,11 +492,33 @@ func sourceRevisionHasChanged(source v1alpha1.ApplicationSource, revision string
targetRevisionHasPrefixList := []string{"refs/heads/", "refs/tags/"}
for _, prefix := range targetRevisionHasPrefixList {
if strings.HasPrefix(source.TargetRevision, prefix) {
return revision == targetRev
return compareRevisions(revision, targetRev)
}
}
return source.TargetRevision == revision
return compareRevisions(revision, source.TargetRevision)
}
func compareRevisions(revision string, targetRevision string) bool {
if revision == targetRevision {
return true
}
// If basic equality checking fails, it might be that the target revision is
// a semver version constraint
constraint, err := semver.NewConstraint(targetRevision)
if err != nil {
// The target revision is not a constraint
return false
}
version, err := semver.NewVersion(revision)
if err != nil {
// The new revision is not a valid semver version, so it can't match the constraint.
return false
}
return constraint.Check(version)
}
func sourceUsesURL(source v1alpha1.ApplicationSource, webURL string, repoRegexp *regexp.Regexp) bool {

7
util/webhook/webhook_test.go
View file

@ -566,8 +566,15 @@ func TestAppRevisionHasChanged(t *testing.T) {
{"dev target revision, dev, did not touch head", getSource("dev"), "dev", false, true},
{"refs/heads/dev target revision, master, touched head", getSource("refs/heads/dev"), "master", true, false},
{"refs/heads/dev target revision, dev, did not touch head", getSource("refs/heads/dev"), "dev", false, true},
{"refs/tags/dev target revision, dev, did not touch head", getSource("refs/tags/dev"), "dev", false, true},
{"env/test target revision, env/test, did not touch head", getSource("env/test"), "env/test", false, true},
{"refs/heads/env/test target revision, env/test, did not touch head", getSource("refs/heads/env/test"), "env/test", false, true},
{"refs/tags/env/test target revision, env/test, did not touch head", getSource("refs/tags/env/test"), "env/test", false, true},
{"three/part/rev target revision, rev, did not touch head", getSource("three/part/rev"), "rev", false, false},
{"1.* target revision (matching), 1.1.0, did not touch head", getSource("1.*"), "1.1.0", false, true},
{"refs/tags/1.* target revision (matching), 1.1.0, did not touch head", getSource("refs/tags/1.*"), "1.1.0", false, true},
{"1.* target revision (not matching), 2.0.0, did not touch head", getSource("1.*"), "2.0.0", false, false},
{"1.* target revision, dev (not semver), did not touch head", getSource("1.*"), "dev", false, false},
}
for _, tc := range testCases {