chore: adds --include-files flag.

cmd/porto/main.go

@@ -18,6 +18,7 @@ func main() {
 	flagSkipDirs := flag.String("skip-dirs", "", "Regexps of directories to skip")
 	flagSkipDefaultDirs := flag.Bool("skip-dirs-use-default", true, "use default skip directory list")
 	flagIncludeInternal := flag.Bool("include-internal", false, "include internal folders")
+	flagIncludeFiles := flag.String("include-files", "", "Regexps of files to include")
 	flag.Parse()
 
 	baseDir := flag.Arg(0)
@@ -32,6 +33,7 @@ Options:
 --skip-dirs              Regexps of directories to skip
 --skip-dirs-use-default  Use default skip directory list (default: true)
 --include-internal       Include internal folders
+--include-files          Regexps of files to include. It takes precedence over --skip-files
 
 Examples:
 
@@ -53,7 +55,12 @@ Add import path to a folder
 
 	skipFilesRegex, err := porto.GetRegexpList(*flagSkipFiles)
 	if err != nil {
-		log.Fatalf("failed to build files regexes: %v", err)
+		log.Fatalf("failed to build files regexes to exclude: %v", err)
+	}
+
+	includeFilesRegex, err := porto.GetRegexpList(*flagIncludeFiles)
+	if err != nil {
+		log.Fatalf("failed to build files regexes to include: %v", err)
 	}
 
 	var skipDirsRegex []*regexp.Regexp
@@ -67,11 +74,12 @@ Add import path to a folder
 	skipDirsRegex = append(skipDirsRegex, userSkipDirsRegex...)
 
 	diffCount, err := porto.FindAndAddVanityImportForDir(workingDir, baseAbsDir, porto.Options{
-		WriteResultToFile: *flagWriteOutputToFile,
-		ListDiffFiles:     *flagListDiff,
-		SkipFilesRegexes:  skipFilesRegex,
-		SkipDirsRegexes:   skipDirsRegex,
-		IncludeInternal:   *flagIncludeInternal,
+		WriteResultToFile:   *flagWriteOutputToFile,
+		ListDiffFiles:       *flagListDiff,
+		SkipFilesRegexes:    skipFilesRegex,
+		SkipDirsRegexes:     skipDirsRegex,
+		IncludeInternal:     *flagIncludeInternal,
+		IncludeFilesRegexes: includeFilesRegex,
 	})
 	if err != nil {
 		log.Fatal(err)

import.go

@@ -7,7 +7,7 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -56,7 +56,7 @@ func addImportPath(absFilepath string, module string) (bool, []byte, error) {
 		return false, nil, errGenerated
 	}
 
-	content, err := ioutil.ReadFile(absFilepath)
+	content, err := os.ReadFile(absFilepath)
 	if err != nil {
 		return false, nil, fmt.Errorf("failed to parse the file %q: %v", absFilepath, err)
 	}
@@ -99,7 +99,7 @@ func findAndAddVanityImportForModuleDir(workingDir, absDir string, moduleName st
 		return 0, nil
 	}
 
-	files, err := ioutil.ReadDir(absDir)
+	files, err := os.ReadDir(absDir)
 	if err != nil {
 		return 0, fmt.Errorf("failed to read the content of %q: %v", absDir, err)
 	}
@@ -127,7 +127,7 @@ func findAndAddVanityImportForModuleDir(workingDir, absDir string, moduleName st
 			}
 
 			gc += c
-		} else if fileName := f.Name(); isGoFile(fileName) && !isGoTestFile(fileName) && !matchesAny(opts.SkipFilesRegexes, fileName) {
+		} else if fileName := f.Name(); isGoFile(fileName) && !isGoTestFile(fileName) && matchesAny(opts.IncludeFilesRegexes, fileName) && !matchesAny(opts.SkipFilesRegexes, fileName) {
 			absFilepath := absDir + pathSeparator + fileName
 
 			hasChanged, newContent, err := addImportPath(absDir+pathSeparator+fileName, moduleName)
@@ -181,7 +181,7 @@ func matchesAny(regexes []*regexp.Regexp, str string) bool {
 }
 
 func findAndAddVanityImportForNonModuleDir(workingDir, absDir string, opts Options) (int, error) {
-	files, err := ioutil.ReadDir(absDir)
+	files, err := os.ReadDir(absDir)
 	if err != nil {
 		return 0, fmt.Errorf("failed to read %q: %v", absDir, err)
 	}
@@ -231,6 +231,8 @@ type Options struct {
 	SkipDirsRegexes []*regexp.Regexp
 	// Include internal packages
 	IncludeInternal bool
+	// Set of regex for matching files to be included
+	IncludeFilesRegexes []*regexp.Regexp
 }
 
 // FindAndAddVanityImportForDir scans all files in a folder and based on go.mod files
@@ -240,7 +242,7 @@ func FindAndAddVanityImportForDir(workingDir, absDir string, opts Options) (int,
 		return findAndAddVanityImportForModuleDir(workingDir, absDir, moduleName, opts)
 	}
 
-	files, err := ioutil.ReadDir(absDir)
+	files, err := os.ReadDir(absDir)
 	if err != nil {
 		return 0, fmt.Errorf("failed to read the content of %q: %v", absDir, err)
 	}