Merge pull request #3619 from nalind/git-clone-error

define.TempDirForURL(): show CombinedOutput when a command fails

Makefile

@@ -37,7 +37,7 @@ LIBSECCOMP_COMMIT := release-2.3
 
 EXTRA_LDFLAGS ?=
 BUILDAH_LDFLAGS := $(GO_LDFLAGS) '-X main.GitCommit=$(GIT_COMMIT) -X main.buildInfo=$(SOURCE_DATE_EPOCH) -X main.cniVersion=$(CNI_COMMIT) $(EXTRA_LDFLAGS)'
-SOURCES=*.go imagebuildah/*.go bind/*.go chroot/*.go copier/*.go docker/*.go manifests/*.go pkg/blobcache/*.go pkg/chrootuser/*.go pkg/cli/*.go pkg/completion/*.go pkg/formats/*.go pkg/overlay/*.go pkg/parse/*.go pkg/rusage/*.go pkg/sshagent/*.go pkg/umask/*.go pkg/util/*.go util/*.go
+SOURCES=*.go imagebuildah/*.go bind/*.go chroot/*.go copier/*.go define/*.go docker/*.go manifests/*.go pkg/blobcache/*.go pkg/chrootuser/*.go pkg/cli/*.go pkg/completion/*.go pkg/formats/*.go pkg/overlay/*.go pkg/parse/*.go pkg/rusage/*.go pkg/sshagent/*.go pkg/umask/*.go pkg/util/*.go util/*.go
 
 LINTFLAGS ?=
 

define/types.go

@@ -124,12 +124,12 @@ func TempDirForURL(dir, prefix, url string) (name string, subdir string, err err
 		return "", "", errors.Wrapf(err, "error parsing url %q", url)
 	}
 	if strings.HasPrefix(url, "git://") || strings.HasSuffix(urlParsed.Path, ".git") {
-		err = cloneToDirectory(url, name)
+		combinedOutput, err := cloneToDirectory(url, name)
 		if err != nil {
 			if err2 := os.RemoveAll(name); err2 != nil {
 				logrus.Debugf("error removing temporary directory %q: %v", name, err2)
 			}
-			return "", "", err
+			return "", "", errors.Wrapf(err, "cloning %q to %q:\n%s", url, name, string(combinedOutput))
 		}
 		return name, "", nil
 	}
@@ -167,7 +167,7 @@ func TempDirForURL(dir, prefix, url string) (name string, subdir string, err err
 	return "", "", errors.Errorf("unreachable code reached")
 }
 
-func cloneToDirectory(url, dir string) error {
+func cloneToDirectory(url, dir string) ([]byte, error) {
 	gitBranch := strings.Split(url, "#")
 	var cmd *exec.Cmd
 	if len(gitBranch) < 2 {
@@ -177,7 +177,7 @@ func cloneToDirectory(url, dir string) error {
 		logrus.Debugf("cloning repo %q and branch %q to %q", gitBranch[0], gitBranch[1], dir)
 		cmd = exec.Command("git", "clone", "--recurse-submodules", "-b", gitBranch[1], gitBranch[0], dir)
 	}
-	return cmd.Run()
+	return cmd.CombinedOutput()
 }
 
 func downloadToDirectory(url, dir string) error {

tests/bud.bats

@@ -738,6 +738,19 @@ function _test_http() {
   run_buildah from ${target}
 }
 
+@test "bud-git-context-failure" {
+  # We need git to be around to try cloning a repository, even though it'll fail
+  # and exit with return code 128.
+  if ! which git ; then
+    skip "no git in PATH"
+  fi
+  target=giturl-image
+  gitrepo=git:///tmp/no-such-repository
+  run_buildah 128 build --signature-policy ${TESTSDIR}/policy.json -t ${target} "${gitrepo}"
+  # Expect part of what git would have told us... before things went horribly wrong
+  expect_output --substring "Cloning into '"
+}
+
 @test "bud-github-context" {
   target=github-image
   # Any repo should do, but this one is small and is FROM: scratch.