github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-08-27 00:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268 from manavellamnimble/postgressVersion

Browse Source 
Error Parsing Postgres Version
This commit is contained in:
divolgin
2020-09-24 15:43:28 -07:00
committed by GitHub
parent 8a30f2ddce 2da1f518d3
commit 7fe7216b29
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/analyze/database_shared.go
+8 -4
View File
@@ -35,14 +35,18 @@ func compareDatabaseConditionalToActual(conditional string, result *collect.Data
return false, errors.New("unable to parse postgres connected analyzer")
case "version":
expectedRange, err := semver.ParseRange(fmt.Sprintf("%s %s", parts[1], parts[2]))
expected, err := semver.ParseTolerant(strings.Replace(parts[2], "x", "0", -1))
if err != nil {
return false, errors.Wrap(err, "failed to parse semver range")
return false, errors.Wrap(err, "failed to parse expected version")
}
actual, err := semver.ParseTolerant(strings.Replace(result.Version, "x", "0", -1))
if err != nil {
return false, errors.Wrap(err, "failed to parse postgres db actual version")
}
actual, err := semver.Parse(result.Version)
expectedRange, err := semver.ParseRange(fmt.Sprintf("%s %s", parts[1], expected.String()))
if err != nil {
return false, errors.Wrap(err, "failed to parse actual psotgres version")
return false, errors.Wrap(err, "failed to parse semver range")
}
return expectedRange(actual), nil