Merge pull request fluxcd#459 from fluxcd/libgit2-semver-flake

ybelleguic · Oct 22, 2021 · 7ff8da4 · 7ff8da4
2 parents b35d7d8 + 9ff5334
commit 7ff8da4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/pkg/git/gogit/checkout.go b/pkg/git/gogit/checkout.go
@@ -212,7 +212,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
 	}
 
 	var matchedVersions semver.Collection
-	for tag, _ := range tags {
+	for tag := range tags {
 		v, err := version.ParseVersion(tag)
 		if err != nil {
 			continue
@@ -239,7 +239,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
 		// versions into a chronological order. This is especially important for
 		// versions that differ only by build metadata, because it is not considered
 		// a part of the comparable version in Semver
-		return tagTimestamps[left.String()].Before(tagTimestamps[right.String()])
+		return tagTimestamps[left.Original()].Before(tagTimestamps[right.Original()])
 	})
 	v := matchedVersions[len(matchedVersions)-1]
 	t := v.Original()

diff --git a/pkg/git/libgit2/checkout.go b/pkg/git/libgit2/checkout.go
@@ -225,7 +225,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
 		// versions into a chronological order. This is especially important for
 		// versions that differ only by build metadata, because it is not considered
 		// a part of the comparable version in Semver
-		return tagTimestamps[left.String()].Before(tagTimestamps[right.String()])
+		return tagTimestamps[left.Original()].Before(tagTimestamps[right.Original()])
 	})
 	v := matchedVersions[len(matchedVersions)-1]
 	t := v.Original()

diff --git a/pkg/git/libgit2/checkout_test.go b/pkg/git/libgit2/checkout_test.go
@@ -229,13 +229,19 @@ func TestCheckoutTagSemVer_Checkout(t *testing.T) {
 		{
 			tag:        "v0.1.0+build-1",
 			annotated:  true,
-			commitTime: now.Add(1 * time.Minute),
-			tagTime:    now.Add(1 * time.Hour), // This should be ignored during TS comparisons
+			commitTime: now.Add(10 * time.Minute),
+			tagTime:    now.Add(2 * time.Hour), // This should be ignored during TS comparisons
 		},
 		{
 			tag:        "v0.1.0+build-2",
 			annotated:  false,
-			commitTime: now.Add(2 * time.Minute),
+			commitTime: now.Add(30 * time.Minute),
+		},
+		{
+			tag:        "v0.1.0+build-3",
+			annotated:  true,
+			commitTime: now.Add(1 * time.Hour),
+			tagTime:    now.Add(1 * time.Hour), // This should be ignored during TS comparisons
 		},
 		{
 			tag:        "0.2.0",
@@ -258,7 +264,7 @@ func TestCheckoutTagSemVer_Checkout(t *testing.T) {
 		{
 			name:       "Orders by SemVer and timestamp",
 			constraint: "<0.2.0",
-			expectTag:  "v0.1.0+build-2",
+			expectTag:  "v0.1.0+build-3",
 		},
 		{
 			name:       "Errors without match",