agent: Remove color support

The value of this is minimal and it adds an external dependency

Signed-off-by: Thomas Graf <thomas@cilium.io>

cilium/cmd/endpoint_labels.go

@@ -19,7 +19,6 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/cilium/cilium/pkg/color"
 	endpointid "github.com/cilium/cilium/pkg/endpoint/id"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/labels/model"
@@ -74,13 +73,11 @@ func printEndpointLabels(lbls *labels.OpLabels) {
 	w := tabwriter.NewWriter(os.Stdout, 2, 0, 3, ' ', 0)
 
 	for _, v := range lbls.IdentityLabels() {
-		text := color.Green("Enabled")
-		fmt.Fprintf(w, "%s\t%s\n", v, text)
+		fmt.Fprintf(w, "%s\t%s\n", v, "Enabled")
 	}
 
 	for _, v := range lbls.Disabled {
-		text := color.Red("Disabled")
-		fmt.Fprintf(w, "%s\t%s\n", v, text)
+		fmt.Fprintf(w, "%s\t%s\n", v, "Disabled")
 	}
 	w.Flush()
 }

cilium/cmd/helpers.go

@@ -26,7 +26,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/cilium/cilium/pkg/bpf"
-	"github.com/cilium/cilium/pkg/color"
 	endpointid "github.com/cilium/cilium/pkg/endpoint/id"
 	"github.com/cilium/cilium/pkg/identity"
 	"github.com/cilium/cilium/pkg/maps/policymap"
@@ -358,11 +357,11 @@ func dumpConfig(Opts map[string]string) {
 		value = Opts[k]
 		if enabled, err := option.NormalizeBool(value); err != nil {
 			// If it cannot be parsed as a bool, just format the value.
-			fmt.Printf("%-24s %s\n", k, color.Green(value))
+			fmt.Printf("%-24s %s\n", k, value)
 		} else if enabled == option.OptionDisabled {
-			fmt.Printf("%-24s %s\n", k, color.Red("Disabled"))
+			fmt.Printf("%-24s %s\n", k, "Disabled")
 		} else {
-			fmt.Printf("%-24s %s\n", k, color.Green("Enabled"))
+			fmt.Printf("%-24s %s\n", k, "Enabled")
 		}
 	}
 }

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/docker/go-connections v0.3.0 // indirect
 	github.com/docker/libnetwork v0.0.0-20190128195551-d8d4c8cf03d7
 	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
-	github.com/fatih/color v1.7.0
 	github.com/go-openapi/errors v0.19.3
 	github.com/go-openapi/loads v0.19.5
 	github.com/go-openapi/runtime v0.19.4

pkg/endpoint/status.go

@@ -20,7 +20,6 @@ import (
 	"time"
 
 	"github.com/cilium/cilium/api/v1/models"
-	"github.com/cilium/cilium/pkg/color"
 	"github.com/cilium/cilium/pkg/lock"
 )
 
@@ -50,23 +49,6 @@ type Status struct {
 	State string     `json:"state"`
 }
 
-func (sc StatusCode) ColorString() string {
-	var text string
-	switch sc {
-	case OK:
-		text = color.Green("OK")
-	case Warning:
-		text = color.Yellow("Warning")
-	case Failure:
-		text = color.Red("Failure")
-	case Disabled:
-		text = color.Yellow("Disabled")
-	default:
-		text = "Unknown code"
-	}
-	return fmt.Sprintf("%s", text)
-}
-
 func (sc StatusCode) String() string {
 	switch sc {
 	case OK:

pkg/option/option.go

@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	"github.com/cilium/cilium/api/v1/models"
-	"github.com/cilium/cilium/pkg/color"
 	"github.com/cilium/cilium/pkg/lock"
 )
 
@@ -32,8 +31,7 @@ type VerifyFunc func(key string, value string) error
 // cannot be parsed or applied.
 type ParseFunc func(value string) (OptionSetting, error)
 
-// FormatFunc formats the specified value as a colored textual representation
-// of the option.
+// FormatFunc formats the specified value as textual representation option.
 type FormatFunc func(value OptionSetting) string
 
 // Option is the structure used to specify the semantics of a configurable
@@ -373,9 +371,9 @@ func (o *IntOptions) Dump() {
 		_, option := o.Library.Lookup(k)
 		if option == nil || option.Format == nil {
 			if o.Opts[k] == OptionDisabled {
-				text = color.Red("Disabled")
+				text = "Disabled"
 			} else {
-				text = color.Green("Enabled")
+				text = "Enabled"
 			}
 		} else {
 			text = option.Format(o.Opts[k])