extract call to MustParseRules from terraform and kubernetes functions

stelligent · Mar 11, 2018 · e7b6944 · e7b6944
1 parent e683fcc
commit e7b6944
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app.go b/app.go
@@ -98,19 +98,21 @@ func main() {
 
 	exitCode := 0
 
+	ruleSet := MustParseRules(loadTerraformRules(*rulesFilename))
+
 	if *kubernetesFiles {
 		if *searchExpression != "" {
 			kubernetesSearch(flag.Args(), *searchExpression, logger)
 		} else {
-			report := kubernetes(flag.Args(), *rulesFilename, makeTagList(*tags), makeRulesList(*ids), logger)
+			report := kubernetes(flag.Args(), ruleSet, makeTagList(*tags), makeRulesList(*ids), logger)
 			exitCode = printReport(report, *queryExpression)
 		}
 	}
 	if *terraformFiles {
 		if *searchExpression != "" {
 			terraformSearch(flag.Args(), *searchExpression, logger)
 		} else {
-			report := terraform(flag.Args(), *rulesFilename, makeTagList(*tags), makeRulesList(*ids), logger)
+			report := terraform(flag.Args(), ruleSet, makeTagList(*tags), makeRulesList(*ids), logger)
 			exitCode = printReport(report, *queryExpression)
 		}
 	}

diff --git a/kubernetes.go b/kubernetes.go
@@ -91,9 +91,8 @@ func validateKubernetesResources(report *ValidationReport, resources []Kubernete
 	}
 }
 
-func kubernetes(filenames []string, rulesFilename string, tags []string, ruleIds []string, log LoggingFunction) ValidationReport {
+func kubernetes(filenames []string, ruleSet RuleSet, tags []string, ruleIds []string, log LoggingFunction) ValidationReport {
 	var report ValidationReport
-	ruleSet := MustParseRules(loadKubernetesRules(rulesFilename))
 	rules := filterRulesById(ruleSet.Rules, ruleIds)
 	for _, filename := range filenames {
 		if shouldIncludeFile(ruleSet.Files, filename) {

diff --git a/terraform.go b/terraform.go
@@ -122,9 +122,8 @@ func validateTerraformResources(report *ValidationReport, resources []TerraformR
 	}
 }
 
-func terraform(filenames []string, rulesFilename string, tags []string, ruleIds []string, log LoggingFunction) ValidationReport {
+func terraform(filenames []string, ruleSet RuleSet, tags []string, ruleIds []string, log LoggingFunction) ValidationReport {
 	var report ValidationReport
-	ruleSet := MustParseRules(loadTerraformRules(rulesFilename))
 	rules := filterRulesById(ruleSet.Rules, ruleIds)
 	for _, filename := range filenames {
 		if shouldIncludeFile(ruleSet.Files, filename) {