Finish refactoring to use helper

authzed · Aug 29, 2024 · 4ed77bd · 4ed77bd
1 parent c23bbe1
commit 4ed77bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/tools/analyzers/protomarshalcheck/protomarshalcheck.go b/tools/analyzers/protomarshalcheck/protomarshalcheck.go
@@ -7,19 +7,12 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 func Analyzer() *analysis.Analyzer {
 	flagSet := flag.NewFlagSet("protomarshalcheck", flag.ExitOnError)
 	skipPkg := flagSet.String("skip-pkg", "", "package(s) to skip for linting")
@@ -31,7 +24,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skipPkg) > 0 {
-				skipped := sliceMap(strings.Split(*skipPkg, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil
@@ -42,7 +35,7 @@ func Analyzer() *analysis.Analyzer {
 			// Check for a skipped file.
 			skipFilePatterns := make([]string, 0)
 			if len(*skipFiles) > 0 {
-				skipFilePatterns = sliceMap(strings.Split(*skipFiles, ","), strings.TrimSpace)
+				skipFilePatterns = lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 			}
 			for _, pattern := range skipFilePatterns {
 				_, err := regexp.Compile(pattern)

diff --git a/tools/analyzers/zerologmarshalcheck/zerologmarshalcheck.go b/tools/analyzers/zerologmarshalcheck/zerologmarshalcheck.go
@@ -8,19 +8,12 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 func Analyzer() *analysis.Analyzer {
 	flagSet := flag.NewFlagSet("zerologmarshalcheck", flag.ExitOnError)
 	skipPkg := flagSet.String("skip-pkg", "", "package(s) to skip for linting")
@@ -35,7 +28,7 @@ func Analyzer() *analysis.Analyzer {
 
 			// Check for a skipped package.
 			if len(*skipPkg) > 0 {
-				skipped := sliceMap(strings.Split(*skipPkg, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil
@@ -46,7 +39,7 @@ func Analyzer() *analysis.Analyzer {
 			// Check for a skipped file.
 			skipFilePatterns := make([]string, 0)
 			if len(*skipFiles) > 0 {
-				skipFilePatterns = sliceMap(strings.Split(*skipFiles, ","), strings.TrimSpace)
+				skipFilePatterns = lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 			}
 			for _, pattern := range skipFilePatterns {
 				_, err := regexp.Compile(pattern)
@@ -165,8 +158,6 @@ func Analyzer() *analysis.Analyzer {
 				default:
 					return true
 				}
-
-				return false
 			})
 
 			return nil, nil