Skip to content

source: add raw commit/tag object access to resolveMetadata #6298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 22, 2025
Merged

source: add raw commit/tag object access to resolveMetadata #6298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a248127
git: separate remoteFetch from checkout for better reuse
tonistiigi Oct 16, 2025
5f6a7ef
source: add raw commit/tag object access to resolveMetadata
tonistiigi Oct 16, 2025
5e410ed
client: add test for git metadata resolve with return object
tonistiigi Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions client/llb/sourceresolver/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type Opt struct {

ImageOpt *ResolveImageOpt
OCILayoutOpt *ResolveOCILayoutOpt
GitOpt *ResolveGitOpt
}

type MetaResponse struct {
Expand All @@ -47,10 +48,16 @@ type ResolveImageResponse struct {
Config []byte
}

type ResolveGitOpt struct {
ReturnObject bool
}

type ResolveGitResponse struct {
Checksum string
Ref string
CommitChecksum string
CommitObject []byte
TagObject []byte
}

type ResolveHTTPResponse struct {
Expand Down
8 changes: 8 additions & 0 deletions frontend/gateway/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,12 @@ func (lbf *llbBridgeForwarder) ResolveSourceMeta(ctx context.Context, req *pb.Re
resolveopt.ImageOpt = &sourceresolver.ResolveImageOpt{
ResolveMode: req.ResolveMode,
}
if req.Git != nil {
resolveopt.GitOpt = &sourceresolver.ResolveGitOpt{
ReturnObject: req.Git.ReturnObject,
}
}

resp, err := lbf.llbBridge.ResolveSourceMetadata(ctx, req.Source, resolveopt)
if err != nil {
return nil, err
Expand All @@ -656,6 +662,8 @@ func (lbf *llbBridgeForwarder) ResolveSourceMeta(ctx context.Context, req *pb.Re
Checksum: resp.Git.Checksum,
Ref: resp.Git.Ref,
CommitChecksum: resp.Git.CommitChecksum,
CommitObject: resp.Git.CommitObject,
TagObject: resp.Git.TagObject,
}
}
if resp.HTTP != nil {
Expand Down
8 changes: 8 additions & 0 deletions frontend/gateway/grpcclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,12 @@ func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.Source
LogName: opt.LogName,
SourcePolicies: opt.SourcePolicies,
}
if opt.GitOpt != nil {
req.Git = &pb.ResolveSourceGitRequest{
ReturnObject: opt.GitOpt.ReturnObject,
}
}

resp, err := c.client.ResolveSourceMeta(ctx, req)
if err != nil {
return nil, err
Expand All @@ -533,6 +539,8 @@ func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.Source
Checksum: resp.Git.Checksum,
Ref: resp.Git.Ref,
CommitChecksum: resp.Git.CommitChecksum,
CommitObject: resp.Git.CommitObject,
TagObject: resp.Git.TagObject,
}
}
if resp.HTTP != nil {
Expand Down
Loading