clean up code, add quotes around labels

Author: jmccormick2001

internal/scorecard/plugins/basic_tests.go

@@ -24,6 +24,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -33,6 +34,8 @@ type BasicTestConfig struct {
 	Client   client.Client
 	CR       *unstructured.Unstructured
 	ProxyPod *v1.Pod
+	Version  string
+	Selector labels.Selector
 }
 
 // Test Defintions
@@ -105,6 +108,10 @@ func NewBasicTestSuite(conf BasicTestConfig) *schelpers.TestSuite {
 	ts.AddTest(NewCheckStatusTest(conf), 1)
 	ts.AddTest(NewWritingIntoCRsHasEffectTest(conf), 1)
 
+	if schelpers.IsV1alpha2(conf.Version) {
+		ts.ApplySelector(conf.Selector)
+	}
+
 	return ts
 }
 

internal/scorecard/plugins/olm_tests.go

@@ -28,6 +28,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -40,6 +41,8 @@ type OLMTestConfig struct {
 	CSV      *olmapiv1alpha1.ClusterServiceVersion
 	CRDsDir  string
 	ProxyPod *v1.Pod
+	Selector labels.Selector
+	Version  string
 }
 
 // Test Defintions
@@ -166,6 +169,10 @@ func NewOLMTestSuite(conf OLMTestConfig) *schelpers.TestSuite {
 	ts.AddTest(NewSpecDescriptorsTest(conf), 1)
 	ts.AddTest(NewStatusDescriptorsTest(conf), 1)
 
+	if schelpers.IsV1alpha2(conf.Version) {
+		ts.ApplySelector(conf.Selector)
+	}
+
 	return ts
 }
 

internal/scorecard/plugins/plugin_runner.go

@@ -292,11 +292,11 @@ func RunInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig, lo
 				Client:   runtimeClient,
 				CR:       obj,
 				ProxyPod: proxyPodGlobal,
+				Version:  config.Version,
+				Selector: config.Selector,
 			}
 			basicTests := NewBasicTestSuite(conf)
-			if schelpers.IsV1alpha2(config.Version) {
-				basicTests.ApplySelector(config.Selector)
-			}
+
 			basicTests.Run(context.TODO())
 			logs, err := ioutil.ReadAll(logReadWriter)
 			if err != nil {
@@ -313,11 +313,11 @@ func RunInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig, lo
 				CSV:      csv,
 				CRDsDir:  config.CRDsDir,
 				ProxyPod: proxyPodGlobal,
+				Version:  config.Version,
+				Selector: config.Selector,
 			}
 			olmTests := NewOLMTestSuite(conf)
-			if schelpers.IsV1alpha2(config.Version) {
-				olmTests.ApplySelector(config.Selector)
-			}
+
 			olmTests.Run(context.TODO())
 			logs, err := ioutil.ReadAll(logReadWriter)
 			if err != nil {
@@ -352,12 +352,13 @@ func RunInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig, lo
 func ListInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig) (scapiv1alpha1.ScorecardOutput, error) {
 	var suites []schelpers.TestSuite
 
-	if pluginType == BasicOperator {
-		conf := BasicTestConfig{}
-		basicTests := NewBasicTestSuite(conf)
-		if schelpers.IsV1alpha2(config.Version) {
-			basicTests.ApplySelector(config.Selector)
+	switch pluginType {
+	case BasicOperator:
+		conf := BasicTestConfig{
+			Version:  config.Version,
+			Selector: config.Selector,
 		}
+		basicTests := NewBasicTestSuite(conf)
 
 		basicTests.TestResults = make([]schelpers.TestResult, 0)
 		for i := 0; i < len(basicTests.Tests); i++ {
@@ -368,13 +369,13 @@ func ListInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig) (
 			basicTests.TestResults = append(basicTests.TestResults, result)
 		}
 		suites = append(suites, *basicTests)
-	}
-	if pluginType == OLMIntegration {
-		conf := OLMTestConfig{}
-		olmTests := NewOLMTestSuite(conf)
-		if schelpers.IsV1alpha2(config.Version) {
-			olmTests.ApplySelector(config.Selector)
+	case OLMIntegration:
+		conf := OLMTestConfig{
+			Version:  config.Version,
+			Selector: config.Selector,
 		}
+		olmTests := NewOLMTestSuite(conf)
+
 		olmTests.TestResults = make([]schelpers.TestResult, 0)
 		for i := 0; i < len(olmTests.Tests); i++ {
 			result := schelpers.TestResult{}

pkg/apis/scorecard/v1alpha2/formatter.go

@@ -58,7 +58,7 @@ func (s ScorecardOutput) MarshalText() (string, error) {
 
 		sb.WriteString("\tLabels: \n")
 		for labelKey, labelValue := range result.Labels {
-			sb.WriteString(fmt.Sprintf("\t\t%s:%s\n", labelKey, labelValue))
+			sb.WriteString(fmt.Sprintf("\t\t%q:%q\n", labelKey, labelValue))
 		}
 
 		if len(result.Suggestions) > 0 {

pkg/apis/scorecard/v1alpha2/types.go

@@ -23,7 +23,7 @@ type State string
 
 const (
 	// NotRun occurs when a user specifies the --list flag
-	NotRunState State = "not run"
+	NotRunState State = ""
 	// PassState occurs when a Test's ExpectedPoints == MaximumPoints.
 	PassState State = "pass"
 	// FailState occurs when a Test's ExpectedPoints == 0.