have single function to load rules

stelligent · Mar 12, 2018 · c105e9c · c105e9c
1 parent b5b6970
commit c105e9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/app.go b/app.go
@@ -116,7 +116,7 @@ func main() {
 
 	exitCode := 0
 
-	ruleSet := MustParseRules(loadTerraformRules(*rulesFilename))
+	ruleSet := MustParseRules(loadRules(*rulesFilename))
 	linter := makeLinter(ruleSet.Type, makeLogger(*verboseLogging))
 	if linter != nil {
 		if *searchExpression != "" {

diff --git a/kubernetes.go b/kubernetes.go
@@ -13,15 +13,6 @@ type KubernetesLinter struct {
 // TODO - is it really necessary to have two types?
 type KubernetesResource = TerraformResource
 
-// TODO duplicates loadTerraformRules
-func loadKubernetesRules(filename string) string {
-	kubernetesRules, err := ioutil.ReadFile(filename)
-	if err != nil {
-		panic(err)
-	}
-	return string(kubernetesRules)
-}
-
 func loadYAML(filename string, log LoggingFunction) []interface{} {
 	content, err := ioutil.ReadFile(filename)
 	if err != nil {

diff --git a/rules.go b/rules.go
@@ -2,8 +2,17 @@ package main
 
 import (
 	"github.com/ghodss/yaml"
+	"io/ioutil"
 )
 
+func loadRules(filename string) string {
+	rules, err := ioutil.ReadFile(filename)
+	if err != nil {
+		panic(err)
+	}
+	return string(rules)
+}
+
 func MustParseRules(rules string) RuleSet {
 	r := RuleSet{}
 	err := yaml.Unmarshal([]byte(rules), &r)

diff --git a/terraform.go b/terraform.go
@@ -76,14 +76,6 @@ func loadTerraformResources(filename string, log LoggingFunction) []TerraformRes
 	return resources
 }
 
-func loadTerraformRules(filename string) string {
-	terraformRules, err := ioutil.ReadFile(filename)
-	if err != nil {
-		panic(err)
-	}
-	return string(terraformRules)
-}
-
 func filterTerraformResourcesByType(resources []TerraformResource, resourceType string) []TerraformResource {
 	if resourceType == "*" {
 		return resources