Merge pull request #153 from antham/enable-gofumpt

Enable gofumpt, upgrade vendors

.github/workflows/build.yml

@@ -14,3 +14,5 @@ permissions:
 jobs:
   call-workflow:
     uses: antham/go-workflow-github-action/.github/workflows/build.yml@master
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.golangci.yaml

@@ -0,0 +1,3 @@
+linters:
+  enable:
+    - gofumpt

chyle/apih/http.go

@@ -2,7 +2,7 @@ package apih
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 )
@@ -29,21 +29,18 @@ func SetHeaders(request *http.Request, headers map[string]string) {
 // SendRequest picks a request and send it with given client
 func SendRequest(client *http.Client, request *http.Request) (int, []byte, error) {
 	response, err := client.Do(request)
-
 	if err != nil {
 		return 0, []byte{}, err
 	}
 
 	defer func() {
 		err = response.Body.Close()
-
 		if err != nil {
 			log.Fatal(err)
 		}
 	}()
 
-	b, err := ioutil.ReadAll(response.Body)
-
+	b, err := io.ReadAll(response.Body)
 	if err != nil {
 		return response.StatusCode, b, errResponse{request, response, b}
 	}

chyle/chyle.go

@@ -22,7 +22,6 @@ var EnableDebugging = false
 // BuildChangelog creates a changelog from defined configuration
 func BuildChangelog(envConfig *envh.EnvTree) error {
 	conf, err := config.Create(envConfig)
-
 	if err != nil {
 		return err
 	}
@@ -32,7 +31,6 @@ func BuildChangelog(envConfig *envh.EnvTree) error {
 	}
 
 	commits, err := git.FetchCommits(conf.GIT.REPOSITORY.PATH, conf.GIT.REFERENCE.FROM, conf.GIT.REFERENCE.TO)
-
 	if err != nil {
 		return err
 	}

chyle/chyle_test.go

@@ -3,7 +3,6 @@ package chyle
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
 	"log"
 	"os"
 	"testing"
@@ -16,7 +15,6 @@ import (
 func TestBuildChangelog(t *testing.T) {
 	restoreEnvs()
 	p, err := os.Getwd()
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -30,8 +28,7 @@ func TestBuildChangelog(t *testing.T) {
 	setenv("CHYLE_EXTRACTORS_MESSAGE_REG", "(.{1,50})")
 	setenv("CHYLE_SENDERS_STDOUT_FORMAT", "json")
 
-	f, err := ioutil.TempFile(p+"/testing-repository", "test")
-
+	f, err := os.CreateTemp(p+"/testing-repository", "test")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -43,7 +40,6 @@ func TestBuildChangelog(t *testing.T) {
 	}()
 
 	config, err := envh.NewEnvTree("CHYLE", "_")
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -57,7 +53,7 @@ func TestBuildChangelog(t *testing.T) {
 
 	assert.NoError(t, err)
 
-	b, err := ioutil.ReadFile(f.Name())
+	b, err := os.ReadFile(f.Name())
 
 	assert.NoError(t, err)
 
@@ -120,7 +116,6 @@ func TestBuildChangelog(t *testing.T) {
 func TestBuildChangelogWithAnErrorFromGitPackage(t *testing.T) {
 	restoreEnvs()
 	p, err := os.Getwd()
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -135,7 +130,6 @@ func TestBuildChangelogWithAnErrorFromGitPackage(t *testing.T) {
 	setenv("CHYLE_SENDERS_STDOUT_FORMAT", "json")
 
 	config, err := envh.NewEnvTree("CHYLE", "_")
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -149,7 +143,6 @@ func TestBuildChangelogWithAnErrorFromGitPackage(t *testing.T) {
 func TestBuildChangelogWithAnErrorFromConfigPackage(t *testing.T) {
 	restoreEnvs()
 	p, err := os.Getwd()
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -160,7 +153,6 @@ func TestBuildChangelogWithAnErrorFromConfigPackage(t *testing.T) {
 	setenv("CHYLE_SENDERS_STDOUT_FORMAT", "whatever")
 
 	config, err := envh.NewEnvTree("CHYLE", "_")
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -174,7 +166,6 @@ func TestBuildChangelogWithAnErrorFromConfigPackage(t *testing.T) {
 func TestBuildChangelogWithDebuggingEnabled(t *testing.T) {
 	restoreEnvs()
 	p, err := os.Getwd()
-
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -190,7 +181,6 @@ func TestBuildChangelogWithDebuggingEnabled(t *testing.T) {
 	setenv("CHYLE_EXTRACTORS_MESSAGE_REG", "(.{1,50})")
 
 	config, err := envh.NewEnvTree("CHYLE", "_")
-
 	if err != nil {
 		log.Fatal(err)
 	}

chyle/config/api_decorator.go

@@ -141,7 +141,6 @@ func (a *apiDecoratorConfigurator) applyCustomValidators(keyChains *[][]string)
 // validateKeys checks key mapping between fields extracted from api and fields added to final struct
 func (a *apiDecoratorConfigurator) validateKeys() error {
 	keys, err := a.config.FindChildrenKeys("CHYLE", "DECORATORS", a.decoratorKey, "KEYS")
-
 	if err != nil {
 		return EnvValidationError{fmt.Sprintf(`define at least one environment variable couple "CHYLE_DECORATORS_%s_KEYS_*_DESTKEY" and "CHYLE_DECORATORS_%s_KEYS_*_FIELD", replace "*" with your own naming`, a.decoratorKey, a.decoratorKey), strings.Join([]string{"CHYLE", "DECORATORS", a.decoratorKey, "KEYS"}, "_")}
 	}

chyle/config/config_test.go

@@ -27,7 +27,6 @@ func saveExistingEnvs() {
 	env := envh.NewEnv()
 
 	envs, err = env.FindEntries(".*")
-
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -46,7 +45,6 @@ func restoreEnvs() {
 
 func setenv(key string, value string) {
 	err := os.Setenv(key, value)
-
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)

chyle/config/extractors.go

@@ -61,7 +61,6 @@ func (e *extractorsConfigurator) setExtractors(config *CHYLE) {
 			DESTKEY string
 			REG     *regexp.Regexp
 		}{
-
 			e.config.FindStringUnsecured("CHYLE", "EXTRACTORS", key, "ORIGKEY"),
 			e.config.FindStringUnsecured("CHYLE", "EXTRACTORS", key, "DESTKEY"),
 			regexp.MustCompile(e.config.FindStringUnsecured("CHYLE", "EXTRACTORS", key, "REG")),

chyle/config/matchers.go

@@ -40,7 +40,6 @@ func (m *matchersConfigurator) isDisabled() bool {
 func (m *matchersConfigurator) validateRegexpMatchers() error {
 	for _, key := range []string{"MESSAGE", "COMMITTER", "AUTHOR"} {
 		_, err := m.config.FindString("CHYLE", "MATCHERS", key)
-
 		if err != nil {
 			continue
 		}
@@ -55,7 +54,6 @@ func (m *matchersConfigurator) validateRegexpMatchers() error {
 
 func (m *matchersConfigurator) validateTypeMatcher() error {
 	_, err := m.config.FindString("CHYLE", "MATCHERS", "TYPE")
-
 	if err != nil {
 		return nil
 	}

chyle/config/primitives.go

@@ -90,7 +90,6 @@ func validateTemplate(fullconfig *envh.EnvTree, keyChain []string) error {
 	val := fullconfig.FindStringUnsecured(keyChain...)
 
 	_, err := tmplh.Parse("test", val)
-
 	if err != nil {
 		return EnvValidationError{fmt.Sprintf(`provide a valid template string for "%s" : "%s", "%s" given`, strings.Join(keyChain, "_"), err.Error(), val), strings.Join(keyChain, "_")}
 	}

chyle/config/shell_decorator.go

@@ -63,5 +63,4 @@ func (s *shellDecoratorConfigurator) setShellConfigs(config *CHYLE) {
 			s.config.FindStringUnsecured("CHYLE", "DECORATORS", "SHELL", key, "DESTKEY"),
 		}
 	}
-
 }

chyle/decorators/decorator.go

@@ -20,7 +20,6 @@ func Decorate(decorators *map[string][]Decorater, changelog *types.Changelog) (*
 
 		for _, decorator := range (*decorators)["datas"] {
 			result, err = decorator.Decorate(&d)
-
 			if err != nil {
 				return nil, err
 			}
@@ -35,7 +34,6 @@ func Decorate(decorators *map[string][]Decorater, changelog *types.Changelog) (*
 
 	for _, decorator := range (*decorators)["metadatas"] {
 		m, err := decorator.Decorate(&metadatas)
-
 		if err != nil {
 			return nil, err
 		}

chyle/decorators/decorator_test.go

@@ -54,7 +54,8 @@ func TestDecorator(t *testing.T) {
 			{
 				"test":        "test2",
 				"jiraIssueId": "ABC-123",
-			}},
+			},
+		},
 		Metadatas: map[string]interface{}{},
 	}
 
@@ -71,7 +72,8 @@ func TestDecorator(t *testing.T) {
 				"test":         "test2",
 				"jiraIssueId":  "ABC-123",
 				"jiraIssueKey": "ABC-123",
-			}},
+			},
+		},
 		Metadatas: map[string]interface{}{},
 	}
 

chyle/decorators/github_issue.go

@@ -36,7 +36,6 @@ func (g githubIssue) Decorate(commitMap *map[string]interface{}) (*map[string]in
 	}
 
 	req, err := http.NewRequest("GET", fmt.Sprintf("https://api.github.com/repos/%s/%s/issues/%d", g.config.CREDENTIALS.OWNER, g.config.REPOSITORY.NAME, ID), nil)
-
 	if err != nil {
 		return commitMap, err
 	}

chyle/decorators/github_issue_test.go

@@ -1,8 +1,8 @@
 package decorators
 
 import (
-	"io/ioutil"
 	"net/http"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -30,7 +30,7 @@ func TestGithubIssue(t *testing.T) {
 
 	defer gock.Off()
 
-	issueResponse, err := ioutil.ReadFile("fixtures/github-issue-fetch-response.json")
+	issueResponse, err := os.ReadFile("fixtures/github-issue-fetch-response.json")
 
 	assert.NoError(t, err, "Must read json fixture file")
 
@@ -62,7 +62,7 @@ func TestGithubIssue(t *testing.T) {
 func TestGithubWithNoGithubIssueIdDefined(t *testing.T) {
 	defer gock.Off()
 
-	issueResponse, err := ioutil.ReadFile("fixtures/github-issue-fetch-response.json")
+	issueResponse, err := os.ReadFile("fixtures/github-issue-fetch-response.json")
 
 	assert.NoError(t, err, "Must read json fixture file")
 

chyle/decorators/jira_issue.go

@@ -42,7 +42,6 @@ func (j jiraIssue) Decorate(commitMap *map[string]interface{}) (*map[string]inte
 	}
 
 	req, err := http.NewRequest("GET", fmt.Sprintf("%s/rest/api/2/issue/%s", j.config.ENDPOINT.URL, ID), nil)
-
 	if err != nil {
 		return commitMap, err
 	}

chyle/git/git.go

@@ -61,7 +61,6 @@ func resolveRef(refCommit string, repository *git.Repository) (*object.Commit, e
 	}
 
 	iter, err := repository.References()
-
 	if err != nil {
 		return &object.Commit{}, errReferenceNotFound{refCommit}
 	}
@@ -90,19 +89,16 @@ func resolveRef(refCommit string, repository *git.Repository) (*object.Commit, e
 // FetchCommits retrieves commits in a reference range
 func FetchCommits(repoPath string, fromRef string, toRef string) (*[]object.Commit, error) {
 	rep, err := git.PlainOpen(repoPath)
-
 	if err != nil {
 		return nil, errRepositoryPath{repoPath}
 	}
 
 	fromCommit, err := resolveRef(fromRef, rep)
-
 	if err != nil {
 		return &[]object.Commit{}, err
 	}
 
 	toCommit, err := resolveRef(toRef, rep)
-
 	if err != nil {
 		return &[]object.Commit{}, err
 	}
@@ -111,7 +107,6 @@ func FetchCommits(repoPath string, fromRef string, toRef string) (*[]object.Comm
 	var commits *[]object.Commit
 
 	exclusionList, err := buildOriginCommitList(fromCommit)
-
 	if err != nil {
 		return nil, err
 	}
@@ -121,7 +116,6 @@ func FetchCommits(repoPath string, fromRef string, toRef string) (*[]object.Comm
 	}
 
 	commits, err = findDiffCommits(toCommit, &exclusionList)
-
 	if err != nil {
 		return nil, err
 	}

chyle/git/git_test.go

@@ -14,19 +14,19 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
-var repo *git.Repository
-var gitRepositoryPath = "testing-repository"
+var (
+	repo              *git.Repository
+	gitRepositoryPath = "testing-repository"
+)
 
 func setup() {
 	path, err := os.Getwd()
-
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
 	repo, err = git.PlainOpen(path + "/" + gitRepositoryPath)
-
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -45,7 +45,6 @@ func getCommitFromRef(ref string) *object.Commit {
 	}
 
 	c, err := repo.CommitObject(plumbing.NewHash(string(ID)))
-
 	if err != nil {
 		logrus.WithField("ID", ID).Fatal(err)
 	}

chyle/matchers/type.go

@@ -10,16 +10,14 @@ const (
 )
 
 // mergeCommit match merge commit message
-type mergeCommit struct {
-}
+type mergeCommit struct{}
 
 func (m mergeCommit) Match(commit *object.Commit) bool {
 	return commit.NumParents() == 2
 }
 
 // regularCommit match regular commit message
-type regularCommit struct {
-}
+type regularCommit struct{}
 
 func (r regularCommit) Match(commit *object.Commit) bool {
 	return commit.NumParents() == 1 || commit.NumParents() == 0

chyle/process.go

@@ -34,7 +34,6 @@ func proceed(process *process, commits *[]object.Commit) error {
 	changelog, err := decorators.Decorate(process.decorators,
 		extractors.Extract(process.extractors,
 			matchers.Filter(process.matchers, commits)))
-
 	if err != nil {
 		return err
 	}