Merge pull request #2386 from hashicorp/f-go-getter

Update go-getter and add support for git and hg
hashicorp · Mar 1, 2017 · 5ff4bc7 · 5ff4bc7
2 parents 1b278fb + 2a683cd
commit 5ff4bc7
Show file tree

Hide file tree

Showing 20 changed files with 908 additions and 55 deletions.
diff --git a/client/getter/getter.go b/client/getter/getter.go
@@ -18,7 +18,7 @@ var (
 	lock    sync.Mutex
 
 	// supported is the set of download schemes supported by Nomad
-	supported = []string{"http", "https", "s3"}
+	supported = []string{"http", "https", "s3", "hg", "git"}
 )
 
 // getClient returns a client that is suitable for Nomad downloading artifacts.

diff --git a/client/task_runner.go b/client/task_runner.go
@@ -793,6 +793,7 @@ func (r *TaskRunner) prestart(resultCh chan bool) {
 			for _, artifact := range r.task.Artifacts {
 				if err := getter.GetArtifact(r.getTaskEnv(), artifact, r.taskDir.Dir); err != nil {
 					wrapped := fmt.Errorf("failed to download artifact %q: %v", artifact.GetterSource, err)
+					r.logger.Printf("[DEBUG] client: %v", wrapped)
 					r.setState(structs.TaskStatePending,
 						structs.NewTaskEvent(structs.TaskArtifactDownloadFailed).SetDownloadError(wrapped))
 					r.restartTracker.SetStartError(structs.NewRecoverableError(wrapped, true))

diff --git a/vendor/github.com/bgentry/go-netrc/LICENSE b/vendor/github.com/bgentry/go-netrc/LICENSE