66 "strings"
77 "unicode"
88
9- "github.com/fatih/color"
109 "github.com/google/osv-scanner/pkg/models"
10+ "github.com/jedib0t/go-pretty/v6/text"
1111)
1212
1313func PrintVerticalResults (vulnResult * models.VulnerabilityResults , outputWriter io.Writer ) {
@@ -29,8 +29,8 @@ func printVerticalHeader(result models.PackageSource, out io.Writer) {
2929 fmt .Fprintf (
3030 out ,
3131 "%s: found %s %s with issues\n " ,
32- color . MagentaString ("%s" , result .Source .Path ),
33- color . YellowString ("%d" , len (result .Packages )),
32+ text . FgMagenta . Sprintf ("%s" , result .Source .Path ),
33+ text . FgYellow . Sprintf ("%d" , len (result .Packages )),
3434 Form (len (result .Packages ), "package" , "packages" ),
3535 )
3636}
@@ -42,7 +42,7 @@ func printVerticalVulnerabilities(result models.PackageSource, out io.Writer) {
4242 fmt .Fprintf (
4343 out ,
4444 " %s\n " ,
45- color . GreenString ("no known vulnerabilities found" ),
45+ text . FgGreen . Sprintf ("no known vulnerabilities found" ),
4646 )
4747
4848 return
@@ -57,21 +57,21 @@ func printVerticalVulnerabilities(result models.PackageSource, out io.Writer) {
5757
5858 fmt .Fprintf (out ,
5959 " %s %s\n " ,
60- color . YellowString ("%s@%s" , pkg .Package .Name , pkg .Package .Version ),
61- color . RedString ("is affected by the following vulnerabilities:" ),
60+ text . FgYellow . Sprintf ("%s@%s" , pkg .Package .Name , pkg .Package .Version ),
61+ text . FgRed . Sprintf ("is affected by the following vulnerabilities:" ),
6262 )
6363
6464 for _ , vulnerability := range pkg .Vulnerabilities {
6565 fmt .Fprintf (out ,
6666 " %s %s\n " ,
67- color . CyanString ("%s:" , vulnerability .ID ),
67+ text . FgCyan . Sprintf ("%s:" , vulnerability .ID ),
6868 describe (vulnerability ),
6969 )
7070 }
7171 }
7272
7373 fmt .Fprintf (out , "\n %s\n " ,
74- color . RedString (
74+ text . FgRed . Sprintf (
7575 "%d known %s found in %s" ,
7676 count ,
7777 Form (count , "vulnerability" , "vulnerabilities" ),
@@ -87,13 +87,13 @@ func printVerticalLicenseViolations(result models.PackageSource, out io.Writer)
8787 fmt .Fprintf (
8888 out ,
8989 " %s\n " ,
90- color . GreenString ("no license violations found" ),
90+ text . FgGreen . Sprintf ("no license violations found" ),
9191 )
9292
9393 return
9494 }
9595
96- fmt .Fprintf (out , "\n %s\n " , color . RedString ("license violations found:" ))
96+ fmt .Fprintf (out , "\n %s\n " , text . FgRed . Sprintf ("license violations found:" ))
9797
9898 for _ , pkg := range result .Packages {
9999 if len (pkg .LicenseViolations ) == 0 {
@@ -107,13 +107,13 @@ func printVerticalLicenseViolations(result models.PackageSource, out io.Writer)
107107
108108 fmt .Fprintf (out ,
109109 " %s (%s)\n " ,
110- color . YellowString ("%s@%s" , pkg .Package .Name , pkg .Package .Version ),
111- color . CyanString (strings .Join (violations , ", " )),
110+ text . FgYellow . Sprintf ("%s@%s" , pkg .Package .Name , pkg .Package .Version ),
111+ text . FgCyan . Sprintf (strings .Join (violations , ", " )),
112112 )
113113 }
114114
115115 fmt .Fprintf (out , "\n %s\n " ,
116- color . RedString (
116+ text . FgRed . Sprintf (
117117 "%d license %s found in %s" ,
118118 count ,
119119 Form (count , "violation" , "violations" ),
0 commit comments