avoid import to testing helpers outside of tests

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

util/gitutil/gittestutil/testutil.go

@@ -0,0 +1,95 @@
+package gittestutil
+
+import (
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/docker/buildx/util/gitutil"
+	"github.com/stretchr/testify/require"
+)
+
+func GitInit(c *gitutil.Git, tb testing.TB) {
+	tb.Helper()
+	out, err := fakeGit(c, "init")
+	require.NoError(tb, err)
+	require.Contains(tb, out, "Initialized empty Git repository")
+	require.NoError(tb, err)
+	GitCheckoutBranch(c, tb, "main")
+	_, _ = fakeGit(c, "branch", "-D", "master")
+}
+
+func GitCommit(c *gitutil.Git, tb testing.TB, msg string) {
+	tb.Helper()
+	out, err := fakeGit(c, "commit", "--allow-empty", "-m", msg)
+	require.NoError(tb, err)
+	require.Contains(tb, out, "main", msg)
+}
+
+func GitTag(c *gitutil.Git, tb testing.TB, tag string) {
+	tb.Helper()
+	out, err := fakeGit(c, "tag", tag)
+	require.NoError(tb, err)
+	require.Empty(tb, out)
+}
+
+func GitCheckoutBranch(c *gitutil.Git, tb testing.TB, name string) {
+	tb.Helper()
+	out, err := fakeGit(c, "checkout", "-b", name)
+	require.NoError(tb, err)
+	require.Empty(tb, out)
+}
+
+func GitAdd(c *gitutil.Git, tb testing.TB, files ...string) {
+	tb.Helper()
+	args := append([]string{"add"}, files...)
+	_, err := fakeGit(c, args...)
+	require.NoError(tb, err)
+}
+
+func GitSetRemote(c *gitutil.Git, tb testing.TB, name string, url string) {
+	tb.Helper()
+	_, err := fakeGit(c, "remote", "add", name, url)
+	require.NoError(tb, err)
+}
+
+func GitSetMainUpstream(c *gitutil.Git, tb testing.TB, remote, target string) {
+	tb.Helper()
+	_, err := fakeGit(c, "fetch", "--depth", "1", remote, target)
+	require.NoError(tb, err)
+
+	_, err = fakeGit(c, "branch", "--set-upstream-to", remote+"/"+target, "main")
+	require.NoError(tb, err)
+}
+
+func Mktmp(tb testing.TB) string {
+	tb.Helper()
+	folder := tb.TempDir()
+	current, err := os.Getwd()
+	require.NoError(tb, err)
+	require.NoError(tb, os.Chdir(folder))
+	tb.Cleanup(func() {
+		require.NoError(tb, os.Chdir(current))
+	})
+	return folder
+}
+
+func fakeGit(c *gitutil.Git, args ...string) (string, error) {
+	allArgs := []string{
+		"-c", "user.name=buildx",
+		"-c", "user.email=buildx@docker.com",
+		"-c", "commit.gpgSign=false",
+		"-c", "tag.gpgSign=false",
+		"-c", "log.showSignature=false",
+	}
+	allArgs = append(allArgs, args...)
+	return c.Run(allArgs...)
+}
+
+func IsAmbiguousArgument(err error) bool {
+	if err == nil {
+		return false
+	}
+	errMsg := strings.ToLower(err.Error())
+	return strings.Contains(errMsg, "use '--' to separate paths from revisions")
+}

util/gitutil/gittestutil/testutilserve.go

@@ -0,0 +1,99 @@
+package gittestutil
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"testing"
+
+	"github.com/docker/buildx/util/gitutil"
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/require"
+)
+
+type gitServe struct {
+	token string
+}
+
+type GitServeOpt func(*gitServe)
+
+func WithAccessToken(token string) GitServeOpt {
+	return func(s *gitServe) {
+		s.token = token
+	}
+}
+
+func GitServeHTTP(c *gitutil.Git, t testing.TB, opts ...GitServeOpt) (url string) {
+	t.Helper()
+	gitUpdateServerInfo(c, t)
+	ctx, cancel := context.WithCancelCause(context.TODO())
+
+	gs := &gitServe{}
+	for _, opt := range opts {
+		opt(gs)
+	}
+
+	ready := make(chan struct{})
+	done := make(chan struct{})
+
+	name := "test.git"
+	dir, err := c.GitDir()
+	if err != nil {
+		cancel(err)
+	}
+
+	var addr string
+	go func() {
+		mux := http.NewServeMux()
+		prefix := fmt.Sprintf("/%s/", name)
+
+		handler := func(next http.Handler) http.Handler {
+			var tokenChecked bool
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if gs.token != "" && !tokenChecked {
+					t.Logf("git access token to check: %q", gs.token)
+					user, pass, _ := r.BasicAuth()
+					t.Logf("basic auth: user=%q pass=%q", user, pass)
+					if pass != gs.token {
+						http.Error(w, "Unauthorized", http.StatusUnauthorized)
+						return
+					}
+					tokenChecked = true
+				}
+				next.ServeHTTP(w, r)
+			})
+		}
+
+		mux.Handle(prefix, handler(http.StripPrefix(prefix, http.FileServer(http.Dir(dir)))))
+		l, err := net.Listen("tcp", "localhost:0")
+		if err != nil {
+			panic(err)
+		}
+
+		addr = l.Addr().String()
+
+		close(ready)
+
+		s := http.Server{Handler: mux} //nolint:gosec // potential attacks are not relevant for tests
+		go s.Serve(l)
+		<-ctx.Done()
+		s.Shutdown(context.TODO())
+		l.Close()
+
+		close(done)
+	}()
+	<-ready
+
+	t.Cleanup(func() {
+		cancel(errors.Errorf("cleanup"))
+		<-done
+	})
+	return fmt.Sprintf("http://%s/%s", addr, name)
+}
+
+func gitUpdateServerInfo(c *gitutil.Git, tb testing.TB) {
+	tb.Helper()
+	_, err := fakeGit(c, "update-server-info")
+	require.NoError(tb, err)
+}