resolve #22

Author: Southclaws

main.go

@@ -13,6 +13,7 @@ import (
 
 	_ "github.com/picostack/pico/logger"
 	"github.com/picostack/pico/service"
+	"github.com/picostack/pico/task"
 )
 
 var version = "master"
@@ -38,6 +39,8 @@ this repository has new commits, Pico will automatically reconfigure.`,
 			Usage:     "argument `target` specifies Git repository for configuration.",
 			ArgsUsage: "target",
 			Flags: []cli.Flag{
+				cli.StringFlag{Name: "git-username", EnvVar: "GIT_USERNAME"},
+				cli.StringFlag{Name: "git-password", EnvVar: "GIT_PASSWORD"},
 				cli.StringFlag{Name: "hostname", EnvVar: "HOSTNAME"},
 				cli.StringFlag{Name: "directory", EnvVar: "DIRECTORY", Value: "./cache/"},
 				cli.BoolFlag{Name: "ssh", EnvVar: "SSH"},
@@ -68,7 +71,11 @@ this repository has new commits, Pico will automatically reconfigure.`,
 				zap.L().Debug("initialising service")
 
 				svc, err := service.Initialise(service.Config{
-					Target:        c.Args().First(),
+					Target: task.Repo{
+						URL:  c.Args().First(),
+						User: c.String("git-username"),
+						Pass: c.String("git-password"),
+					},
 					Hostname:      hostname,
 					Directory:     c.String("directory"),
 					SSH:           c.Bool("ssh"),

reconfigurer/git.go

@@ -23,7 +23,7 @@ type GitProvider struct {
 	hostname      string
 	configRepo    string
 	checkInterval time.Duration
-	ssh           transport.AuthMethod
+	authMethod    transport.AuthMethod
 
 	configWatcher *gitwatch.Session
 }
@@ -34,14 +34,14 @@ func New(
 	hostname string,
 	configRepo string,
 	checkInterval time.Duration,
-	ssh transport.AuthMethod,
+	authMethod transport.AuthMethod,
 ) *GitProvider {
 	return &GitProvider{
 		directory:     directory,
 		hostname:      hostname,
 		configRepo:    configRepo,
 		checkInterval: checkInterval,
-		ssh:           ssh,
+		authMethod:    authMethod,
 	}
 }
 
@@ -104,7 +104,7 @@ func (p *GitProvider) watchConfig() (err error) {
 		[]gitwatch.Repository{{URL: p.configRepo}},
 		p.checkInterval,
 		p.directory,
-		p.ssh,
+		p.authMethod,
 		false)
 	if err != nil {
 		return errors.Wrap(err, "failed to watch config target")

service/service.go

@@ -12,6 +12,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
+	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
 
 	"github.com/picostack/pico/executor"
@@ -25,7 +26,7 @@ import (
 
 // Config specifies static configuration parameters (from CLI or environment)
 type Config struct {
-	Target        string
+	Target        task.Repo
 	Hostname      string
 	SSH           bool
 	Directory     string
@@ -57,6 +58,11 @@ func Initialise(c Config) (app *App, err error) {
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to set up SSH authentication")
 		}
+	} else if c.Target.User != "" {
+		authMethod = &http.BasicAuth{
+			Username: c.Target.User,
+			Password: c.Target.Pass,
+		}
 	}
 
 	var secretStore secret.Store
@@ -85,7 +91,7 @@ func Initialise(c Config) (app *App, err error) {
 	app.reconfigurer = reconfigurer.New(
 		c.Directory,
 		c.Hostname,
-		c.Target,
+		c.Target.URL,
 		c.CheckInterval,
 		authMethod,
 	)

task/target.go

@@ -15,6 +15,13 @@ type ExecutionTask struct {
 	Env      map[string]string
 }
 
+// Repo represents a Git repo with credentials
+type Repo struct {
+	URL  string
+	User string
+	Pass string
+}
+
 // Targets is just a list of target objects, to implement the Sort interface
 type Targets []Target