Add commits author config to config file

config.example.yaml

@@ -22,6 +22,12 @@ git:
     # directory doesn't exist, it will be created and the repository will be
     # cloned into it.
     clone_path: /tmp/grafana-dashboards
+    # Author of the commit created in the puller.
+    commits_author:
+        # Author's name.
+        name: Grafana Dashboard Manager
+        # Author's email.
+        email: grafana-dashboard-manager@company.tld
 
 # Settings to configure the Git webhook. Currently only GitLab webhooks are
 # supported.

src/config/config.go

@@ -22,10 +22,18 @@ type GrafanaSettings struct {
 
 // GitSettings contains the data required to interact with the Git repository.
 type GitSettings struct {
-	URL            string `yaml:"url"`
-	User           string `yaml:"user"`
-	PrivateKeyPath string `yaml:"private_key"`
-	ClonePath      string `yaml:"clone_path"`
+	URL            string              `yaml:"url"`
+	User           string              `yaml:"user"`
+	PrivateKeyPath string              `yaml:"private_key"`
+	ClonePath      string              `yaml:"clone_path"`
+	CommitsAuthor  CommitsAuthorConfig `yaml:"commits_author"`
+}
+
+// CommitsAuthorConfig contains the configuration (name + email address) to use
+// when commiting to Git.
+type CommitsAuthorConfig struct {
+	Name  string `yaml:"name"`
+	Email string `yaml:"email"`
 }
 
 // WebhookSettings contains the data required to setup the GitLab webhook.

src/puller/puller.go

@@ -87,9 +87,7 @@ func PullGrafanaAndCommit(client *grafana.Client, cfg *config.Config) error {
 
 	// Check if there's uncommited changes, and if that's the case, commit them.
 	if !status.IsClean() {
-		if err = commitNewVersions(
-			dbVersions, dv, w, cfg.Git.ClonePath,
-		); err != nil {
+		if err = commitNewVersions(dbVersions, dv, w, cfg); err != nil {
 			return err
 		}
 	}

src/puller/versions.go

@@ -7,6 +7,8 @@ import (
 	"os"
 	"time"
 
+	"config"
+
 	gogit "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
@@ -71,9 +73,9 @@ func writeVersions(
 // file, adding it to the index or creating the commit.
 func commitNewVersions(
 	versions map[string]int, dv map[string]diffVersion, worktree *gogit.Worktree,
-	clonePath string,
+	cfg *config.Config,
 ) (err error) {
-	if err = writeVersions(versions, dv, clonePath); err != nil {
+	if err = writeVersions(versions, dv, cfg.Git.ClonePath); err != nil {
 		return err
 	}
 
@@ -83,8 +85,8 @@ func commitNewVersions(
 
 	_, err = worktree.Commit(getCommitMessage(dv), &gogit.CommitOptions{
 		Author: &object.Signature{
-			Name:  "Grafana Dashboard Manager",
-			Email: "grafana@cozycloud.cc",
+			Name:  cfg.Git.CommitsAuthor.Name,
+			Email: cfg.Git.CommitsAuthor.Email,
 			When:  time.Now(),
 		},
 	})

src/pusher/webhook.go

@@ -30,7 +30,7 @@ func HandlePush(payload interface{}, header webhooks.Header) {
 	var err error
 	for _, commit := range pl.Commits {
 		// We don't want to process commits made by the puller
-		if commit.Author.Email == "grafana@cozycloud.cc" {
+		if commit.Author.Email == cfg.Git.CommitsAuthor.Email {
 			continue
 		}