feat(aa-log): improve the regex helper type.

pkg/integration/suite.go

@@ -71,9 +71,7 @@ func (t *TestSuite) Write(path *paths.Path) error {
 		`{{`, `{{ `,
 		`}}`, ` }}`,
 	})
-	for _, aa := range regClean {
+	res = regClean.Replace(res)
-		res = aa.Regex.ReplaceAllLiteralString(res, aa.Repl)
-	}
 	_, err = file.WriteString("---\n" + res)
 	return err
 }

pkg/logs/loggers.go

@@ -51,9 +51,7 @@ func GetApparmorLogs(file io.Reader, profile string) []string {
 
 	// Clean & remove doublon in logs
 	res = util.DecodeHexInString(res)
-	for _, aa := range regCleanLogs {
+	res = regCleanLogs.Replace(res)
-		res = aa.Regex.ReplaceAllLiteralString(res, aa.Repl)
-	}
 	logs := strings.Split(res, "\n")
 	return util.RemoveDuplicate(logs)
 }

pkg/prebuild/directives.go

@@ -184,9 +184,7 @@ func DirectiveStack(file *paths.Path, profile string) string {
 				panic(fmt.Sprintf("No profile found in %s", name))
 			}
 			stackedRules := m[1]
-			for _, aa := range regCleanStakedRules {
+			stackedRules = regCleanStakedRules.Replace(stackedRules)
-				stackedRules = aa.Regex.ReplaceAllLiteralString(stackedRules, aa.Repl)
-			}
 			res += "  # Stacked profile: " + name + "\n" + stackedRules + "\n"
 		}
 

pkg/util/tools.go

@@ -9,6 +9,8 @@ import (
 	"regexp"
 )
 
+type RegexReplList []RegexRepl
+
 type RegexRepl struct {
 	Regex *regexp.Regexp
 	Repl  string
@@ -58,3 +60,10 @@ func ToRegexRepl(in []string) []RegexRepl {
 	}
 	return out
 }
+
+func (rr RegexReplList) Replace(str string) string {
+	for _, aa := range rr {
+		str = aa.Regex.ReplaceAllLiteralString(str, aa.Repl)
+	}
+	return str
+}