internal/pkg/scorecard: implement plugin system

cmd/operator-sdk/scorecard/cmd.go

@@ -44,7 +44,6 @@ func NewCmd() *cobra.Command {
 	scorecardCmd.Flags().String(scorecard.CSVPathOpt, "", "Path to CSV being tested")
 	scorecardCmd.Flags().Bool(scorecard.BasicTestsOpt, true, "Enable basic operator checks")
 	scorecardCmd.Flags().Bool(scorecard.OLMTestsOpt, true, "Enable OLM integration checks")
-	scorecardCmd.Flags().Bool(scorecard.TenantTestsOpt, false, "Enable good tenant checks")
 	scorecardCmd.Flags().String(scorecard.NamespacedManifestOpt, "", "Path to manifest for namespaced resources (e.g. RBAC and Operator manifest)")
 	scorecardCmd.Flags().String(scorecard.GlobalManifestOpt, "", "Path to manifest for Global resources (e.g. CRD manifests)")
 	scorecardCmd.Flags().StringSlice(scorecard.CRManifestOpt, nil, "Path to manifest for Custom Resource (required) (specify flag multiple times for multiple CRs)")
@@ -53,6 +52,7 @@ func NewCmd() *cobra.Command {
 	scorecardCmd.Flags().String(scorecard.CRDsDirOpt, scaffold.CRDsDir, "Directory containing CRDs (all CRD manifest filenames must have the suffix 'crd.yaml')")
 	scorecardCmd.Flags().StringP(scorecard.OutputFormatOpt, "o", "human-readable", "Output format for results. Valid values: human-readable, json")
 	scorecardCmd.Flags().Bool(scorecard.VerboseOpt, false, "Enable verbose logging")
+	scorecardCmd.Flags().String(scorecard.PluginDirOpt, "scorecard", "Scorecard plugin directory (plugin exectuables must be in a \"bin\" subdirectory")
 
 	if err := viper.BindPFlags(scorecardCmd.Flags()); err != nil {
 		log.Fatalf("Failed to bind scorecard flags to viper: %v", err)

hack/tests/scorecard-subcommand.sh

@@ -20,7 +20,7 @@ commandoutput="$(operator-sdk scorecard \
   --proxy-image "$DEST_IMAGE" \
   --proxy-pull-policy Never \
   2>&1)"
-echo $commandoutput | grep "Total Score: 82%"
+echo $commandoutput | grep "Total Score: 79%"
 
 # test config file
 commandoutput2="$(operator-sdk scorecard \
@@ -30,4 +30,6 @@ commandoutput2="$(operator-sdk scorecard \
 echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 3,[[:space:]]"partialPass": 0,[[:space:]]"fail": 0,[[:space:]]"totalTests": 3,[[:space:]]"totalScorePercent": 100,.*$'
 # check olm suite
 echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 2,[[:space:]]"partialPass": 2,[[:space:]]"fail": 1,[[:space:]]"totalTests": 5,[[:space:]]"totalScorePercent": 65,.*$'
+# check custom json result
+echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 1,[[:space:]]"partialPass": 1,[[:space:]]"fail": 0,[[:space:]]"totalTests": 2,[[:space:]]"totalScorePercent": 71,.*$'
 popd

internal/pkg/scorecard/helpers.go

@@ -83,19 +83,7 @@ func ResultsCumulative(results []TestResult) (TestResult, error) {
 func CalculateResult(tests []scapiv1alpha1.ScorecardTestResult) scapiv1alpha1.ScorecardSuiteResult {
 	scorecardSuiteResult := scapiv1alpha1.ScorecardSuiteResult{}
 	scorecardSuiteResult.Tests = tests
-	for _, test := range scorecardSuiteResult.Tests {
-		scorecardSuiteResult.TotalTests++
-		switch test.State {
-		case scapiv1alpha1.ErrorState:
-			scorecardSuiteResult.Error++
-		case scapiv1alpha1.PassState:
-			scorecardSuiteResult.Pass++
-		case scapiv1alpha1.PartialPassState:
-			scorecardSuiteResult.PartialPass++
-		case scapiv1alpha1.FailState:
-			scorecardSuiteResult.Fail++
-		}
-	}
+	scorecardSuiteResult = UpdateSuiteStates(scorecardSuiteResult)
 	return scorecardSuiteResult
 }
 
@@ -147,7 +135,7 @@ func TestResultToScorecardTestResult(tr TestResult) scapiv1alpha1.ScorecardTestR
 }
 
 // UpdateState updates the state of a TestResult.
-func UpdateState(res TestResult) TestResult {
+func UpdateState(res scapiv1alpha1.ScorecardTestResult) scapiv1alpha1.ScorecardTestResult {
 	if res.State == scapiv1alpha1.ErrorState {
 		return res
 	}
@@ -161,3 +149,41 @@ func UpdateState(res TestResult) TestResult {
 	return res
 	// TODO: decide what to do if a Test incorrectly sets points (Earned > Max)
 }
+
+// UpdateSuiteStates update the state of each test in a suite and updates the count to the suite's states to match
+func UpdateSuiteStates(suite scapiv1alpha1.ScorecardSuiteResult) scapiv1alpha1.ScorecardSuiteResult {
+	suite.TotalTests = len(suite.Tests)
+	// reset all state values
+	suite.Error = 0
+	suite.Fail = 0
+	suite.PartialPass = 0
+	suite.Pass = 0
+	for idx, test := range suite.Tests {
+		suite.Tests[idx] = UpdateState(test)
+		switch test.State {
+		case scapiv1alpha1.ErrorState:
+			suite.Error++
+		case scapiv1alpha1.PassState:
+			suite.Pass++
+		case scapiv1alpha1.PartialPassState:
+			suite.PartialPass++
+		case scapiv1alpha1.FailState:
+			suite.Fail++
+		}
+	}
+	return suite
+}
+
+func CombineScorecardOutput(outputs []scapiv1alpha1.ScorecardOutput, log string) scapiv1alpha1.ScorecardOutput {
+	output := scapiv1alpha1.ScorecardOutput{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ScorecardOutput",
+			APIVersion: "osdk.scorecard.com/v1alpha1",
+		},
+		Log: log,
+	}
+	for _, item := range outputs {
+		output.Results = append(output.Results, item.Results...)
+	}
+	return output
+}

internal/pkg/scorecard/scorecard.go

@@ -23,11 +23,13 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
+	scapiv1alpha1 "github.com/operator-framework/operator-sdk/pkg/apis/scorecard/v1alpha1"
 
 	"github.com/ghodss/yaml"
 	olmapiv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
@@ -58,7 +60,6 @@ const (
 	CSVPathOpt            = "csv-path"
 	BasicTestsOpt         = "basic-tests"
 	OLMTestsOpt           = "olm-tests"
-	TenantTestsOpt        = "good-tenant-tests"
 	NamespacedManifestOpt = "namespaced-manifest"
 	GlobalManifestOpt     = "global-manifest"
 	CRManifestOpt         = "cr-manifest"
@@ -67,12 +68,12 @@ const (
 	CRDsDirOpt            = "crds-dir"
 	VerboseOpt            = "verbose"
 	OutputFormatOpt       = "output"
+	PluginDirOpt          = "plugin-dir"
 )
 
 const (
 	basicOperator  = "Basic Operator"
 	olmIntegration = "OLM Integration"
-	goodTenant     = "Good Tenant"
 )
 
 var (
@@ -96,7 +97,7 @@ var (
 	log           = logrus.New()
 )
 
-func runTests() ([]TestSuite, error) {
+func runTests() ([]scapiv1alpha1.ScorecardOutput, error) {
 	defer func() {
 		if err := cleanupScorecard(); err != nil {
 			log.Errorf("Failed to cleanup resources: (%v)", err)
@@ -255,8 +256,11 @@ func runTests() ([]TestSuite, error) {
 		dupMap[gvk] = true
 	}
 
+	var pluginResults []scapiv1alpha1.ScorecardOutput
 	var suites []TestSuite
 	for _, cr := range crs {
+		// TODO: Change built-in tests into plugins
+		// Run built-in tests.
 		fmt.Printf("Running for cr: %s\n", cr)
 		if !viper.GetBool(OlmDeployedOpt) {
 			if err := createFromYAMLFile(viper.GetString(GlobalManifestOpt)); err != nil {
@@ -276,8 +280,6 @@ func runTests() ([]TestSuite, error) {
 		if err := waitUntilCRStatusExists(obj); err != nil {
 			return nil, fmt.Errorf("failed waiting to check if CR status exists: %v", err)
 		}
-
-		// Run tests.
 		if viper.GetBool(BasicTestsOpt) {
 			conf := BasicTestConfig{
 				Client:   runtimeClient,
@@ -311,7 +313,63 @@ func runTests() ([]TestSuite, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to merge test suite results: %v", err)
 	}
-	return suites, nil
+	for _, suite := range suites {
+		// convert to ScorecardOutput format
+		// will add log when basic and olm tests are separated into plugins
+		pluginResults = append(pluginResults, TestSuitesToScorecardOutput([]TestSuite{suite}, ""))
+	}
+	// Cleanup built-in test resources before running plugins
+	if err := cleanupScorecard(); err != nil {
+		log.Errorf("Failed to cleanup resources: (%v)", err)
+	}
+	// Run plugins
+	pluginDir := viper.GetString(PluginDirOpt)
+	if dir, err := os.Stat(pluginDir); err != nil || !dir.IsDir() {
+		log.Warnf("Plugin directory not found; skipping plugin tests")
+	} else {
+		if err := os.Chdir(pluginDir); err != nil {
+			return nil, fmt.Errorf("failed to chdir into scorecard plugin directory")
+		}
+		// executable files must be in "bin" subdirectory
+		files, err := ioutil.ReadDir("bin")
+		if err != nil {
+			return nil, fmt.Errorf("failed to list files in %s/bin", pluginDir)
+		}
+		for _, file := range files {
+			cmd := exec.Command("bash", "-c", "./bin/"+file.Name())
+			output, err := cmd.CombinedOutput()
+			if err != nil {
+				failedPlugin := scapiv1alpha1.ScorecardOutput{}
+				failedResult := scapiv1alpha1.ScorecardSuiteResult{}
+				failedResult.Name = fmt.Sprintf("Failed Plugin: %s", file.Name())
+				failedResult.Description = fmt.Sprintf("Plugin with file name %s", file.Name())
+				failedResult.Error = 1
+				failedResult.Log = string(output)
+				failedPlugin.Results = append(failedPlugin.Results, failedResult)
+				pluginResults = append(pluginResults, failedPlugin)
+				// output error to main logger as well for human-readable output
+				log.Errorf("Plugin `%s` failed with error (%v)", file.Name(), err)
+				continue
+			}
+			//parse output and add to suites
+			result := scapiv1alpha1.ScorecardOutput{}
+			err = json.Unmarshal(output, &result)
+			if err != nil {
+				failedPlugin := scapiv1alpha1.ScorecardOutput{}
+				failedResult := scapiv1alpha1.ScorecardSuiteResult{}
+				failedResult.Name = fmt.Sprintf("Failed Plugin: %s", file.Name())
+				failedResult.Description = fmt.Sprintf("Plugin with file name `%s` failed", file.Name())
+				failedResult.Error = 1
+				failedResult.Log = string(output)
+				failedPlugin.Results = append(failedPlugin.Results, failedResult)
+				pluginResults = append(pluginResults, failedPlugin)
+				log.Errorf("Output from plugin `%s` failed to unmarshal with error (%v)", file.Name(), err)
+				continue
+			}
+			pluginResults = append(pluginResults, result)
+		}
+	}
+	return pluginResults, nil
 }
 
 func ScorecardTests(cmd *cobra.Command, args []string) error {
@@ -325,42 +383,51 @@ func ScorecardTests(cmd *cobra.Command, args []string) error {
 	if viper.GetBool(VerboseOpt) {
 		log.SetLevel(logrus.DebugLevel)
 	}
-	suites, err := runTests()
+	pluginOutputs, err := runTests()
 	if err != nil {
 		return err
 	}
 	totalScore := 0.0
 	// Update the state for the tests
-	for _, suite := range suites {
-		for idx, res := range suite.TestResults {
-			suite.TestResults[idx] = UpdateState(res)
+	for _, suite := range pluginOutputs {
+		for idx, res := range suite.Results {
+			suite.Results[idx] = UpdateSuiteStates(res)
 		}
 	}
 	if viper.GetString(OutputFormatOpt) == "human-readable" {
-		for _, suite := range suites {
-			fmt.Printf("%s:\n", suite.GetName())
-			for _, result := range suite.TestResults {
-				fmt.Printf("\t%s: %d/%d\n", result.Test.GetName(), result.EarnedPoints, result.MaximumPoints)
+		numSuites := 0
+		for _, plugin := range pluginOutputs {
+			for _, suite := range plugin.Results {
+				fmt.Printf("%s:\n", suite.Name)
+				for _, result := range suite.Tests {
+					fmt.Printf("\t%s: %d/%d\n", result.Name, result.EarnedPoints, result.MaximumPoints)
+				}
+				totalScore += float64(suite.TotalScore)
+				numSuites++
 			}
-			totalScore += float64(suite.TotalScore())
 		}
-		totalScore = totalScore / float64(len(suites))
+		totalScore = totalScore / float64(numSuites)
 		fmt.Printf("\nTotal Score: %.0f%%\n", totalScore)
+		// TODO: We can probably use some helper functions to clean up these quadruple nested loops
 		// Print suggestions
-		for _, suite := range suites {
-			for _, result := range suite.TestResults {
-				for _, suggestion := range result.Suggestions {
-					// 33 is yellow (specifically, the same shade of yellow that logrus uses for warnings)
-					fmt.Printf("\x1b[%dmSUGGESTION:\x1b[0m %s\n", 33, suggestion)
+		for _, plugin := range pluginOutputs {
+			for _, suite := range plugin.Results {
+				for _, result := range suite.Tests {
+					for _, suggestion := range result.Suggestions {
+						// 33 is yellow (specifically, the same shade of yellow that logrus uses for warnings)
+						fmt.Printf("\x1b[%dmSUGGESTION:\x1b[0m %s\n", 33, suggestion)
+					}
 				}
 			}
 		}
 		// Print errors
-		for _, suite := range suites {
-			for _, result := range suite.TestResults {
-				for _, err := range result.Errors {
-					// 31 is red (specifically, the same shade of red that logrus uses for errors)
-					fmt.Printf("\x1b[%dmERROR:\x1b[0m %s\n", 31, err)
+		for _, plugin := range pluginOutputs {
+			for _, suite := range plugin.Results {
+				for _, result := range suite.Tests {
+					for _, err := range result.Errors {
+						// 31 is red (specifically, the same shade of red that logrus uses for errors)
+						fmt.Printf("\x1b[%dmERROR:\x1b[0m %s\n", 31, err)
+					}
 				}
 			}
 		}
@@ -370,7 +437,7 @@ func ScorecardTests(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return fmt.Errorf("failed to read log buffer: %v", err)
 		}
-		scTest := TestSuitesToScorecardOutput(suites, string(log))
+		scTest := CombineScorecardOutput(pluginOutputs, string(log))
 		// Pretty print so users can also read the json output
 		bytes, err := json.MarshalIndent(scTest, "", "  ")
 		if err != nil {

internal/pkg/scorecard/test_definitions.go

@@ -89,8 +89,11 @@ func (ts *TestSuite) TotalScore() (score int) {
 	for _, weight := range ts.Weights {
 		addedWeights += weight
 	}
-	floatScore = floatScore * (100 / addedWeights)
-	return int(floatScore)
+	// protect against divide by zero for failed plugins
+	if addedWeights == 0 {
+		return 0
+	}
+	return int(floatScore * (100 / addedWeights))
 }
 
 // Run runs all Tests in a TestSuite

test/test-framework/scorecard/assets/output.json

@@ -0,0 +1,42 @@
+{
+  "kind": "ScorecardOutput",
+  "apiVersion": "scorecard/v1alpha1",
+  "metadata": {
+    "creationTimestamp": null
+  },
+  "log": "",
+  "results": [
+    {
+      "name": "Custom Scorecard",
+      "description": "Custom operator scorecard tests",
+      "error": 0,
+      "pass": 1,
+      "partialPass": 1,
+      "fail": 0,
+      "totalTests": 2,
+      "totalScorePercent": 71,
+      "tests": [
+        {
+          "state": "partial_pass",
+          "name": "Operator Actions Reflected In Status",
+          "description": "The operator updates the Custom Resources status when the application state is updated",
+          "earnedPoints": 2,
+          "maximumPoints": 3,
+          "suggestions": [
+              "Operator should update status when scaling cluster down"
+          ],
+          "errors": []
+        },
+        {
+          "state": "pass",
+          "name": "Verify health of cluster",
+          "description": "The cluster created by the operator is working properly",
+          "earnedPoints": 1,
+          "maximumPoints": 1,
+          "suggestions": [],
+          "errors": []
+        }
+      ]
+    }
+  ]
+}

test/test-framework/scorecard/bin/print-json.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cat ./assets/output.json