Move generated files list out of .go and into .txt

Author: eparis

mungegithub/Dockerfile

@@ -19,6 +19,7 @@ RUN apt-get install -y -qq ca-certificates
 ADD mungegithub /mungegithub
 ADD blunderbuss.yml /blunderbuss.yml
 ADD path-label.txt /path-label.txt
+ADD generated-files.txt /generated-files.txt
 ADD run.sh /run.sh
 RUN chmod a+x /run.sh
 CMD /run.sh

mungegithub/generated-files.txt

@@ -0,0 +1,20 @@
+# File is of the format [TYPE] [NAME]
+# Where type can be path, prefix, or paths-from-repo
+#
+# Files which match these things will not be counted when determining
+# the size of a given PR
+
+path		pkg/api/v1/deep_copy_generated.go
+path		pkg/api/deep_copy_generated.go
+path		pkg/expapi/v1/deep_copy_generated.go
+path		pkg/expapi/deep_copy_generated.go
+path		pkg/api/v1/conversion_generated.go
+path		pkg/expapi/v1/conversion_generated.go
+path		api/swagger-spec/resourceListing.json
+path		api/swagger-spec/version.json
+path		api/swagger-spec/api.json
+path		api/swagger-spec/v1.json
+
+prefix		Godeps/
+
+paths-from-repo .generated_docs

mungegithub/pulls/size.go

@@ -17,7 +17,9 @@ limitations under the License.
 package pulls
 
 import (
+	"bufio"
 	"fmt"
+	"os"
 	"strings"
 
 	github_util "k8s.io/contrib/github"
@@ -30,7 +32,9 @@ import (
 )
 
 type PRSizeMunger struct {
-	genFiles *sets.String
+	generatedFilesFile string
+	genFiles           *sets.String
+	genPrefixes        *[]string
 }
 
 func init() {
@@ -39,7 +43,9 @@ func init() {
 
 func (PRSizeMunger) Name() string { return "size" }
 
-func (PRSizeMunger) AddFlags(cmd *cobra.Command) {}
+func (p *PRSizeMunger) AddFlags(cmd *cobra.Command) {
+	cmd.Flags().StringVar(&p.generatedFilesFile, "generated-files-config", "generated-files.txt", "file containing the pathname to label mappings")
+}
 
 const labelSizePrefix = "size/"
 
@@ -51,34 +57,70 @@ const labelSizePrefix = "size/"
 // our results are slightly wrong, who cares? Instead look for the
 // generated files once and if someone changed what files are generated
 // we'll size slightly wrong. No biggie.
-func (s *PRSizeMunger) getGeneratedFiles(config *config.MungeConfig) sets.String {
+func (s *PRSizeMunger) getGeneratedFiles(config *config.MungeConfig) {
 	if s.genFiles != nil {
-		return *s.genFiles
+		return
 	}
 	files := sets.NewString()
-	files.Insert("pkg/api/v1/deep_copy_generated.go")
-	files.Insert("pkg/api/deep_copy_generated.go")
-	files.Insert("pkg/expapi/v1/deep_copy_generated.go")
-	files.Insert("pkg/expapi/deep_copy_generated.go")
-	files.Insert("pkg/api/v1/conversion_generated.go")
-	files.Insert("pkg/expapi/v1/conversion_generated.go")
-	files.Insert("api/swagger-spec/resourceListing.json")
-	files.Insert("api/swagger-spec/version.json")
-	files.Insert("api/swagger-spec/api.json")
-	files.Insert("api/swagger-spec/v1.json")
-	docs, err := config.GetFileContents(".generated_docs", "")
+	prefixes := []string{}
+	s.genFiles = &files
+	s.genPrefixes = &prefixes
+
+	file := s.generatedFilesFile
+	if len(file) == 0 {
+		glog.Infof("No --generated-files-config= supplied, applying no labels")
+		return
+	}
+	fp, err := os.Open(file)
 	if err != nil {
-		docs = ""
+		glog.Errorf("Unable to open %q: %v", file, err)
+		return
 	}
-	docSlice := strings.Split(docs, "\n")
-	files.Insert(docSlice...)
 
+	defer fp.Close()
+	scanner := bufio.NewScanner(fp)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(line, "#") || line == "" {
+			continue
+		}
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			glog.Errorf("Invalid line in generated docs config %s: %q", file, line)
+			continue
+		}
+		eType := fields[0]
+		file := fields[1]
+		if eType == "prefix" {
+			prefixes = append(prefixes, file)
+		} else if eType == "path" {
+			files.Insert(file)
+		} else if eType == "paths-from-repo" {
+			docs, err := config.GetFileContents(file, "")
+			if err != nil {
+				continue
+			}
+			docSlice := strings.Split(docs, "\n")
+			files.Insert(docSlice...)
+		} else {
+			glog.Errorf("Invalid line in generated docs config, unknown type: %s, %q", eType, line)
+			continue
+		}
+	}
+	if scanner.Err() != nil {
+		glog.Errorf("Error scanning %s: %v", file, err)
+		return
+	}
 	s.genFiles = &files
-	return *s.genFiles
+	s.genPrefixes = &prefixes
+
+	return
 }
 
 func (s *PRSizeMunger) MungePullRequest(config *config.MungeConfig, pr *github.PullRequest, issue *github.Issue, commits []github.RepositoryCommit, events []github.IssueEvent) {
-	genFiles := s.getGeneratedFiles(config)
+	s.getGeneratedFiles(config)
+	genFiles := *s.genFiles
+	genPrefixes := *s.genPrefixes
 
 	if pr.Additions == nil {
 		glog.Warningf("PR %d has nil Additions", *pr.Number)
@@ -93,10 +135,12 @@ func (s *PRSizeMunger) MungePullRequest(config *config.MungeConfig, pr *github.P
 
 	for _, c := range commits {
 		for _, f := range c.Files {
-			if strings.HasPrefix(*f.Filename, "Godeps/") {
-				adds = adds - *f.Additions
-				dels = dels - *f.Deletions
-				continue
+			for _, p := range genPrefixes {
+				if strings.HasPrefix(*f.Filename, p) {
+					adds = adds - *f.Additions
+					dels = dels - *f.Deletions
+					continue
+				}
 			}
 			if genFiles.Has(*f.Filename) {
 				adds = adds - *f.Additions