dockerui: forward git fetch options for remote contexts

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

frontend/dockerui/build_test.go

@@ -1,10 +1,14 @@
 package dockerui
 
 import (
+	"context"
 	"testing"
 
 	"github.com/containerd/platforms"
+	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
+	"github.com/moby/buildkit/solver/pb"
+	"github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/require"
 )
@@ -98,3 +102,81 @@ func TestNormalizePlatform(t *testing.T) {
 		require.Equal(t, platforms.FormatAll(platforms.Normalize(tc.p)), tc.expected.ID)
 	}
 }
+
+func TestDetectGitContextForwardsFetchDepth(t *testing.T) {
+	t.Parallel()
+
+	st, ok, err := DetectGitContext("https://github.com/crazy-max/diun.git?ref=refs/pull/1544/merge&subdir=.&fetch-depth=0", nil)
+	require.True(t, ok)
+	require.NoError(t, err)
+
+	g := marshalGitContext(t, st)
+	require.Equal(t, "git://github.com/crazy-max/diun.git#refs/pull/1544/merge:.", g.Identifier)
+	require.Equal(t, map[string]string{
+		"git.authheadersecret": "GIT_AUTH_HEADER",
+		"git.authtokensecret":  "GIT_AUTH_TOKEN",
+		"git.fetchdepth":       "0",
+		"git.fullurl":          "https://github.com/crazy-max/diun.git",
+	}, g.Attrs)
+}
+
+func TestDetectGitContextForwardsFetchTags(t *testing.T) {
+	t.Parallel()
+
+	st, ok, err := DetectGitContext("https://github.com/crazy-max/diun.git?ref=refs/pull/1544/merge&subdir=.&fetch-tags=true", nil)
+	require.True(t, ok)
+	require.NoError(t, err)
+
+	g := marshalGitContext(t, st)
+	require.Equal(t, "git://github.com/crazy-max/diun.git#refs/pull/1544/merge:.", g.Identifier)
+	require.Equal(t, map[string]string{
+		"git.authheadersecret": "GIT_AUTH_HEADER",
+		"git.authtokensecret":  "GIT_AUTH_TOKEN",
+		"git.fetchtags":        "true",
+		"git.fullurl":          "https://github.com/crazy-max/diun.git",
+	}, g.Attrs)
+}
+
+func marshalGitContext(t *testing.T, st *llb.State) *pb.SourceOp {
+	t.Helper()
+
+	def, err := st.Marshal(context.TODO())
+	require.NoError(t, err)
+
+	m, arr := parseDef(t, def.Def)
+	require.Equal(t, 2, len(arr))
+
+	dgst, idx := last(t, arr)
+	require.Equal(t, 0, idx)
+	require.Equal(t, m[dgst], arr[0])
+
+	return arr[0].Op.(*pb.Op_Source).Source
+}
+
+func parseDef(t *testing.T, def [][]byte) (map[string]*pb.Op, []*pb.Op) {
+	t.Helper()
+
+	m := map[string]*pb.Op{}
+	arr := make([]*pb.Op, 0, len(def))
+
+	for _, dt := range def {
+		var op pb.Op
+		err := op.Unmarshal(dt)
+		require.NoError(t, err)
+		dgst := digest.FromBytes(dt)
+		m[string(dgst)] = &op
+		arr = append(arr, &op)
+	}
+
+	return m, arr
+}
+
+func last(t *testing.T, arr []*pb.Op) (string, int) {
+	t.Helper()
+
+	require.Greater(t, len(arr), 1)
+
+	op := arr[len(arr)-1]
+	require.Equal(t, 1, len(op.Inputs))
+	return op.Inputs[0].Digest, int(op.Inputs[0].Index)
+}

frontend/dockerui/context.go

@@ -161,6 +161,12 @@ func DetectGitContext(ref string, keepGit *bool) (*llb.State, bool, error) {
 	if g.SubDir != "" {
 		gitOpts = append(gitOpts, llb.GitSubDir(g.SubDir))
 	}
+	if g.FetchDepth != nil {
+		gitOpts = append(gitOpts, llb.GitFetchDepth(*g.FetchDepth))
+	}
+	if g.FetchTags != nil && *g.FetchTags {
+		gitOpts = append(gitOpts, llb.GitFetchTags())
+	}
 	if g.Checksum != "" {
 		gitOpts = append(gitOpts, llb.GitChecksum(g.Checksum))
 	}