alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

vendor: update buildkit to ecde33610015

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2026-02-26 17:06:30 -08:00
parent 88cba2c367
commit 73ea669465
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go
Generated Vendored
+20 -3
View File
@@ -472,14 +472,20 @@ func (c *grpcClient) Solve(ctx context.Context, creq client.SolveRequest) (res *
}
func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.SourceOp, opt sourceresolver.Opt) (*sourceresolver.MetaResponse, error) {
requiresImageAttestationResolve := opt.ImageOpt != nil && (opt.ImageOpt.AttestationChain || len(opt.ImageOpt.ResolveAttestations) > 0)
requiresHTTPChecksumRequest := opt.HTTPOpt != nil && opt.HTTPOpt.ChecksumReq != nil
if c.caps.Supports(pb.CapSourceMetaResolver) != nil {
if requiresImageAttestationResolve {
return nil, errors.New("image attestation resolution requires source metadata resolver support")
}
var ref string
if v, ok := strings.CutPrefix(op.Identifier, "docker-image://"); ok {
ref = v
} else if v, ok := strings.CutPrefix(op.Identifier, "oci-layout://"); ok {
ref = v
} else {
if opt.HTTPOpt != nil && opt.HTTPOpt.ChecksumReq != nil {
if requiresHTTPChecksumRequest {
return nil, errors.New("http checksum request requires source metadata resolver support")
}
return &sourceresolver.MetaResponse{Op: op}, nil
@@ -503,6 +509,17 @@ func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.Source
}, nil
}
if requiresImageAttestationResolve {
if err := c.caps.Supports(pb.CapSourceMetaResolverImageAttestations); err != nil {
return nil, errors.Wrap(err, "image attestation resolution requires additional source metadata resolver support")
}
}
if requiresHTTPChecksumRequest {
if err := c.caps.Supports(pb.CapSourceMetaResolverHTTPChecksumRequest); err != nil {
return nil, errors.Wrap(err, "http checksum request requires additional source metadata resolver support")
}
}
var platform *ocispecs.Platform
if imgOpt := opt.ImageOpt; imgOpt != nil && imgOpt.Platform != nil {
platform = imgOpt.Platform
@@ -544,7 +561,7 @@ func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.Source
ReturnObject: opt.GitOpt.ReturnObject,
}
}
if opt.HTTPOpt != nil && opt.HTTPOpt.ChecksumReq != nil {
if requiresHTTPChecksumRequest {
algo, err := toPBHTTPChecksumAlgo(opt.HTTPOpt.ChecksumReq.Algo)
if err != nil {
return nil, err
@@ -598,7 +615,7 @@ func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.Source
}
}
}
if opt.HTTPOpt != nil && opt.HTTPOpt.ChecksumReq != nil {
if requiresHTTPChecksumRequest {
if resp.HTTP == nil || resp.HTTP.ChecksumResponse == nil {
return nil, errors.New("http checksum request was sent but response did not include checksum response")
}
vendor/github.com/moby/buildkit/frontend/gateway/pb/caps.go
Generated Vendored
+20
View File
@@ -76,6 +76,12 @@ const (
// CapSourceMetaResolver is the capability to indicates support for ResolveSourceMetadata
// function in gateway API
CapSourceMetaResolver apicaps.CapID = "source.metaresolver"
// CapSourceMetaResolverImageAttestations is the capability to indicate support
// for attestation resolution fields in ResolveSourceMeta image requests.
CapSourceMetaResolverImageAttestations apicaps.CapID = "source.metaresolver.image.attestations"
// CapSourceMetaResolverHTTPChecksumRequest is the capability to indicate support
// for custom checksum request fields in ResolveSourceMeta http requests.
CapSourceMetaResolverHTTPChecksumRequest apicaps.CapID = "source.metaresolver.http.checksumrequest"
)
func init() {
@@ -253,4 +259,18 @@ func init() {
Enabled: true,
Status: apicaps.CapStatusExperimental,
})
Caps.Init(apicaps.Cap{
ID: CapSourceMetaResolverImageAttestations,
Name: "source meta resolver image attestations",
Enabled: true,
Status: apicaps.CapStatusExperimental,
})
Caps.Init(apicaps.Cap{
ID: CapSourceMetaResolverHTTPChecksumRequest,
Name: "source meta resolver http checksum request",
Enabled: true,
Status: apicaps.CapStatusExperimental,
})
}