Bug 1339754 - Fix tag sorting according to semantic versioning rules

Author: soltysh

pkg/image/api/helper.go

@@ -896,8 +896,12 @@ func LatestObservedTagGeneration(stream *ImageStream, tag string) int64 {
 }
 
 var (
-	reMajorSemantic = regexp.MustCompile(`^[\d]+$`)
-	reMinorSemantic = regexp.MustCompile(`^[\d]+\.[\d]+$`)
+	reMajorSemantic    = regexp.MustCompile(`^[\d]+$`)
+	reMinorSemantic    = regexp.MustCompile(`^[\d]+\.[\d]+$`)
+	reMajorReplacement = regexp.MustCompile(`[\d]+`)
+	reMinorReplacement = regexp.MustCompile(`[\d]+\.[\d]+`)
+	reMajorWithPatch   = regexp.MustCompile(`^[\d]+-\w+$`)
+	reMinorWithPatch   = regexp.MustCompile(`^[\d]+\.[\d]+-\w+$`)
 )
 
 // PrioritizeTags orders a set of image tags with a few conventions:
@@ -944,6 +948,20 @@ func PrioritizeTags(tags []string) {
 				minor = append(minor, v)
 				continue
 			}
+		case reMajorWithPatch.MatchString(short):
+			repl := reMajorReplacement.FindString(short)
+			if v, err = semver.Parse(strings.Replace(short, repl, repl+".0.0", 1)); err == nil {
+				exact[v.String()] = tag
+				major = append(major, v)
+				continue
+			}
+		case reMinorWithPatch.MatchString(short):
+			repl := reMinorReplacement.FindString(short)
+			if v, err = semver.Parse(strings.Replace(short, repl, repl+".0", 1)); err == nil {
+				exact[v.String()] = tag
+				minor = append(minor, v)
+				continue
+			}
 		}
 		other = append(other, tag)
 	}

pkg/image/api/helper_test.go

@@ -1405,10 +1405,25 @@ func TestDockerImageReferenceEquality(t *testing.T) {
 }
 
 func TestPrioritizeTags(t *testing.T) {
-	tags := []string{"5", "other", "latest", "v5.5", "v6", "5.2.3", "v5.3.6-bother", "5.3.6-abba", "5.6"}
-	PrioritizeTags(tags)
-	if !reflect.DeepEqual(tags, []string{"latest", "v6", "5", "5.6", "v5.5", "v5.3.6-bother", "5.3.6-abba", "5.2.3", "other"}) {
-		t.Errorf("unexpected order: %v", tags)
+	tests := []struct {
+		tags     []string
+		expected []string
+	}{
+		{
+			tags:     []string{"5", "other", "latest", "v5.5", "v6", "5.2.3", "v5.3.6-bother", "5.3.6-abba", "5.6"},
+			expected: []string{"latest", "v6", "5", "5.6", "v5.5", "v5.3.6-bother", "5.3.6-abba", "5.2.3", "other"},
+		},
+		{
+			tags:     []string{"1.1-beta1", "1.2-rc1", "1.1-rc1", "1.1-beta2", "1.2-beta1", "1.2-alpha1", "1.2-beta4", "latest"},
+			expected: []string{"latest", "1.2-rc1", "1.2-beta4", "1.2-beta1", "1.2-alpha1", "1.1-rc1", "1.1-beta2", "1.1-beta1"},
+		},
+	}
+
+	for i, tc := range tests {
+		PrioritizeTags(tc.tags)
+		if !reflect.DeepEqual(tc.tags, tc.expected) {
+			t.Errorf("%d: unexpected order: %v", i, tc.tags)
+		}
 	}
 }