engine:chore - update to new engine

Signed-off-by: Ian Cardoso <ian.cardoso@zup.com.br>
ZupIT · Jan 13, 2022 · 430fbd5 · 430fbd5
1 parent 1bfe223
commit 430fbd5
Show file tree

Hide file tree

Showing 31 changed files with 2,107 additions and 1,919 deletions.
diff --git a/cmd/app/main.go b/cmd/app/main.go
@@ -85,7 +85,6 @@ horusec start -p="/home/user/projects/my-project"
 	cobra.OnInitialize(func() {
 		engine.SetLogLevel(cfg.LogLevel)
 	})
-
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/ZupIT/horusec-devkit v1.0.21
-	github.com/ZupIT/horusec-engine v0.3.6
+	github.com/ZupIT/horusec-engine v0.3.7-0.20220112184418-f2d0d1a367f5
 	github.com/bmatcuk/doublestar/v4 v4.0.2
 	github.com/briandowns/spinner v1.18.0
 	github.com/docker/docker v20.10.9+incompatible
@@ -52,6 +52,7 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/panjf2000/ants/v2 v2.4.7 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -62,6 +63,7 @@ require (
 	github.com/subosito/gotenv v1.2.0 // indirect
 	golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
 	golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/services/custom_rules/custom_rule.go b/internal/services/custom_rules/custom_rule.go
@@ -151,9 +151,9 @@ func (r ruleIDValidator) Validate(value interface{}) error {
 
 func (r ruleIDValidator) valiteDuplicates(id string, rules []engine.Rule) error {
 	for _, rule := range rules {
-		// Custom rules is converted to text.TextRule, so we only need
-		// to check duplicates in text.TextRule rules.
-		if r, ok := rule.(text.TextRule); ok {
+		//// Custom rules is converted to text.Rule, so we only need
+		//// to check duplicates in text.Rule rules.
+		if r, ok := rule.(*text.Rule); ok {
 			if r.ID == id {
 				return fmt.Errorf("duplicate rule id %s", id)
 			}

diff --git a/internal/services/custom_rules/service.go b/internal/services/custom_rules/service.go
@@ -32,30 +32,30 @@ import (
 // load custom rules from an configuration file.
 type Service struct {
 	config      *config.Config
-	customRules map[languages.Language][]engine.Rule
+	customRules map[languages.Language][]text.Rule
 }
 
 // NewCustomRulesService create a new custom rule service with all rules
 // loaded from configuration file path.
 func NewCustomRulesService(cfg *config.Config) *Service {
 	service := &Service{
 		config: cfg,
-		customRules: map[languages.Language][]engine.Rule{
-			languages.CSharp:     make([]engine.Rule, 0),
-			languages.Dart:       make([]engine.Rule, 0),
-			languages.Java:       make([]engine.Rule, 0),
-			languages.Kotlin:     make([]engine.Rule, 0),
-			languages.Yaml:       make([]engine.Rule, 0),
-			languages.Leaks:      make([]engine.Rule, 0),
-			languages.Javascript: make([]engine.Rule, 0),
-			languages.Nginx:      make([]engine.Rule, 0),
+		customRules: map[languages.Language][]text.Rule{
+			languages.CSharp:     make([]text.Rule, 0),
+			languages.Dart:       make([]text.Rule, 0),
+			languages.Java:       make([]text.Rule, 0),
+			languages.Kotlin:     make([]text.Rule, 0),
+			languages.Yaml:       make([]text.Rule, 0),
+			languages.Leaks:      make([]text.Rule, 0),
+			languages.Javascript: make([]text.Rule, 0),
+			languages.Nginx:      make([]text.Rule, 0),
 		},
 	}
 	return service.loadCustomRules()
 }
 
 // Load implements formatters.CustomRules
-func (s *Service) Load(lang languages.Language) []engine.Rule {
+func (s *Service) Load(lang languages.Language) []text.Rule {
 	return s.customRules[lang]
 }
 
@@ -84,7 +84,7 @@ func (s *Service) validateAndParseCustomRule(rule *CustomRule) {
 	}
 
 	s.customRules[rule.Language] = append(
-		s.customRules[rule.Language], s.parseCustomRuleToTextRule(rule),
+		s.customRules[rule.Language], s.parseCustomRuleToRule(rule),
 	)
 }
 
@@ -102,8 +102,8 @@ func (s *Service) openCustomRulesJSONFile() (customRules []*CustomRule, err erro
 	return customRules, json.Unmarshal(bytes, &customRules)
 }
 
-func (s *Service) parseCustomRuleToTextRule(rule *CustomRule) text.TextRule {
-	return text.TextRule{
+func (s *Service) parseCustomRuleToRule(rule *CustomRule) text.Rule {
+	return text.Rule{
 		Metadata: engine.Metadata{
 			ID:          rule.ID,
 			Name:        rule.Name,