Fix monthly patch output for schedule-builder

The output was empty which is now fixed.

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

cmd/schedule-builder/cmd/markdown.go

@@ -45,7 +45,16 @@ func parsePatchSchedule(patchSchedule PatchSchedule) string {
 		table.SetAutoWrapText(false)
 		table.SetHeader([]string{"Monthly Patch Release", "Cherry Pick Deadline", "Target Date"})
 		for _, upcoming := range patchSchedule.UpcomingReleases {
-			table.Append([]string{strings.TrimSpace(upcoming.Release), strings.TrimSpace(upcoming.CherryPickDeadline), strings.TrimSpace(upcoming.TargetDate)})
+			targetDate, err := time.Parse(refDate, upcoming.TargetDate)
+			if err != nil {
+				logrus.Errorf("Unable to parse upcoming target date %q: %v", upcoming.TargetDate, err)
+				continue
+			}
+			table.Append([]string{
+				targetDate.Format(refDateMonthly),
+				strings.TrimSpace(upcoming.CherryPickDeadline),
+				strings.TrimSpace(upcoming.TargetDate)},
+			)
 		}
 		table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
 		table.SetCenterSeparator("|")
@@ -167,8 +176,12 @@ func processFile(fileName string, vars interface{}) string {
 	return process(tmpl, vars)
 }
 
+const (
+	refDate        = "2006-01-02"
+	refDateMonthly = "January 2006"
+)
+
 func updatePatchSchedule(refTime time.Time, schedule PatchSchedule, eolBranches EolBranches, filePath, eolFilePath string) error {
-	const refDate = "2006-01-02"
 
 	removeSchedules := []int{}
 	for i, sched := range schedule.Schedules {
@@ -270,7 +283,7 @@ func updatePatchSchedule(refTime time.Time, schedule PatchSchedule, eolBranches
 			continue
 		}
 
-		logrus.Infof("Using existing upcoming release for %s (%s)", upcomingRelease.Release, upcomingRelease.TargetDate)
+		logrus.Infof("Using existing upcoming release for %s", upcomingRelease.TargetDate)
 		newUpcomingReleases = append(newUpcomingReleases, upcomingRelease)
 		latestDate = upcomingTargetDate
 	}
@@ -286,7 +299,7 @@ func updatePatchSchedule(refTime time.Time, schedule PatchSchedule, eolBranches
 		nextCherryPickDeadline := time.Date(latestDate.Year(), latestDate.Month(), cherryPickDay, 0, 0, 0, 0, time.UTC)
 		nextTargetDate := time.Date(latestDate.Year(), latestDate.Month(), targetDateDay, 0, 0, 0, 0, time.UTC)
 
-		logrus.Infof("Adding new upcoming release for %s", nextTargetDate.Format("January 2006"))
+		logrus.Infof("Adding new upcoming release for %s", nextTargetDate.Format(refDateMonthly))
 
 		newUpcomingReleases = append(newUpcomingReleases, &PatchRelease{
 			CherryPickDeadline: nextCherryPickDeadline.Format(refDate),

cmd/schedule-builder/cmd/markdown_test.go

@@ -31,7 +31,7 @@ const expectedPatchSchedule = `### Upcoming Monthly Releases
 
 | MONTHLY PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
 |-----------------------|----------------------|-------------|
-|                       | 2020-06-12           | 2020-06-17  |
+| June 2020             | 2020-06-12           | 2020-06-17  |
 
 ### Timeline