Commit d8ddf06

committed

resolve #22

1 parent 5345947 commit d8ddf06Copy full SHA for d8ddf06

File tree

+27

-7

lines changed

+27

-7

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`_ "github.com/picostack/pico/logger"`
`15`	`15`	`"github.com/picostack/pico/service"`
	`16`	`+ "github.com/picostack/pico/task"`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`var version = "master"`
@@ -38,6 +39,8 @@ this repository has new commits, Pico will automatically reconfigure.`,
`38`	`39`	Usage: "argument `target` specifies Git repository for configuration.",
`39`	`40`	`ArgsUsage: "target",`
`40`	`41`	`Flags: []cli.Flag{`
	`42`	`+ cli.StringFlag{Name: "git-username", EnvVar: "GIT_USERNAME"},`
	`43`	`+ cli.StringFlag{Name: "git-password", EnvVar: "GIT_PASSWORD"},`
`41`	`44`	`cli.StringFlag{Name: "hostname", EnvVar: "HOSTNAME"},`
`42`	`45`	`cli.StringFlag{Name: "directory", EnvVar: "DIRECTORY", Value: "./cache/"},`
`43`	`46`	`cli.BoolFlag{Name: "ssh", EnvVar: "SSH"},`
@@ -68,7 +71,11 @@ this repository has new commits, Pico will automatically reconfigure.`,
`68`	`71`	`zap.L().Debug("initialising service")`
`69`	`72`
`70`	`73`	`svc, err := service.Initialise(service.Config{`
`71`		`- Target: c.Args().First(),`
	`74`	`+ Target: task.Repo{`
	`75`	`+ URL: c.Args().First(),`
	`76`	`+ User: c.String("git-username"),`
	`77`	`+ Pass: c.String("git-password"),`
	`78`	`+ },`
`72`	`79`	`Hostname: hostname,`
`73`	`80`	`Directory: c.String("directory"),`
`74`	`81`	`SSH: c.Bool("ssh"),`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ type GitProvider struct {`
`23`	`23`	`hostname string`
`24`	`24`	`configRepo string`
`25`	`25`	`checkInterval time.Duration`
`26`		`- ssh transport.AuthMethod`
	`26`	`+ authMethod transport.AuthMethod`
`27`	`27`
`28`	`28`	`configWatcher *gitwatch.Session`
`29`	`29`	`}`
`@@ -34,14 +34,14 @@ func New(`
`34`	`34`	`hostname string,`
`35`	`35`	`configRepo string,`
`36`	`36`	`checkInterval time.Duration,`
`37`		`- ssh transport.AuthMethod,`
	`37`	`+ authMethod transport.AuthMethod,`
`38`	`38`	`) *GitProvider {`
`39`	`39`	`return &GitProvider{`
`40`	`40`	`directory: directory,`
`41`	`41`	`hostname: hostname,`
`42`	`42`	`configRepo: configRepo,`
`43`	`43`	`checkInterval: checkInterval,`
`44`		`- ssh: ssh,`
	`44`	`+ authMethod: authMethod,`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`@@ -104,7 +104,7 @@ func (p *GitProvider) watchConfig() (err error) {`
`104`	`104`	`[]gitwatch.Repository{{URL: p.configRepo}},`
`105`	`105`	`p.checkInterval,`
`106`	`106`	`p.directory,`
`107`		`- p.ssh,`
	`107`	`+ p.authMethod,`
`108`	`108`	`false)`
`109`	`109`	`if err != nil {`
`110`	`110`	`return errors.Wrap(err, "failed to watch config target")`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"go.uber.org/zap"`
`13`	`13`	`"golang.org/x/sync/errgroup"`
`14`	`14`	`"gopkg.in/src-d/go-git.v4/plumbing/transport"`
	`15`	`+ "gopkg.in/src-d/go-git.v4/plumbing/transport/http"`
`15`	`16`	`"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"`
`16`	`17`
`17`	`18`	`"github.com/picostack/pico/executor"`
`@@ -25,7 +26,7 @@ import (`
`25`	`26`
`26`	`27`	`// Config specifies static configuration parameters (from CLI or environment)`
`27`	`28`	`type Config struct {`
`28`		`- Target string`
	`29`	`+ Target task.Repo`
`29`	`30`	`Hostname string`
`30`	`31`	`SSH bool`
`31`	`32`	`Directory string`
`@@ -57,6 +58,11 @@ func Initialise(c Config) (app *App, err error) {`
`57`	`58`	`if err != nil {`
`58`	`59`	`return nil, errors.Wrap(err, "failed to set up SSH authentication")`
`59`	`60`	`}`
	`61`	`+ } else if c.Target.User != "" {`
	`62`	`+ authMethod = &http.BasicAuth{`
	`63`	`+ Username: c.Target.User,`
	`64`	`+ Password: c.Target.Pass,`
	`65`	`+ }`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`var secretStore secret.Store`
`@@ -85,7 +91,7 @@ func Initialise(c Config) (app *App, err error) {`
`85`	`91`	`app.reconfigurer = reconfigurer.New(`
`86`	`92`	`c.Directory,`
`87`	`93`	`c.Hostname,`
`88`		`- c.Target,`
	`94`	`+ c.Target.URL,`
`89`	`95`	`c.CheckInterval,`
`90`	`96`	`authMethod,`
`91`	`97`	`)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,13 @@ type ExecutionTask struct {`
`15`	`15`	`Env map[string]string`
`16`	`16`	`}`
`17`	`17`
	`18`	`+// Repo represents a Git repo with credentials`
	`19`	`+type Repo struct {`
	`20`	`+ URL string`
	`21`	`+ User string`
	`22`	`+ Pass string`
	`23`	`+}`
	`24`	`+`
`18`	`25`	`// Targets is just a list of target objects, to implement the Sort interface`
`19`	`26`	`type Targets []Target`
`20`	`27`

Comments

(0)