slight refactor of applying selectors when listing

Author: jmccormick2001

internal/scorecard/plugins/basic_tests.go

@@ -24,7 +24,6 @@ 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"
 )
@@ -34,8 +33,6 @@ type BasicTestConfig struct {
 	Client   client.Client
 	CR       *unstructured.Unstructured
 	ProxyPod *v1.Pod
-	Version  string
-	Selector labels.Selector
 }
 
 // Test Defintions
@@ -108,10 +105,6 @@ 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,7 +28,6 @@ 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"
@@ -41,8 +40,6 @@ type OLMTestConfig struct {
 	CSV      *olmapiv1alpha1.ClusterServiceVersion
 	CRDsDir  string
 	ProxyPod *v1.Pod
-	Selector labels.Selector
-	Version  string
 }
 
 // Test Defintions
@@ -169,10 +166,6 @@ 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,10 +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)
@@ -313,10 +314,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)
@@ -354,12 +356,13 @@ func ListInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig) (
 
 	switch pluginType {
 	case BasicOperator:
-		conf := BasicTestConfig{
-			Version:  config.Version,
-			Selector: config.Selector,
-		}
+		conf := BasicTestConfig{}
 		basicTests := NewBasicTestSuite(conf)
 
+		if schelpers.IsV1alpha2(config.Version) {
+			basicTests.ApplySelector(config.Selector)
+		}
+
 		basicTests.TestResults = make([]schelpers.TestResult, 0)
 		for i := 0; i < len(basicTests.Tests); i++ {
 			result := schelpers.TestResult{}
@@ -370,12 +373,13 @@ func ListInternalPlugin(pluginType PluginType, config BasicAndOLMPluginConfig) (
 		}
 		suites = append(suites, *basicTests)
 	case OLMIntegration:
-		conf := OLMTestConfig{
-			Version:  config.Version,
-			Selector: config.Selector,
-		}
+		conf := OLMTestConfig{}
 		olmTests := NewOLMTestSuite(conf)
 
+		if schelpers.IsV1alpha2(config.Version) {
+			olmTests.ApplySelector(config.Selector)
+		}
+
 		olmTests.TestResults = make([]schelpers.TestResult, 0)
 		for i := 0; i < len(olmTests.Tests); i++ {
 			result := schelpers.TestResult{}