review after brian

Author: nicholasSUSE

pkg/lifecycle/logs.go

@@ -14,11 +14,8 @@ type logs struct {
 	filePath string
 }
 
-// SEPARATOR is a standard separator for logs
-const SEPARATOR = "\n"
-
-// ENDER is a standard end for the logged information
-const ENDER = "\n__________________________________________________________________\n"
+const separator = "\n"
+const ender = "\n__________________________________________________________________\n"
 
 // createLogs creates a new log file and returns a logs struct with the file and file path
 func createLogs(fileName string) (*logs, error) {
@@ -51,7 +48,7 @@ func (l *logs) writeHEAD(versionRules *VersionRules, title string) {
 	l.write(fmt.Sprintf("development branch: %s", versionRules.devBranch), "INFO")
 	l.write(fmt.Sprintf("production branch: %s", versionRules.prodBranch), "INFO")
 
-	rules := make(map[string]string)
+	rules := make(map[string]string, len(versionRules.rules))
 	for k, v := range versionRules.rules {
 		rules[fmt.Sprintf("%.1f", k)] = fmt.Sprintf("min: %s, max: %s", v.min, v.max)
 	}
@@ -84,13 +81,13 @@ func (l *logs) write(data string, logType string) {
 			logrus.Errorf("Error while writing logs: %s", err)
 		}
 	case "SEPARATE":
-		fmt.Printf(SEPARATOR)
-		if _, err := l.file.WriteString(SEPARATOR); err != nil {
+		fmt.Printf(separator)
+		if _, err := l.file.WriteString(separator); err != nil {
 			logrus.Errorf("Error while writing logs: %s", err)
 		}
 	case "END":
-		fmt.Printf(ENDER)
-		if _, err := l.file.WriteString("\n" + ENDER + "\n"); err != nil {
+		fmt.Printf(ender)
+		if _, err := l.file.WriteString("\n" + ender + "\n"); err != nil {
 			logrus.Errorf("Error while writing logs: %s", err)
 		}
 	default:

pkg/lifecycle/status.go

@@ -43,7 +43,11 @@ func (ld *Dependencies) getStatus() (*Status, error) {
 	}
 
 	// Separate the assets to be released from the assets to be forward ported after the comparison
-	status.separateReleaseFromForwardPort()
+	err = status.separateReleaseFromForwardPort()
+	if err != nil {
+		logrus.Errorf("failed to separate releases from forward-ports: %v", err)
+		return status, fmt.Errorf("failed to separate releases from forward-ports: %v", err)
+	}
 
 	return status, nil
 }
@@ -350,13 +354,17 @@ func checkIfVersionIsReleased(version string, releasedVersions []Asset) bool {
 }
 
 // separateReleaseFromForwardPort will separate the assets to be released from the assets to be forward ported, the assets were loaded previously by listProdAndDevAssets function.
-func (s *Status) separateReleaseFromForwardPort() {
+func (s *Status) separateReleaseFromForwardPort() error {
 	assetsToBeReleased := make(map[string][]Asset)
 	assetsToBeForwardPorted := make(map[string][]Asset)
 
 	for asset, versions := range s.assetsNotReleasedInLifecycle {
 		for _, version := range versions {
-			if toRelease := s.ld.VR.CheckChartVersionToRelease(version.version); toRelease {
+			toRelease, err := s.ld.VR.CheckChartVersionToRelease(version.version)
+			if err != nil {
+				return err
+			}
+			if toRelease {
 				assetsToBeReleased[asset] = append(assetsToBeReleased[asset], version)
 			} else {
 				assetsToBeForwardPorted[asset] = append(assetsToBeForwardPorted[asset], version)
@@ -367,5 +375,5 @@ func (s *Status) separateReleaseFromForwardPort() {
 	s.assetsToBeReleased = assetsToBeReleased
 	s.assetsToBeForwardPorted = assetsToBeForwardPorted
 
-	return
+	return nil
 }

pkg/lifecycle/versions.rules.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/sirupsen/logrus"
 )
 
 // ProductionBranchPrefix is the official prefix for the production branch
@@ -138,10 +140,11 @@ func (vr *VersionRules) CheckChartVersionForLifecycle(chartVersion string) bool
 }
 
 // CheckChartVersionToRelease will return if the current versyion being analyzed is the one to be released or not
-func (vr *VersionRules) CheckChartVersionToRelease(chartVersion string) bool {
-	chartVersionInt, _ := strconv.Atoi(strings.Split(chartVersion, ".")[0])
-	if chartVersionInt == (vr.maxVersion - 1) {
-		return true
+func (vr *VersionRules) CheckChartVersionToRelease(chartVersion string) (bool, error) {
+	chartVersionInt, err := strconv.Atoi(strings.Split(chartVersion, ".")[0])
+	if err != nil {
+		logrus.Errorf("failed to check version to release for chartVersion:%s with error:%v", chartVersion, err)
+		return false, err
 	}
-	return false
+	return chartVersionInt == (vr.maxVersion - 1), nil
 }