Merge pull request #2 from ADorigi/fix-run-jobs

fix: add table output for run jobs
opengovern · Sep 15, 2024 · 691c315 · 691c315
2 parents f0cffb1 + e616a9c
commit 691c315
Show file tree

Hide file tree

Showing 8 changed files with 175 additions and 15 deletions.
diff --git a/cmd/get/benchmarks.go b/cmd/get/benchmarks.go
@@ -6,11 +6,11 @@ package get
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/adorigi/opengovernance/pkg/output/tables"
 	"io"
 	"net/http"
 
 	"github.com/adorigi/opengovernance/pkg/config"
-	"github.com/adorigi/opengovernance/pkg/output"
 	"github.com/adorigi/opengovernance/pkg/request"
 	"github.com/adorigi/opengovernance/pkg/types"
 	"github.com/adorigi/opengovernance/pkg/utils"
@@ -28,13 +28,17 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		client := &http.Client{}
 		configuration, err := config.ReadConfigFile()
 		if err != nil {
 			return err
 		}
 
+		outputFormat := utils.ReadStringFlag(cmd, "output")
+		if outputFormat == "" {
+			outputFormat = configuration.OutputFormat
+		}
+
 		requestPayload := types.RequestPayload{
 			Cursor:  1,
 			PerPage: int(utils.ReadIntFlag(cmd, "page-size")),
@@ -73,10 +77,10 @@ to quickly create a Cobra application.`,
 			return err
 		}
 
-		if configuration.OutputFormat == "table" {
+		if outputFormat == "table" {
 			rows := utils.GenerateBenchmarkRows(benchmarks)
 
-			output.PrintBenchmarksTable(rows)
+			tables.PrintBenchmarksTable(rows)
 		} else {
 			js, err := json.MarshalIndent(benchmarks, "", "   ")
 			if err != nil {

diff --git a/cmd/get/controls.go b/cmd/get/controls.go
@@ -6,11 +6,11 @@ package get
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/adorigi/opengovernance/pkg/output/tables"
 	"io"
 	"net/http"
 
 	"github.com/adorigi/opengovernance/pkg/config"
-	"github.com/adorigi/opengovernance/pkg/output"
 	"github.com/adorigi/opengovernance/pkg/request"
 	"github.com/adorigi/opengovernance/pkg/types"
 	"github.com/adorigi/opengovernance/pkg/utils"
@@ -28,13 +28,17 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		client := &http.Client{}
 		configuration, err := config.ReadConfigFile()
 		if err != nil {
 			return err
 		}
 
+		outputFormat := utils.ReadStringFlag(cmd, "output")
+		if outputFormat == "" {
+			outputFormat = configuration.OutputFormat
+		}
+
 		requestPayload := types.RequestPayload{
 			Cursor:  1,
 			PerPage: int(utils.ReadIntFlag(cmd, "page-size")),
@@ -73,10 +77,10 @@ to quickly create a Cobra application.`,
 			return err
 		}
 
