Add v15 support.

fergusstrange · fergusstrange · commit baa0dbf5e1f2 · 2023-01-28T16:46:22.000+11:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -48,3 +48,8 @@ issues:
     - G104
     - (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
     - Potential file inclusion via variable
+  exclude-rules:
+    - path: '(.+)_test\.go'
+      linters:
+        - funlen
+        - goconst
diff --git a/config.go b/config.go
@@ -123,10 +123,11 @@ type PostgresVersion string
 
 // Predefined supported Postgres versions.
 const (
-	V14 = PostgresVersion("14.5.0")
-	V13 = PostgresVersion("13.8.0")
-	V12 = PostgresVersion("12.12.0")
-	V11 = PostgresVersion("11.17.0")
-	V10 = PostgresVersion("10.22.0")
+	V15 = PostgresVersion("15.1.0")
+	V14 = PostgresVersion("14.6.0")
+	V13 = PostgresVersion("13.9.0")
+	V12 = PostgresVersion("12.13.0")
+	V11 = PostgresVersion("11.18.0")
+	V10 = PostgresVersion("10.23.0")
 	V9  = PostgresVersion("9.6.24")
 )
diff --git a/embedded_postgres.go b/embedded_postgres.go
@@ -57,6 +57,7 @@ func newDatabaseWithConfig(config Config) *EmbeddedPostgres {
 
 // Start will try to start the configured Postgres process returning an error when there were any problems with invocation.
 // If any error occurs Start will try to also Stop the Postgres process in order to not leave any sub-process running.
+//
 //nolint:funlen
 func (ep *EmbeddedPostgres) Start() error {
 	if ep.started {
diff --git a/embedded_postgres_test.go b/embedded_postgres_test.go
@@ -251,7 +251,7 @@ func Test_CustomConfig(t *testing.T) {
 		Username("gin").
 		Password("wine").
 		Database("beer").
-		Version(V12).
+		Version(V15).
 		RuntimePath(tempDir).
 		Port(9876).
 		StartTimeout(10 * time.Second).
@@ -401,7 +401,6 @@ func Test_CanStartAndStopTwice(t *testing.T) {
 	}
 }
 
-//nolint:funlen
 func Test_ReuseData(t *testing.T) {
 	tempDir, err := ioutil.TempDir("", "embedded_postgres_test")
 	if err != nil {
@@ -496,7 +495,7 @@ func Test_CustomBinariesRepo(t *testing.T) {
 		Username("gin").
 		Password("wine").
 		Database("beer").
-		Version(V12).
+		Version(V15).
 		RuntimePath(tempDir).
 		BinaryRepositoryURL("https://repo.maven.apache.org/maven2").
 		Port(9876).
diff --git a/platform-test/platform_test.go b/platform-test/platform_test.go
@@ -13,6 +13,7 @@ import (
 
 func Test_AllMajorVersions(t *testing.T) {
 	allVersions := []embeddedpostgres.PostgresVersion{
+		embeddedpostgres.V15,
 		embeddedpostgres.V14,
 		embeddedpostgres.V13,
 		embeddedpostgres.V12,
diff --git a/version_strategy.go b/version_strategy.go
@@ -40,9 +40,8 @@ func defaultVersionStrategy(config Config, goos, arch string, linuxMachineName f
 		// postgres below version 14.2 is not available for macos on arm
 		if goos == "darwin" && arch == "arm64" {
 			var majorVer, minorVer int
-			fmt.Sscanf(string(config.version), "%d.%d", &majorVer, &minorVer)
-
-			if majorVer < 14 || (majorVer == 14 && minorVer < 2) {
+			if _, err := fmt.Sscanf(string(config.version), "%d.%d", &majorVer, &minorVer); err == nil &&
+				(majorVer < 14 || (majorVer == 14 && minorVer < 2)) {
 				arch = "amd64"
 			} else {
 				arch += "v8"
diff --git a/version_strategy_test.go b/version_strategy_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-//nolint:funlen
 func Test_DefaultVersionStrategy_AllGolangDistributions(t *testing.T) {
 	allGolangDistributions := map[string][]string{
 		"aix/ppc64":       {"aix", "ppc64"},

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`	`)`
`10`	`10`
`11`		`-//nolint:funlen`
`12`	`11`	`func Test_DefaultVersionStrategy_AllGolangDistributions(t *testing.T) {`
`13`	`12`	`allGolangDistributions := map[string][]string{`
`14`	`13`	`"aix/ppc64": {"aix", "ppc64"},`