change resolveCheck signature

FairwindsOps · Jan 14, 2020 · 5426948 · 5426948
1 parent e6a44c6
commit 5426948
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/validator/schema.go b/pkg/validator/schema.go
@@ -73,18 +73,18 @@ func parseCheck(rawBytes []byte) (config.SchemaCheck, error) {
 	}
 }
 
-func resolveCheck(conf *config.Configuration, checkID string, controllerName string, controllerKind config.SupportedController, target config.TargetKind, isInitContainer bool) (*config.SchemaCheck, error) {
+func resolveCheck(conf *config.Configuration, checkID string, controller controllers.Interface, target config.TargetKind, isInitContainer bool) (*config.SchemaCheck, error) {
 	check, ok := conf.CustomChecks[checkID]
 	if !ok {
 		check, ok = builtInChecks[checkID]
 	}
 	if !ok {
 		return nil, fmt.Errorf("Check %s not found", checkID)
 	}
-	if !conf.IsActionable(check.ID, controllerName) {
+	if !conf.IsActionable(check.ID, controller.GetName()) {
 		return nil, nil
 	}
-	if !check.IsActionable(target, controllerKind, isInitContainer) {
+	if !check.IsActionable(target, controller.GetKind(), isInitContainer) {
 		return nil, nil
 	}
 	return &check, nil
@@ -109,7 +109,7 @@ func applyPodSchemaChecks(conf *config.Configuration, controller controllers.Int
 	results := ResultSet{}
 	checkIDs := getSortedKeys(conf.Checks)
 	for _, checkID := range checkIDs {
-		check, err := resolveCheck(conf, checkID, controller.GetName(), controller.GetKind(), config.TargetPod, false)
+		check, err := resolveCheck(conf, checkID, controller, config.TargetPod, false)
 		if err != nil {
 			return nil, err
 		}
@@ -131,7 +131,7 @@ func applyContainerSchemaChecks(conf *config.Configuration, controller controlle
 	results := ResultSet{}
 	checkIDs := getSortedKeys(conf.Checks)
 	for _, checkID := range checkIDs {
-		check, err := resolveCheck(conf, checkID, controller.GetName(), controller.GetKind(), config.TargetContainer, isInit)
+		check, err := resolveCheck(conf, checkID, controller, config.TargetContainer, isInit)
 		if err != nil {
 			return nil, err
 		} else if check == nil {