Use the Git user specified in the config file

src/git/git.go

@@ -5,33 +5,34 @@ import (
 	"os"
 	"strings"
 
-	gogit "gopkg.in/src-d/go-git.v4"
+	"config"
 
 	"golang.org/x/crypto/ssh"
+	gogit "gopkg.in/src-d/go-git.v4"
 	gitssh "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
 )
 
-func Sync(repo string, clonePath string, privateKeyPath string) (r *gogit.Repository, err error) {
-	auth, err := getAuth(privateKeyPath)
+func Sync(cfg config.GitSettings) (r *gogit.Repository, err error) {
+	auth, err := getAuth(cfg.User, cfg.PrivateKeyPath)
 	if err != nil {
 		return
 	}
 
-	exists, err := dirExists(clonePath)
+	exists, err := dirExists(cfg.ClonePath)
 	if err != nil {
 		return
 	}
 
 	if exists {
-		r, err = pull(clonePath, auth)
+		r, err = pull(cfg.ClonePath, auth)
 	} else {
-		r, err = clone(repo, clonePath, auth)
+		r, err = clone(cfg.URL, cfg.ClonePath, auth)
 	}
 
 	return
 }
 
-func getAuth(privateKeyPath string) (*gitssh.PublicKeys, error) {
+func getAuth(user string, privateKeyPath string) (*gitssh.PublicKeys, error) {
 	privateKey, err := ioutil.ReadFile(privateKeyPath)
 	if err != nil {
 		return nil, err
@@ -91,8 +92,8 @@ func dirExists(path string) (bool, error) {
 	return true, err
 }
 
-func Push(r *gogit.Repository, keyPath string) error {
-	auth, err := getAuth(keyPath)
+func Push(r *gogit.Repository, cfg config.GitSettings) error {
+	auth, err := getAuth(cfg.User, cfg.PrivateKeyPath)
 	if err != nil {
 		return err
 	}

src/puller/puller.go

@@ -24,7 +24,7 @@ type diffVersion struct {
 // already versionned in the repo
 func PullGrafanaAndCommit(client *grafana.Client, cfg *config.Config) error {
 	// Clone or pull the repo
-	repo, err := git.Sync(cfg.Git.URL, cfg.Git.ClonePath, cfg.Git.PrivateKeyPath)
+	repo, err := git.Sync(cfg.Git)
 	if err != nil {
 		return err
 	}
@@ -94,7 +94,7 @@ func PullGrafanaAndCommit(client *grafana.Client, cfg *config.Config) error {
 
 	// Push the changes (we don't do it in the if clause above in case there are
 	// pending commits in the local repo that haven't been pushed yet).
-	if err = git.Push(repo, cfg.Git.PrivateKeyPath); err != nil {
+	if err = git.Push(repo, cfg.Git); err != nil {
 		return err
 	}
 

src/pusher/webhook.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"config"
+	"git"
 	puller "puller"
 
 	"gopkg.in/go-playground/webhooks.v3"
@@ -25,9 +26,14 @@ func SetupWebhook(cfg *config.Config) error {
 }
 
 func HandlePush(payload interface{}, header webhooks.Header) {
+	var err error
+
 	pl := payload.(gitlab.PushEventPayload)
 
-	var err error
+	if _, err = git.Sync(cfg.Git); err != nil {
+		panic(err)
+	}
+
 	for _, commit := range pl.Commits {
 		// We don't want to process commits made by the puller
 		if commit.Author.Email == cfg.Git.CommitsAuthor.Email {