more fixes

Signed-off-by: Carlos Panato <[email protected]>

Author: cpanato

cmd/ci-reporter/cmd/root.go

@@ -25,6 +25,8 @@ import (
 	"time"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/shurcooL/githubv4"
 	"github.com/spf13/cobra"
 	"github.com/tj/go-spin"
@@ -244,19 +246,40 @@ func PrintReporterData(cfg *Config, reports *CIReportDataFields) error {
 		if err != nil {
 			return fmt.Errorf("could not write to output stream: %w", err)
 		}
-
-		table := tablewriter.NewWriter(out)
 		data := [][]string{}
 
+		table := tablewriter.NewTable(out,
+			tablewriter.WithConfig(tablewriter.Config{
+				Header: tw.CellConfig{
+					Alignment: tw.CellAlignment{Global: tw.AlignLeft},
+				},
+			}),
+			tablewriter.WithHeader([]string{"TESTGRID BOARD", "TITLE", "STATUS", "STATUS DETAILS"}),
+			tablewriter.WithRenderer(renderer.NewMarkdown()),
+			tablewriter.WithRendition(tw.Rendition{
+				Symbols: tw.NewSymbols(tw.StyleMarkdown),
+				Borders: tw.Border{
+					Left:   tw.On,
+					Top:    tw.Off,
+					Right:  tw.On,
+					Bottom: tw.Off,
+				},
+				Settings: tw.Settings{
+					Separators: tw.Separators{
+						BetweenRows: tw.On,
+					},
+				},
+			}),
+			tablewriter.WithRowAutoWrap(tw.WrapNone),
+		)
+
 		// table in short version differs from regular table
 		if cfg.ShortReport {
-			table.SetHeader([]string{"TESTGRID BOARD", "TITLE", "STATUS", "STATUS DETAILS"})
-
 			for _, record := range r.Records {
 				data = append(data, []string{record.TestgridBoard, record.Title, record.Status, record.StatusDetails})
 			}
 		} else {
-			table.SetHeader([]string{"TESTGRID BOARD", "TITLE", "STATUS", "STATUS DETAILS", "URL", "UPDATED AT"})
+			table.Options(tablewriter.WithHeader([]string{"TESTGRID BOARD", "TITLE", "STATUS", "STATUS DETAILS", "URL", "UPDATED AT"}))
 
 			for _, record := range r.Records {
 				data = append(data, []string{
@@ -269,9 +292,7 @@ func PrintReporterData(cfg *Config, reports *CIReportDataFields) error {
 			}
 		}
 
-		table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
-		table.AppendBulk(data)
-		table.SetCenterSeparator("|")
+		table.Append(data)
 		table.Render()
 
 		// write a summary

cmd/schedule-builder/cmd/markdown.go

@@ -105,6 +105,9 @@ func parsePatchSchedule(patchSchedule PatchSchedule) string {
 				Header: tw.CellConfig{
 					Alignment: tw.CellAlignment{Global: tw.AlignLeft},
 				},
+				Row: tw.CellConfig{
+					Alignment: tw.CellAlignment{Global: tw.AlignLeft},
+				},
 			}),
 			tablewriter.WithHeader([]string{"Patch Release", "Cherry Pick Deadline", "Target Date", "Note"}),
 			tablewriter.WithRenderer(renderer.NewMarkdown()),
@@ -174,6 +177,9 @@ func parseReleaseSchedule(releaseSchedule ReleaseSchedule) string {
 		table := tablewriter.NewTable(tableString,
 			tablewriter.WithConfig(tablewriter.Config{
 				Header: tw.CellConfig{
+					Alignment: tw.CellAlignment{Global: tw.AlignCenter},
+				},
+				Row: tw.CellConfig{
 					Alignment: tw.CellAlignment{Global: tw.AlignLeft},
 				},
 			}),
@@ -189,7 +195,8 @@ func parseReleaseSchedule(releaseSchedule ReleaseSchedule) string {
 				},
 				Settings: tw.Settings{
 					Separators: tw.Separators{
-						BetweenRows: tw.On,
+						BetweenRows:    tw.On,
+						BetweenColumns: tw.Off,
 					},
 				},
 			}),

cmd/schedule-builder/cmd/markdown_test.go

@@ -31,7 +31,7 @@ import (
 const expectedPatchSchedule = `### Upcoming Monthly Releases
 
 | MONTHLY PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
-|-----------------------|----------------------|-------------|
+|:----------------------|:---------------------|:------------|
 | June 2020             | 2020-06-12           | 2020-06-17  |
 
 ### Timeline
@@ -43,7 +43,7 @@ Next patch release is **X.Y.ZZZ**
 **X.Y** enters maintenance mode on **THEN** and End of Life is on **NOW**.
 
 | PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
-|---------------|----------------------|-------------|------|
+|:--------------|:---------------------|:------------|:-----|
 | X.Y.ZZZ       | 2020-06-12           | 2020-06-17  |      |
 | X.Y.XXX       | 2020-05-15           | 2020-05-20  | honk |
 | X.Y.YYY       | 2020-04-13           | 2020-04-16  |      |