extract type validation and reuse it in changelog-pr-body-check

Also: fix linter issues

Author: Dhia Ayachi

cmd/changelog-gen/main.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"github.com/go-git/go-git/v5"
 	"github.com/google/go-github/github"
+	"github.com/hashicorp/go-changelog"
 	"github.com/manifoldco/promptui"
 	"os"
 	"regexp"
@@ -31,12 +32,6 @@ type Note struct {
 	URL string
 }
 
-type GithubCred struct {
-	owner string
-	repo  string
-	token string
-}
-
 func main() {
 	pwd, err := os.Getwd()
 	if err != nil {
@@ -63,19 +58,11 @@ func main() {
 			os.Exit(1)
 		}
 	}
-	typeValues := []string{"enhancement",
-		"feature",
-		"bug",
-		"note",
-		"new-resource",
-		"new-datasource",
-		"deprecation",
-		"breaking-change",
-	}
+
 	if Type == "" {
 		prompt := promptui.Select{
 			Label: "Select a change type",
-			Items: typeValues,
+			Items: changelog.TypeValues,
 		}
 
 		_, Type, err = prompt.Run()
@@ -87,7 +74,7 @@ func main() {
 			os.Exit(1)
 		}
 	} else {
-		if !TypeValid(typeValues, Type) {
+		if !changelog.TypeValid(Type) {
 			fmt.Fprintln(os.Stderr, "Must specify a valid type")
 			fmt.Fprintln(os.Stderr, "")
 			flag.Usage()
@@ -139,15 +126,6 @@ func main() {
 	}
 }
 
-func TypeValid(elements []string, Type string) bool {
-	for _, a := range elements {
-		if a == Type {
-			return true
-		}
-	}
-	return false
-}
-
 func OpenGit(path string) (*git.Repository, error) {
 	r, err := git.PlainOpen(path)
 	if err != nil {
@@ -190,7 +168,7 @@ func getPrNumberFromGithub(path string) (int, string, error) {
 	}
 	repoUrl := rem.Config().URLs[0]
 
-	reg := regexp.MustCompile(".*github\\.com:(.*)/(.*)\\.git")
+	reg := regexp.MustCompile(`.*github\\.com:(.*)/(.*)\\.git`)
 	m := reg.FindAllStringSubmatch(repoUrl, -1)
 	if len(m) > 1 {
 		if len(m[0]) < 2 {

cmd/changelog-pr-body-check/main.go

@@ -74,17 +74,7 @@ func main() {
 	}
 	var unknownTypes []string
 	for _, note := range notes {
-		switch note.Type {
-		case "none",
-			"bug",
-			"note",
-			"enhancement",
-			"new-resource",
-			"new-datasource",
-			"deprecation",
-			"breaking-change",
-			"feature":
-		default:
+		if !changelog.TypeValid(note.Type) {
 			unknownTypes = append(unknownTypes, note.Type)
 		}
 	}

entry.go

@@ -11,6 +11,16 @@ import (
 	"github.com/go-git/go-git/v5/storage/memory"
 )
 
+var TypeValues = []string{"enhancement",
+	"feature",
+	"bug",
+	"note",
+	"new-resource",
+	"new-datasource",
+	"deprecation",
+	"breaking-change",
+}
+
 type Entry struct {
 	Issue string
 	Body  string
@@ -42,6 +52,9 @@ func Diff(repo, ref1, ref2, dir string) ([]Entry, error) {
 		Hash:  *rev2,
 		Force: true,
 	})
+	if err != nil {
+		return nil, err
+	}
 	entriesAfterFI, err := wt.Filesystem.ReadDir(dir)
 	if err != nil {
 		return nil, err
@@ -64,6 +77,9 @@ func Diff(repo, ref1, ref2, dir string) ([]Entry, error) {
 			Hash:  *rev1,
 			Force: true,
 		})
+		if err != nil {
+			return nil, err
+		}
 		entriesBeforeFI, err := wt.Filesystem.ReadDir(dir)
 		if err != nil {
 			return nil, err
@@ -84,3 +100,12 @@ func Diff(repo, ref1, ref2, dir string) ([]Entry, error) {
 	})
 	return entries, nil
 }
+
+func TypeValid(Type string) bool {
+	for _, a := range TypeValues {
+		if a == Type {
+			return true
+		}
+	}
+	return false
+}