github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-02-14 18:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: migrate fatih/color to gchalk

Browse Source 
Signed-off-by: DRAGON <anantvijay3@gmail.com>
This commit is contained in:
DRAGON
2023-08-11 04:31:02 +05:30
parent 51b37d5cbf
commit d946662e57
9 changed files with 36 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/configurationprinter/categorytable.go
View File

@@ -4,7 +4,6 @@ import (
"fmt"
"io"
"github.com/fatih/color"
"github.com/kubescape/kubescape/v2/core/cautils"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
"github.com/kubescape/opa-utils/reporthandling/apis"
@@ -74,7 +73,7 @@ func generateCategoryStatusRow(controlSummary reportsummary.IControlSummary, inf
rows[0] = controlSummary.GetName()
}
rows[1] = color.New(color.Bold, utils.GetStatusColor(controlSummary.GetStatus().Status())).SprintFunc()(getStatus(status, controlSummary, infoToPrintInfo))
rows[1] = utils.GetStatusColor(controlSummary.GetStatus().Status())(getStatus(status, controlSummary, infoToPrintInfo))
rows[2] = getDocsForControl(controlSummary)

4
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/configurationprinter/clusterscan.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"io"
"github.com/fatih/color"
"github.com/jwalton/gchalk"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
)
@@ -71,7 +71,7 @@ func (cp *ClusterPrinter) generateCountingCategoryRow(controlSummary reportsumma
failedResources := controlSummary.NumberOfResources().Failed()
if failedResources > 0 {
row[1] = string(color.New(color.FgYellow, color.Bold).SprintFunc()(fmt.Sprintf("%d", failedResources)))
row[1] = string(gchalk.WithYellow().Bold(fmt.Sprintf("%d", failedResources)))
} else {
row[1] = fmt.Sprintf("%d", failedResources)
}

4
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/configurationprinter/reposcan.go
View File

@@ -5,7 +5,7 @@ import (
"io"
"strings"
"github.com/fatih/color"
"github.com/jwalton/gchalk"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
"github.com/kubescape/opa-utils/reporthandling"
"github.com/kubescape/opa-utils/reporthandling/apis"
@@ -85,7 +85,7 @@ func (rp *RepoPrinter) generateCountingCategoryRow(controlSummary reportsummary.
failedResources := controlSummary.NumberOfResources().Failed()
if failedResources > 0 {
rows[1] = string(color.New(color.FgYellow, color.Bold).SprintFunc()(fmt.Sprintf("%d", failedResources)))
rows[1] = string(gchalk.WithYellow().Bold(fmt.Sprintf("%d", failedResources)))
} else {
rows[1] = fmt.Sprintf("%d", failedResources)
}

3
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/configurationprinter/summarytable.go
View File

@@ -4,7 +4,6 @@ import (
"fmt"
"strings"
"github.com/fatih/color"
"github.com/kubescape/kubescape/v2/core/cautils"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
"github.com/kubescape/opa-utils/reporthandling/apis"
@@ -26,7 +25,7 @@ func ControlCountersForSummary(counters reportsummary.ICounters) string {
}
func GetSeverityColumn(controlSummary reportsummary.IControlSummary) string {
return color.New(utils.GetColor(apis.ControlSeverityToInt(controlSummary.GetScoreFactor())), color.Bold).SprintFunc()(apis.ControlSeverityToString(controlSummary.GetScoreFactor()))
return utils.GetColor(apis.ControlSeverityToInt(controlSummary.GetScoreFactor()))(apis.ControlSeverityToString(controlSummary.GetScoreFactor()))
}
func GetControlTableHeaders(short bool) []string {

18
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/imageprinter/utils.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
v5 "github.com/anchore/grype/grype/db/v5"
"github.com/fatih/color"
"github.com/jwalton/gchalk"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
"github.com/kubescape/opa-utils/reporthandling/apis"
"github.com/olekukonko/tablewriter"
@@ -47,7 +47,7 @@ func generateRows(summary ImageScanSummary) [][]string {
func generateRow(cve CVE) []string {
row := make([]string, 5)
row[imageColumnSeverity] = color.New(getColor(cve.Severity), color.Bold).Sprint(cve.Severity)
row[imageColumnSeverity] = getColor(cve.Severity)(cve.Severity)
row[imageColumnName] = cve.ID
row[imageColumnComponent] = cve.Package
row[imageColumnVersion] = cve.Version
@@ -77,19 +77,19 @@ func getImageScanningColumnsAlignments() []int {
return []int{tablewriter.ALIGN_CENTER, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT}
}
func getColor(severity string) color.Attribute {
func getColor(severity string) (func(...string) string) {
switch severity {
case apis.SeverityCriticalString:
return color.FgRed
return gchalk.WithAnsi256(1).Bold
case apis.SeverityHighString:
return color.FgYellow
return gchalk.WithAnsi256(196).Bold
case apis.SeverityMediumString:
return color.FgCyan
return gchalk.WithAnsi256(166).Bold
case apis.SeverityLowString:
return color.FgBlue
return gchalk.WithAnsi256(220).Bold
case apis.SeverityNegligibleString:
return color.FgMagenta
return gchalk.WithAnsi256(16).Bold
default:
return color.FgWhite
return gchalk.WithAnsi256(16).Bold
}
}

55
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/imageprinter/utils_test.go
View File

@@ -4,8 +4,6 @@ import (
"testing"
v5 "github.com/anchore/grype/grype/db/v5"
"github.com/fatih/color"
"github.com/kubescape/opa-utils/reporthandling/apis"
"github.com/olekukonko/tablewriter"
)
@@ -162,56 +160,3 @@ func TestGetImageScanningColumnsAlignments(t *testing.T) {
}
}
}
func TestGetColor(t *testing.T) {
tests := []struct {
name string
severity string
want color.Attribute
}{
{
name: "check color for Critical",
severity: apis.SeverityCriticalString,
want: color.FgRed,
},
{
name: "check color for High",
severity: apis.SeverityHighString,
want: color.FgYellow,
},
{
name: "check color for Medium",
severity: apis.SeverityMediumString,
want: color.FgCyan,
},
{
name: "check color for Low",
severity: apis.SeverityLowString,
want: color.FgBlue,
},
{
name: "check color for Negligible",
severity: apis.SeverityNegligibleString,
want: color.FgMagenta,
},
{
name: "check color for Unknown",
severity: apis.SeverityUnknownString,
want: color.FgWhite,
},
{
name: "check color for Other",
severity: "Other",
want: color.FgWhite,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actualColor := getColor(tt.severity)
if actualColor != tt.want {
t.Errorf("expected %v, got %v", tt.want, actualColor)
}
})
}
}

36
core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils/utils.go
View File

@@ -5,7 +5,7 @@ import (
"io"
"os"
"github.com/fatih/color"
"github.com/jwalton/gchalk"
"github.com/kubescape/kubescape/v2/core/cautils"
"github.com/kubescape/opa-utils/reporthandling/apis"
"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
@@ -55,18 +55,18 @@ func MapInfoToPrintInfo(controls reportsummary.ControlSummaries) []InfoStars {
return infoToPrintInfo
}
func GetColor(severity int) color.Attribute {
func GetColor(severity int) (func(...string) string) {
switch severity {
case apis.SeverityCritical:
return color.FgRed
return gchalk.WithAnsi256(1).Bold
case apis.SeverityHigh:
return color.FgYellow
return gchalk.WithAnsi256(196).Bold
case apis.SeverityMedium:
return color.FgCyan
return gchalk.WithAnsi256(166).Bold
case apis.SeverityLow:
return color.FgWhite
return gchalk.WithAnsi256(220).Bold
default:
return color.FgWhite
return gchalk.WithAnsi256(16).Bold
}
}
@@ -112,31 +112,31 @@ func PrintInfo(writer io.Writer, infoToPrintInfo []InfoStars) {
}
}
func GetStatusColor(status apis.ScanningStatus) color.Attribute {
func GetStatusColor(status apis.ScanningStatus) (func(...string) string) {
switch status {
case apis.StatusPassed:
return color.FgGreen
return gchalk.WithGreen().Bold
case apis.StatusFailed:
return color.FgRed
return gchalk.WithRed().Bold
case apis.StatusSkipped:
return color.FgCyan
return gchalk.WithCyan().Bold
default:
return color.FgWhite
return gchalk.WithWhite().Bold
}
}
func getColor(controlSeverity int) color.Attribute {
func getColor(controlSeverity int) (func(...string) string) {
switch controlSeverity {
case apis.SeverityCritical:
return color.FgRed
return gchalk.WithAnsi256(1).Bold
case apis.SeverityHigh:
return color.FgYellow
return gchalk.WithAnsi256(196).Bold
case apis.SeverityMedium:
return color.FgCyan
return gchalk.WithAnsi256(166).Bold
case apis.SeverityLow:
return color.FgWhite
return gchalk.WithAnsi256(220).Bold
default:
return color.FgWhite
return gchalk.WithAnsi256(16).Bold
}
}

4
core/pkg/resultshandling/printer/v2/prettyprinter/utils.go
View File

@@ -6,7 +6,7 @@ import (
"sort"
"strings"
"github.com/fatih/color"
"github.com/jwalton/gchalk"
"github.com/kubescape/kubescape/v2/core/cautils"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/imageprinter"
"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
@@ -245,5 +245,5 @@ func printComplianceScore(writer *os.File, frameworks []reportsummary.IFramework
}
func getCallToActionString(action string) string {
return color.New(color.Bold, color.FgHiBlue).SprintFunc()(action)
return gchalk.WithBrightBlue().Bold(action)
}

2
go.mod
View File

@@ -14,7 +14,6 @@ require (
github.com/briandowns/spinner v1.23.0
github.com/docker/distribution v2.8.2+incompatible
github.com/enescakir/emoji v1.0.0
github.com/fatih/color v1.15.0
github.com/francoispqt/gojay v1.2.13
github.com/go-git/go-git/v5 v5.7.0
github.com/google/go-containerregistry v0.15.2
@@ -178,6 +177,7 @@ require (
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/facebookincubator/nvdtools v0.1.5 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/ghodss/yaml v1.0.0 // indirect