fix: webhook accepting image tags such as 15beta1 (cloudnative-pg#279)

Signed-off-by: Philippe Scorsolini <p.scorsolini@gmail.com>
Signed-off-by: Jonathan Gonzalez V <jonathan.gonzalez@enterprisedb.com>

Co-authored-by: Jonathan Gonzalez V <jonathan.gonzalez@enterprisedb.com>

Author: phisco

api/v1/cluster_webhook_test.go

@@ -529,6 +529,33 @@ var _ = Describe("Image name validation", func() {
 		Expect(len(cluster.validateImageName())).To(Equal(1))
 	})
 
+	It("doesn't complain when a alpha tag is used", func() {
+		cluster := Cluster{
+			Spec: ClusterSpec{
+				ImageName: "postgres:15alpha1",
+			},
+		}
+		Expect(len(cluster.validateImageName())).To(Equal(0))
+	})
+
+	It("doesn't complain when a beta tag is used", func() {
+		cluster := Cluster{
+			Spec: ClusterSpec{
+				ImageName: "postgres:15beta1",
+			},
+		}
+		Expect(len(cluster.validateImageName())).To(Equal(0))
+	})
+
+	It("doesn't complain when a release candidate tag is used", func() {
+		cluster := Cluster{
+			Spec: ClusterSpec{
+				ImageName: "postgres:15rc1",
+			},
+		}
+		Expect(len(cluster.validateImageName())).To(Equal(0))
+	})
+
 	It("complains when only the sha is passed", func() {
 		cluster := Cluster{
 			Spec: ClusterSpec{
@@ -547,6 +574,15 @@ var _ = Describe("Image name validation", func() {
 		Expect(cluster.validateImageName()).To(BeEmpty())
 	})
 
+	It("doesn't complain if the tag is valid", func() {
+		cluster := Cluster{
+			Spec: ClusterSpec{
+				ImageName: "postgres:14.4-1",
+			},
+		}
+		Expect(cluster.validateImageName()).To(BeEmpty())
+	})
+
 	It("doesn't complain if the tag is valid and has sha", func() {
 		cluster := Cluster{
 			Spec: ClusterSpec{

pkg/postgres/version.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -28,14 +29,22 @@ import (
 
 const firstMajorWithoutMinor = 10
 
+var semanticVersionRegex = regexp.MustCompile(`^(\d\.?)+`)
+
 // GetPostgresVersionFromTag parse a PostgreSQL version string returning
 // a major version ID. Example:
 //
 //     GetPostgresVersionFromTag("9.5.3") == 90503
 //     GetPostgresVersionFromTag("10.2") == 100002
+//     GetPostgresVersionFromTag("15beta1") == 150000
 func GetPostgresVersionFromTag(version string) (int, error) {
-	if versionDelimiter := strings.IndexAny(version, "_-"); versionDelimiter >= 0 {
-		version = version[:versionDelimiter]
+	if !semanticVersionRegex.MatchString(version) {
+		return 0,
+			fmt.Errorf("version not starting with a semantic version regex (%v): %s", semanticVersionRegex, version)
+	}
+
+	if versionOnly := semanticVersionRegex.FindString(version); versionOnly != "" {
+		version = versionOnly
 	}
 
 	splitVersion := strings.Split(version, ".")
@@ -73,8 +82,13 @@ func GetPostgresVersionFromTag(version string) (int, error) {
 
 // GetPostgresMajorVersionFromTag retrieves the major version from a version tag
 func GetPostgresMajorVersionFromTag(version string) (int, error) {
-	if versionDelimiter := strings.IndexAny(version, "_-"); versionDelimiter >= 0 {
-		version = version[:versionDelimiter]
+	if !semanticVersionRegex.MatchString(version) {
+		return 0,
+			fmt.Errorf("version not starting with a semantic version regex (%v): %s", semanticVersionRegex, version)
+	}
+
+	if versionOnly := semanticVersionRegex.FindString(version); versionOnly != "" {
+		version = versionOnly
 	}
 
 	splitVersion := strings.Split(version, ".")

pkg/postgres/version_test.go

@@ -38,6 +38,7 @@ var _ = Describe("PostgreSQL version handling", func() {
 			Expect(GetPostgresVersionFromTag("10.11.12")).To(Equal(100011))
 			Expect(GetPostgresVersionFromTag("9.4_beautiful")).To(Equal(90400))
 			Expect(GetPostgresVersionFromTag("11-1")).To(Equal(110000))
+			Expect(GetPostgresVersionFromTag("15beta1")).To(Equal(150000))
 		})
 
 		It("should gracefully handle errors", func() {