fix latest version deploy check

Author: mattes

google.go

@@ -153,7 +153,7 @@ func StartRollingUpdate(c *computeBeta.Service, d Deploy, instanceTemplateURL st
 
 	// TODO consider making the following check a configuration flag
 	latestVersion := findLatestInstanceGroupManagerVersion(ig.Versions)
-	if latestVersion != "" && latestVersion >= d.InstanceTemplate {
+	if latestVersion != "" && !VersionLessThan(latestVersion, d.InstanceTemplate) {
 		return fmt.Errorf("update instance group: instance template '%v' is too old, because '%v' is the latest instance template.", d.InstanceTemplate, latestVersion)
 	}
 

util.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"regexp"
+	"strconv"
+)
+
+// VersionLessThan returns true if a < b
+func VersionLessThan(a, b string) bool {
+	xa, err := extractInts(a)
+	if err != nil {
+		panic(err)
+	}
+
+	xb, err := extractInts(b)
+	if err != nil {
+		panic(err)
+	}
+
+	for i := 0; i < len(xa); i++ {
+		if len(xb) >= i {
+			if xa[i] == xb[i] {
+				continue
+			}
+
+			return xa[i] < xb[i]
+		}
+	}
+
+	return false
+}
+
+// VersionGreaterThan returns true if a > b
+func VersionGreaterThan(a, b string) bool {
+	return !VersionLessThan(a, b)
+}
+
+func extractInts(v string) ([]int, error) {
+	re := regexp.MustCompile("[0-9]+")
+	matches := re.FindAllString(v, -1)
+
+	r := make([]int, 0)
+	for _, m := range matches {
+		n, err := strconv.Atoi(m)
+		if err != nil {
+			return nil, err
+		}
+		r = append(r, n)
+	}
+
+	return r, nil
+}

util_test.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestVersionLessThan(t *testing.T) {
+	table := []struct {
+		a, b   string
+		expect bool
+	}{
+		// a < b
+
+		{"1", "1", false},
+		{"2", "1", false},
+		{"1", "2", true},
+
+		{"v1.2.3", "v1.2.3", false},
+		{"v1.2.3", "v1.3.3", true},
+		{"v1.2.3", "v1.2.4", true},
+		{"v1.2.3", "v2.2.3", true},
+
+		{"instance-12", "instance-12", false},
+		{"instance-12", "instance-11", false},
+		{"instance-12", "instance-13", true},
+
+		{"1.1", "2", true},
+		{"1.2.3", "2", true},
+		{"2", "1.1", false},
+		{"2", "1.2.3", false},
+
+		{"instance-9-14be32d", "instance-17-1df06f1", true},
+	}
+
+	for _, test := range table {
+		out := VersionLessThan(test.a, test.b)
+		require.Equal(t, test.expect, out)
+
+		out = VersionGreaterThan(test.a, test.b)
+		require.Equal(t, !test.expect, out)
+	}
+}
+
+func TestExtractInts(t *testing.T) {
+	table := []struct {
+		in     string
+		expect []int
+	}{
+		{"123", []int{123}},
+		{"abc-123", []int{123}},
+		{"abc-123-def", []int{123}},
+		{"abc-123-def-456", []int{123, 456}},
+		{"v1.2.3", []int{1, 2, 3}},
+		{"v.1.2.3", []int{1, 2, 3}},
+		{"1.2.3", []int{1, 2, 3}},
+		{"1/2/3", []int{1, 2, 3}},
+		{"1_2_3", []int{1, 2, 3}},
+		{"01_02_03", []int{1, 2, 3}},
+		{"+1", []int{1}},
+		{"-1", []int{1}},
+		{"+0", []int{0}},
+		{"-0", []int{0}},
+		{"0", []int{0}},
+	}
+
+	for _, test := range table {
+		out, err := extractInts(test.in)
+		require.NoError(t, err, test.in)
+		require.Equal(t, test.expect, out, test.in)
+	}
+}