Merge branch 'dmius-a002-rec-fix' into 'master'

Fix A002 conclusion message

See merge request postgres-ai/postgres-checkup!316

Author: dmius

pghrep/src/checkup/a002/a002.go

@@ -190,16 +190,32 @@ func A002CheckMinorVersions(report A002Report, result checkup.ReportOutcome) che
 			updateVersions = append(updateVersions, hostData.Data.ServerMajorVer+"."+strconv.Itoa(lastVersion))
 		}
 	}
-	if len(updateHosts) > 0 {
-		result.AppendConclusion(english.PluralWord(len(updateHosts),
+	curVersions = getUniques(curVersions)
+	if len(curVersions) > 0 {
+		result.AppendConclusion(english.PluralWord(len(curVersions),
 			MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_1, MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_N),
-			strings.Join(updateHosts, ", "), strings.Join(curVersions, ", "), updateVersions[0])
+			strings.Join(curVersions, ", "), updateVersions[0])
 		result.AppendRecommendation(MSG_NOT_LAST_MINOR_VERSION_RECOMMENDATION, updateVersions[0])
 		result.P2 = true
 	}
 	return result
 }
 
+func getUniques(array []string) []string {
+	items := map[string]bool{}
+	for _, item := range array {
+		items[item] = true
+	}
+
+	res := make([]string, len(items))
+	i := 0
+	for key, _ := range items {
+		res[i] = key
+		i++
+	}
+	return res
+}
+
 func A002Process(report A002Report) checkup.ReportOutcome {
 	var result checkup.ReportOutcome
 	A002PrepareVersionInfo()
@@ -215,7 +231,7 @@ func A002PreprocessReportData(data map[string]interface{}) {
 	var report A002Report
 	err := json.Unmarshal(jsonRaw, &report)
 	if err != nil {
-		log.Err("Can't load json report to process")
+		log.Err("Cannot load json report to process")
 		return
 	}
 	result := A002Process(report)

pghrep/src/checkup/a002/a002messages.go

@@ -18,9 +18,8 @@ const MSG_SUPPORTED_VERSION_CONCLUSION string = "Postgres major version being us
 	"of bugs and security issues, updates (new minor versions) with fixes will be released and available for use." +
 	" Read more: [Versioning Policy](https://www.postgresql.org/support/versioning/)."
 const MSG_LAST_MINOR_VERSION_CONCLUSION string = "%s is the most up-to-date Postgres minor version in the branch %s."
-const MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_1 string = "[P2] Node %s use not the most up-to-date installed minor version%s %s, the newest minor version is %s)."
-const MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_N string = "[P2] Nodes %s use not the most up-to-date installed minor versions %s respectively, the newest minor version is %s)."
-
+const MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_1 string = "[P2] The minor version being used (%s) is not up-to-date (%s)."
+const MSG_NOT_LAST_MINOR_VERSION_CONCLUSION_N string = "[P2] The minor versions being used (%s) are not up-to-date (%s)."
 const MSG_NOT_ALL_VERSIONS_SAME_CONCLUSION_1 string = "[P2] Not all nodes have the same Postgres version. Node %s uses Postgres %s."
 const MSG_NOT_ALL_VERSIONS_SAME_CONCLUSION_N string = "[P2] Not all nodes have the same Postgres version. Nodes %s uses Postgres %s respectively."
 const MSG_NOT_ALL_VERSIONS_SAME_RECOMMENDATION string = "[P2] Please upgrade Postgres so its versions on all nodes match."