Merge pull request symfony-cli#317 from tucksaun/fix/315

fabpot · web-flow · commit b16175e521d5 · 2023-04-27T15:22:07.000+02:00
Make DB version check before deploy more robust, fix symfony-cli#315
diff --git a/commands/db_versions.go b/commands/db_versions.go
@@ -3,10 +3,12 @@ package commands
 import (
 	"errors"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/joho/godotenv"
 	"gopkg.in/yaml.v2"
 )
 
@@ -47,22 +49,26 @@ func readDBVersionFromDotEnv(projectDir string) (string, error) {
 		return "", nil
 	}
 
-	dotEnv, err := ioutil.ReadFile(path)
+	vars, err := godotenv.Read(path)
 	if err != nil {
 		return "", err
 	}
 
-	lines := strings.Split(string(dotEnv), "\n")
-	for _, line := range lines {
-		if !strings.HasPrefix(line, "DATABASE_URL=") {
-			continue
-		}
-		if !strings.Contains(line, "serverVersion=") {
-			return "", nil
-		}
-		return strings.TrimRight(strings.Split(strings.Split(line, "serverVersion=")[1], "&")[0], "\""), nil
+	databaseUrl, defined := vars["DATABASE_URL"]
+	if !defined {
+		return "", nil
+	}
+
+	if !strings.Contains(databaseUrl, "serverVersion=") {
+		return "", nil
 	}
-	return "", nil
+
+	url, err := url.Parse(databaseUrl)
+	if err != nil {
+		return "", err
+	}
+
+	return url.Query().Get("serverVersion"), nil
 }
 
 func readDBVersionFromDoctrineConfigYAML(projectDir string) (string, error) {
diff --git a/commands/testdata/platformsh/version-mismatch-env/.env b/commands/testdata/platformsh/version-mismatch-env/.env
@@ -4,5 +4,5 @@
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
-DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
+DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?charset=utf8&serverVersion=13" 
 ###< doctrine/doctrine-bundle ###

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`#`
`5`	`5`	`# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"`
`6`	`6`	`# DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"`
`7`		`-DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"`
	`7`	`+DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?charset=utf8&serverVersion=13"`
`8`	`8`	`###< doctrine/doctrine-bundle ###`