-		if configuration.OutputFormat == "table" {
+		if outputFormat == "table" {
 			rows := utils.GenerateControlRows(controls)
 
-			output.PrintControlsTable(rows)
+			tables.PrintControlsTable(rows)
 		} else {
 			js, err := json.MarshalIndent(controls, "", "   ")
 			if err != nil {

diff --git a/cmd/root.go b/cmd/root.go
@@ -40,6 +40,8 @@ func init() {
 	rootCmd.AddCommand(configureCmd)
 	rootCmd.AddCommand(get.GetCmd)
 	rootCmd.AddCommand(run.RunCmd)
+
+	rootCmd.PersistentFlags().String("output", "", "Output format: json/table")
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.

diff --git a/cmd/run/benchmark.go b/cmd/run/benchmark.go
@@ -3,6 +3,7 @@ package run
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/adorigi/opengovernance/pkg/output/tables"
 	"github.com/adorigi/opengovernance/pkg/request"
 	"io"
 	"net/http"
@@ -19,13 +20,17 @@ var benchmarkCmd = &cobra.Command{
 	Short: "Run specified benchmark on given integrations",
 	Long:  `Run specified benchmark on given integrations.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		client := &http.Client{}
 		configuration, err := config.ReadConfigFile()
 		if err != nil {
 			return err
 		}
 
+		outputFormat := utils.ReadStringFlag(cmd, "output")
+		if outputFormat == "" {
+			outputFormat = configuration.OutputFormat
+		}
+
 		integrationsStr, err := utils.ReadStringArrayFlag(cmd, "integration-info")
 		if err != nil {
 			return err
@@ -79,8 +84,13 @@ var benchmarkCmd = &cobra.Command{
 			return err
 		}
 
-		if configuration.OutputFormat == "table" {
-			// TODO
+		if outputFormat == "table" {
+			rows, err := utils.GenerateComplianceJobsRows(runBenchmarkResponse)
+			if err != nil {
+				return err
+			}
+
+			tables.PrintComplianceJobTable(rows)
 		} else {
 			js, err := json.MarshalIndent(runBenchmarkResponse, "", "   ")
 			if err != nil {

diff --git a/cmd/run/discovery.go b/cmd/run/discovery.go
@@ -3,6 +3,7 @@ package run
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/adorigi/opengovernance/pkg/output/tables"
 	"github.com/adorigi/opengovernance/pkg/request"
 	"io"
 	"net/http"
@@ -19,13 +20,17 @@ var discoveryCmd = &cobra.Command{
 	Short: "Run specified benchmark on given integrations",
 	Long:  `Run specified benchmark on given integrations.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		client := &http.Client{}
 		configuration, err := config.ReadConfigFile()
 		if err != nil {
 			return err
 		}
 
+		outputFormat := utils.ReadStringFlag(cmd, "output")
+		if outputFormat == "" {
+			outputFormat = configuration.OutputFormat
+		}
+
 		integrationsStr, err := utils.ReadStringArrayFlag(cmd, "integration-info")
 		if err != nil {
 			return err
@@ -80,8 +85,13 @@ var discoveryCmd = &cobra.Command{
 			return err
 		}
 
-		if configuration.OutputFormat == "table" {
-			// TODO
+		if outputFormat == "table" {
+			rows, err := utils.GenerateDiscoveryJobsRows(runDiscoveryResponse)
+			if err != nil {
+				return err
+			}
+
+			tables.PrintDiscoveryJobsTable(rows)
 		} else {
 			js, err := json.MarshalIndent(runDiscoveryResponse, "", "   ")
 			if err != nil {

diff --git a/pkg/output/table_output.go → pkg/output/tables/compliance.go b/pkg/output/table_output.go → pkg/output/tables/compliance.go
@@ -1,4 +1,4 @@
-package output
+package tables
 
 import (
 	"fmt"

diff --git a/pkg/output/tables/schedule.go b/pkg/output/tables/schedule.go
@@ -0,0 +1,94 @@
+package tables
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/lipgloss/table"
+)
+
+func PrintDiscoveryJobsTable(rows [][]string) {
+
+	re := lipgloss.NewRenderer(os.Stdout)
+
+	var (
+		HeaderStyle  = re.NewStyle().Foreground(tableColor).Bold(true).Align(lipgloss.Center)
+		CellStyle    = re.NewStyle().Padding(0, 1)
+		OddRowStyle  = CellStyle.Foreground(oddRowColor)
+		EvenRowStyle = CellStyle.Foreground(evenRowColor)
+	)
+
+	t := table.New().
+		Border(lipgloss.NormalBorder()).
+		BorderStyle(lipgloss.NewStyle().Foreground(lipgloss.Color("99"))).
+		StyleFunc(func(row, col int) lipgloss.Style {
+			var style lipgloss.Style
+			switch {
+			case row == 0:
+				style = HeaderStyle
+			case row%2 == 0:
+				style = EvenRowStyle
+			default:
+				style = OddRowStyle
+			}
+
+			switch {
+			case col == 0:
+				style.Width(40)
+			case col == 1:
+				style.Width(40)
+			case col == 2:
+				style.Width(10)
+			case col == 3:
+				style.Width(40)
+			}
+			return style
+		}).
+		Headers("JOB ID", "RESOURCE TYPE", "STATUS", "INTEGRATION", "FAILURE REASON").
+		Rows(rows...)
+
+	fmt.Println(t)
+
+}
+
+func PrintComplianceJobTable(rows [][]string) {
+
+	re := lipgloss.NewRenderer(os.Stdout)
+
+	var (
+		HeaderStyle  = re.NewStyle().Foreground(tableColor).Bold(true).Align(lipgloss.Center)
+		CellStyle    = re.NewStyle().Padding(0, 1)
+		OddRowStyle  = CellStyle.Foreground(oddRowColor)
+		EvenRowStyle = CellStyle.Foreground(evenRowColor)
+	)
+
+	t := table.New().
+		Border(lipgloss.NormalBorder()).
+		BorderStyle(lipgloss.NewStyle().Foreground(lipgloss.Color("99"))).
+		StyleFunc(func(row, col int) lipgloss.Style {
+			var style lipgloss.Style
+			switch {
+			case row == 0:
+				style = HeaderStyle
+			case row%2 == 0:
+				style = EvenRowStyle
+			default:
+				style = OddRowStyle
+			}
+
+			switch {
+			case col == 0:
+				style.Width(40)
+			case col == 1:
+				style.Width(40)
+			case col == 2:
+				style.Width(10)
+			}
+			return style
+		}).
+		Headers("JOB ID", "BENCHMARK ID", "INTEGRATIONS").
+		Rows(rows...)
+
+	fmt.Println(t)
+}
diff --git a/pkg/utils/table_rows.go b/pkg/utils/table_rows.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"encoding/json"
 	"strconv"
 
 	"github.com/adorigi/opengovernance/pkg/types"
@@ -40,3 +41,38 @@ func GenerateBenchmarkRows(benchmarks []types.BenchMark) [][]string {
 	return rows
 
 }
+
+func GenerateDiscoveryJobsRows(jobs []types.RunDiscoveryResponse) ([][]string, error) {
+	var rows [][]string
+	for _, job := range jobs {
+		integrationInfo, err := json.Marshal(job.IntegrationInfo)
+		if err != nil {
+			return nil, err
+		}
+		row := []string{
+			strconv.Itoa(int(job.JobId)),
+			job.ResourceType,
+			job.Status,
+			string(integrationInfo),
+			job.FailureReason,
+		}
+		rows = append(rows, row)
+	}
+	return rows, nil
+}
+
+func GenerateComplianceJobsRows(job types.RunBenchmarkResponse) ([][]string, error) {
+	var rows [][]string
+	integrationInfo, err := json.Marshal(job.IntegrationInfo)
+	if err != nil {
+		return nil, err
+	}
+	row := []string{
+		strconv.Itoa(int(job.JobId)),
+		job.BenchmarkId,
+		string(integrationInfo),
+	}
+	rows = append(rows, row)
+
+	return rows, nil
+}