remove scheme-related variables and scorecard output coloring

Author: estroz

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/google/go-cmp v0.4.0 // indirect
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/mattn/go-isatty v0.0.8
 	github.com/mikefarah/yq/v2 v2.4.1
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect

pkg/apis/scorecard/v1alpha3/formatter.go

@@ -3,34 +3,12 @@ package v1alpha3
 import (
 	"bufio"
 	"fmt"
-	"os"
 	"strings"
-
-	"github.com/mattn/go-isatty"
-)
-
-const (
-	redColor    = "31"
-	greenColor  = "32"
-	yellowColor = "33"
-	noColor     = "%s\n"
 )
 
 func (s Test) MarshalText() string {
 	var sb strings.Builder
 
-	failColor := "\033[1;" + redColor + "m%s\033[0m"
-	passColor := "\033[1;" + greenColor + "m%s\033[0m"
-	warnColor := "\033[1;" + yellowColor + "m%s\033[0m"
-
-	// turn off colorization if not in a terminal
-	if !isatty.IsTerminal(os.Stdout.Fd()) &&
-		!isatty.IsCygwinTerminal(os.Stdout.Fd()) {
-		passColor = noColor
-		failColor = noColor
-		warnColor = noColor
-	}
-
 	sb.WriteString(fmt.Sprintf("%s\n", strings.Repeat("-", 80)))
 	sb.WriteString(fmt.Sprintf("Image:      %s\n", s.Spec.Image))
 
@@ -51,26 +29,24 @@ func (s Test) MarshalText() string {
 				sb.WriteString(fmt.Sprintf("\tName: %s\n", result.Name))
 			}
 			sb.WriteString("\tState: ")
-			if result.State == PassState {
-				sb.WriteString(fmt.Sprintf(passColor, PassState))
-			} else if result.State == FailState {
-				sb.WriteString(fmt.Sprintf(failColor, FailState))
-			} else if result.State == ErrorState {
-				sb.WriteString(fmt.Sprintf(failColor, ErrorState))
-			} else {
+			switch result.State {
+			case PassState, FailState, ErrorState:
+				sb.WriteString(string(result.State))
+				sb.WriteString("\n")
+			default:
 				sb.WriteString("unknown")
 			}
 			sb.WriteString("\n")
 
 			if len(result.Suggestions) > 0 {
-				sb.WriteString(fmt.Sprintf(warnColor, "\tSuggestions:\n"))
+				sb.WriteString("\tSuggestions:\n")
 				for _, suggestion := range result.Suggestions {
 					sb.WriteString(fmt.Sprintf("\t\t%s\n", suggestion))
 				}
 			}
 
 			if len(result.Errors) > 0 {
-				sb.WriteString(fmt.Sprintf(failColor, "\tErrors:\n"))
+				sb.WriteString("\tErrors:\n")
 				for _, err := range result.Errors {
 					sb.WriteString(fmt.Sprintf("\t\t%s\n", err))
 				}

pkg/apis/scorecard/v1alpha3/register.go

@@ -2,13 +2,9 @@ package v1alpha3
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "scorecard.operatorframework.io", Version: "v1alpha3"}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+	// GroupVersion is the group and version of this package. Used for parsing purposes only.
+	GroupVersion = schema.GroupVersion{Group: "scorecard.operatorframework.io", Version: "v1alpha3"}
 )

pkg/apis/scorecard/v1alpha3/test_types.go

@@ -53,7 +53,7 @@ type TestList struct {
 func NewTest() Test {
 	return Test{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: SchemeGroupVersion.String(),
+			APIVersion: GroupVersion.String(),
 			Kind:       "Test",
 		},
 	}
@@ -62,12 +62,8 @@ func NewTest() Test {
 func NewTestList() TestList {
 	return TestList{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: SchemeGroupVersion.String(),
+			APIVersion: GroupVersion.String(),
 			Kind:       "TestList",
 		},
 	}
 }
-
-func init() {
-	SchemeBuilder.Register(&Test{})
-}