diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 38666d355127..abadf4fa4430 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -84,6 +84,8 @@ jobs: endpoint: tcp://localhost:1234 - driver: docker-container metadata-provenance: max + - driver: docker-container + metadata-status: 1 exclude: - driver: docker multi-node: mnode-true @@ -134,6 +136,9 @@ jobs: if [ -n "${{ matrix.metadata-provenance }}" ]; then echo "BUILDX_METADATA_PROVENANCE=${{ matrix.metadata-provenance }}" >> $GITHUB_ENV fi + if [ -n "${{ matrix.metadata-status }}" ]; then + echo "BUILDX_METADATA_STATUS=${{ matrix.metadata-status }}" >> $GITHUB_ENV + fi - name: Install k3s if: matrix.driver == 'kubernetes' diff --git a/build/build.go b/build/build.go index 39174c9028cb..8bb2e425aa30 100644 --- a/build/build.go +++ b/build/build.go @@ -79,12 +79,12 @@ type Options struct { Target string Ulimits *opts.UlimitOpt - Session []session.Attachable - Linked bool // Linked marks this target as exclusively linked (not requested by the user). - PrintFunc *PrintFunc - WithProvenanceResponse bool - SourcePolicy *spb.Policy - GroupRef string + Session []session.Attachable + Linked bool // Linked marks this target as exclusively linked (not requested by the user). + PrintFunc *PrintFunc + WithDetailedResponse bool + SourcePolicy *spb.Policy + GroupRef string } type PrintFunc struct { @@ -473,10 +473,13 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s rr.ExporterResponse[k] = string(v) } rr.ExporterResponse["buildx.build.ref"] = buildRef - if opt.WithProvenanceResponse && node.Driver.HistoryAPISupported(ctx) { + if opt.WithDetailedResponse && node.Driver.HistoryAPISupported(ctx) { if err := setRecordProvenance(ctx, c, rr, so.Ref, pw); err != nil { return err } + if err := setRecordStatus(ctx, c, rr, so.Ref, pw); err != nil { + return err + } } node := dp.Node().Driver diff --git a/build/status.go b/build/status.go new file mode 100644 index 000000000000..58b9ef74eced --- /dev/null +++ b/build/status.go @@ -0,0 +1,59 @@ +package build + +import ( + "context" + "encoding/base64" + "encoding/json" + "io" + + "github.com/docker/buildx/util/confutil" + "github.com/docker/buildx/util/progress" + controlapi "github.com/moby/buildkit/api/services/control" + "github.com/moby/buildkit/client" + "github.com/pkg/errors" +) + +func setRecordStatus(ctx context.Context, c *client.Client, sr *client.SolveResponse, ref string, pw progress.Writer) error { + if !confutil.MetadataStatus() { + return nil + } + pw = progress.ResetTime(pw) + return progress.Wrap("resolving status for metadata file", pw.Write, func(l progress.SubLogger) error { + status, err := fetchStatus(ctx, c, ref) + if err != nil { + return err + } else if status == nil || len(status.Warnings) == 0 { + return nil + } + + // we just want warnings for now + status.Vertexes = nil + status.Statuses = nil + status.Logs = nil + + dt, err := json.Marshal(status) + if err != nil { + return errors.Wrapf(err, "failed to marshal status") + } + sr.ExporterResponse["buildx.build.status"] = base64.StdEncoding.EncodeToString(dt) + + return nil + }) +} + +func fetchStatus(ctx context.Context, c *client.Client, ref string) (*client.SolveStatus, error) { + cl, err := c.ControlClient().Status(ctx, &controlapi.StatusRequest{ + Ref: ref, + }) + if err != nil { + return nil, err + } + resp, err := cl.Recv() + if err != nil { + if err == io.EOF { + return nil, nil + } + return nil, errors.Wrap(err, "failed to receive status") + } + return client.NewSolveStatus(resp), nil +} diff --git a/commands/bake.go b/commands/bake.go index cb23066f6281..db613253a02c 100644 --- a/commands/bake.go +++ b/commands/bake.go @@ -207,7 +207,7 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba for k, b := range bo { b.Ref = identity.NewID() b.GroupRef = groupRef - b.WithProvenanceResponse = len(in.metadataFile) > 0 + b.WithDetailedResponse = len(in.metadataFile) > 0 refs = append(refs, b.Ref) bo[k] = b } diff --git a/commands/build.go b/commands/build.go index 9cf344040f96..47d348947f87 100644 --- a/commands/build.go +++ b/commands/build.go @@ -206,7 +206,7 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error return nil, err } - opts.WithProvenanceResponse = opts.PrintFunc == nil && len(o.metadataFile) > 0 + opts.WithDetailedResponse = opts.PrintFunc == nil && len(o.metadataFile) > 0 return &opts, nil } diff --git a/controller/build/build.go b/controller/build/build.go index 1cae9b6c70d9..de5252640ac1 100644 --- a/controller/build/build.go +++ b/controller/build/build.go @@ -53,21 +53,21 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.Build InStream: inStream, NamedContexts: contexts, }, - Ref: in.Ref, - BuildArgs: in.BuildArgs, - CgroupParent: in.CgroupParent, - ExtraHosts: in.ExtraHosts, - Labels: in.Labels, - NetworkMode: in.NetworkMode, - NoCache: in.NoCache, - NoCacheFilter: in.NoCacheFilter, - Pull: in.Pull, - ShmSize: dockeropts.MemBytes(in.ShmSize), - Tags: in.Tags, - Target: in.Target, - Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits), - GroupRef: in.GroupRef, - WithProvenanceResponse: in.WithProvenanceResponse, + Ref: in.Ref, + BuildArgs: in.BuildArgs, + CgroupParent: in.CgroupParent, + ExtraHosts: in.ExtraHosts, + Labels: in.Labels, + NetworkMode: in.NetworkMode, + NoCache: in.NoCache, + NoCacheFilter: in.NoCacheFilter, + Pull: in.Pull, + ShmSize: dockeropts.MemBytes(in.ShmSize), + Tags: in.Tags, + Target: in.Target, + Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits), + GroupRef: in.GroupRef, + WithDetailedResponse: in.WithDetailedResponse, } platforms, err := platformutil.Parse(in.Platforms) diff --git a/controller/pb/controller.pb.go b/controller/pb/controller.pb.go index a671b03a1b58..7090f4fab2ba 100644 --- a/controller/pb/controller.pb.go +++ b/controller/pb/controller.pb.go @@ -271,41 +271,41 @@ func (m *BuildRequest) GetOptions() *BuildOptions { } type BuildOptions struct { - ContextPath string `protobuf:"bytes,1,opt,name=ContextPath,proto3" json:"ContextPath,omitempty"` - DockerfileName string `protobuf:"bytes,2,opt,name=DockerfileName,proto3" json:"DockerfileName,omitempty"` - PrintFunc *PrintFunc `protobuf:"bytes,3,opt,name=PrintFunc,proto3" json:"PrintFunc,omitempty"` - NamedContexts map[string]string `protobuf:"bytes,4,rep,name=NamedContexts,proto3" json:"NamedContexts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Allow []string `protobuf:"bytes,5,rep,name=Allow,proto3" json:"Allow,omitempty"` - Attests []*Attest `protobuf:"bytes,6,rep,name=Attests,proto3" json:"Attests,omitempty"` - BuildArgs map[string]string `protobuf:"bytes,7,rep,name=BuildArgs,proto3" json:"BuildArgs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - CacheFrom []*CacheOptionsEntry `protobuf:"bytes,8,rep,name=CacheFrom,proto3" json:"CacheFrom,omitempty"` - CacheTo []*CacheOptionsEntry `protobuf:"bytes,9,rep,name=CacheTo,proto3" json:"CacheTo,omitempty"` - CgroupParent string `protobuf:"bytes,10,opt,name=CgroupParent,proto3" json:"CgroupParent,omitempty"` - Exports []*ExportEntry `protobuf:"bytes,11,rep,name=Exports,proto3" json:"Exports,omitempty"` - ExtraHosts []string `protobuf:"bytes,12,rep,name=ExtraHosts,proto3" json:"ExtraHosts,omitempty"` - Labels map[string]string `protobuf:"bytes,13,rep,name=Labels,proto3" json:"Labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NetworkMode string `protobuf:"bytes,14,opt,name=NetworkMode,proto3" json:"NetworkMode,omitempty"` - NoCacheFilter []string `protobuf:"bytes,15,rep,name=NoCacheFilter,proto3" json:"NoCacheFilter,omitempty"` - Platforms []string `protobuf:"bytes,16,rep,name=Platforms,proto3" json:"Platforms,omitempty"` - Secrets []*Secret `protobuf:"bytes,17,rep,name=Secrets,proto3" json:"Secrets,omitempty"` - ShmSize int64 `protobuf:"varint,18,opt,name=ShmSize,proto3" json:"ShmSize,omitempty"` - SSH []*SSH `protobuf:"bytes,19,rep,name=SSH,proto3" json:"SSH,omitempty"` - Tags []string `protobuf:"bytes,20,rep,name=Tags,proto3" json:"Tags,omitempty"` - Target string `protobuf:"bytes,21,opt,name=Target,proto3" json:"Target,omitempty"` - Ulimits *UlimitOpt `protobuf:"bytes,22,opt,name=Ulimits,proto3" json:"Ulimits,omitempty"` - Builder string `protobuf:"bytes,23,opt,name=Builder,proto3" json:"Builder,omitempty"` - NoCache bool `protobuf:"varint,24,opt,name=NoCache,proto3" json:"NoCache,omitempty"` - Pull bool `protobuf:"varint,25,opt,name=Pull,proto3" json:"Pull,omitempty"` - ExportPush bool `protobuf:"varint,26,opt,name=ExportPush,proto3" json:"ExportPush,omitempty"` - ExportLoad bool `protobuf:"varint,27,opt,name=ExportLoad,proto3" json:"ExportLoad,omitempty"` - SourcePolicy *pb.Policy `protobuf:"bytes,28,opt,name=SourcePolicy,proto3" json:"SourcePolicy,omitempty"` - Ref string `protobuf:"bytes,29,opt,name=Ref,proto3" json:"Ref,omitempty"` - GroupRef string `protobuf:"bytes,30,opt,name=GroupRef,proto3" json:"GroupRef,omitempty"` - Annotations []string `protobuf:"bytes,31,rep,name=Annotations,proto3" json:"Annotations,omitempty"` - WithProvenanceResponse bool `protobuf:"varint,32,opt,name=WithProvenanceResponse,proto3" json:"WithProvenanceResponse,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContextPath string `protobuf:"bytes,1,opt,name=ContextPath,proto3" json:"ContextPath,omitempty"` + DockerfileName string `protobuf:"bytes,2,opt,name=DockerfileName,proto3" json:"DockerfileName,omitempty"` + PrintFunc *PrintFunc `protobuf:"bytes,3,opt,name=PrintFunc,proto3" json:"PrintFunc,omitempty"` + NamedContexts map[string]string `protobuf:"bytes,4,rep,name=NamedContexts,proto3" json:"NamedContexts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Allow []string `protobuf:"bytes,5,rep,name=Allow,proto3" json:"Allow,omitempty"` + Attests []*Attest `protobuf:"bytes,6,rep,name=Attests,proto3" json:"Attests,omitempty"` + BuildArgs map[string]string `protobuf:"bytes,7,rep,name=BuildArgs,proto3" json:"BuildArgs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CacheFrom []*CacheOptionsEntry `protobuf:"bytes,8,rep,name=CacheFrom,proto3" json:"CacheFrom,omitempty"` + CacheTo []*CacheOptionsEntry `protobuf:"bytes,9,rep,name=CacheTo,proto3" json:"CacheTo,omitempty"` + CgroupParent string `protobuf:"bytes,10,opt,name=CgroupParent,proto3" json:"CgroupParent,omitempty"` + Exports []*ExportEntry `protobuf:"bytes,11,rep,name=Exports,proto3" json:"Exports,omitempty"` + ExtraHosts []string `protobuf:"bytes,12,rep,name=ExtraHosts,proto3" json:"ExtraHosts,omitempty"` + Labels map[string]string `protobuf:"bytes,13,rep,name=Labels,proto3" json:"Labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + NetworkMode string `protobuf:"bytes,14,opt,name=NetworkMode,proto3" json:"NetworkMode,omitempty"` + NoCacheFilter []string `protobuf:"bytes,15,rep,name=NoCacheFilter,proto3" json:"NoCacheFilter,omitempty"` + Platforms []string `protobuf:"bytes,16,rep,name=Platforms,proto3" json:"Platforms,omitempty"` + Secrets []*Secret `protobuf:"bytes,17,rep,name=Secrets,proto3" json:"Secrets,omitempty"` + ShmSize int64 `protobuf:"varint,18,opt,name=ShmSize,proto3" json:"ShmSize,omitempty"` + SSH []*SSH `protobuf:"bytes,19,rep,name=SSH,proto3" json:"SSH,omitempty"` + Tags []string `protobuf:"bytes,20,rep,name=Tags,proto3" json:"Tags,omitempty"` + Target string `protobuf:"bytes,21,opt,name=Target,proto3" json:"Target,omitempty"` + Ulimits *UlimitOpt `protobuf:"bytes,22,opt,name=Ulimits,proto3" json:"Ulimits,omitempty"` + Builder string `protobuf:"bytes,23,opt,name=Builder,proto3" json:"Builder,omitempty"` + NoCache bool `protobuf:"varint,24,opt,name=NoCache,proto3" json:"NoCache,omitempty"` + Pull bool `protobuf:"varint,25,opt,name=Pull,proto3" json:"Pull,omitempty"` + ExportPush bool `protobuf:"varint,26,opt,name=ExportPush,proto3" json:"ExportPush,omitempty"` + ExportLoad bool `protobuf:"varint,27,opt,name=ExportLoad,proto3" json:"ExportLoad,omitempty"` + SourcePolicy *pb.Policy `protobuf:"bytes,28,opt,name=SourcePolicy,proto3" json:"SourcePolicy,omitempty"` + Ref string `protobuf:"bytes,29,opt,name=Ref,proto3" json:"Ref,omitempty"` + GroupRef string `protobuf:"bytes,30,opt,name=GroupRef,proto3" json:"GroupRef,omitempty"` + Annotations []string `protobuf:"bytes,31,rep,name=Annotations,proto3" json:"Annotations,omitempty"` + WithDetailedResponse bool `protobuf:"varint,32,opt,name=WithDetailedResponse,proto3" json:"WithDetailedResponse,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BuildOptions) Reset() { *m = BuildOptions{} } @@ -549,9 +549,9 @@ func (m *BuildOptions) GetAnnotations() []string { return nil } -func (m *BuildOptions) GetWithProvenanceResponse() bool { +func (m *BuildOptions) GetWithDetailedResponse() bool { if m != nil { - return m.WithProvenanceResponse + return m.WithDetailedResponse } return false } @@ -2094,130 +2094,130 @@ func init() { func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) } var fileDescriptor_ed7f10298fa1d90f = []byte{ - // 1960 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x5f, 0x73, 0x1b, 0x49, - 0x11, 0x67, 0x25, 0x59, 0x7f, 0x5a, 0x96, 0xcf, 0x19, 0x9c, 0x30, 0xd9, 0xe4, 0x12, 0x67, 0x93, - 0x1c, 0x2a, 0x42, 0xc9, 0x77, 0x3e, 0x72, 0xb9, 0x5c, 0xee, 0xaa, 0xb0, 0x65, 0x0b, 0xfb, 0x2a, - 0xb1, 0x5d, 0x23, 0x27, 0x29, 0xb8, 0x2a, 0xae, 0x56, 0xd2, 0x58, 0xde, 0xd2, 0x6a, 0x47, 0xec, - 0x8c, 0x64, 0x8b, 0x27, 0x1e, 0xe0, 0x8d, 0xe2, 0x7b, 0x50, 0x7c, 0x04, 0x9e, 0x78, 0xe3, 0xe3, - 0xf0, 0x11, 0xa8, 0xf9, 0xb3, 0xab, 0x5d, 0x4b, 0x2b, 0xdb, 0xf0, 0xa4, 0xe9, 0x9e, 0x5f, 0x77, - 0x4f, 0xf7, 0xf6, 0x74, 0xf7, 0x08, 0xd6, 0xbb, 0x2c, 0x10, 0x21, 0xf3, 0x7d, 0x1a, 0x36, 0x46, - 0x21, 0x13, 0x0c, 0x6d, 0x74, 0xc6, 0x9e, 0xdf, 0xbb, 0x6c, 0x24, 0x36, 0x26, 0x5f, 0xd8, 0x6f, - 0xfa, 0x9e, 0x38, 0x1f, 0x77, 0x1a, 0x5d, 0x36, 0xdc, 0x1a, 0xb2, 0xce, 0x74, 0x4b, 0xa1, 0x06, - 0x9e, 0xd8, 0x72, 0x47, 0xde, 0x16, 0xa7, 0xe1, 0xc4, 0xeb, 0x52, 0xbe, 0x65, 0x84, 0xa2, 0x5f, - 0xad, 0xd2, 0x7e, 0x99, 0x29, 0xcc, 0xd9, 0x38, 0xec, 0xd2, 0x11, 0xf3, 0xbd, 0xee, 0x74, 0x6b, - 0xd4, 0xd9, 0xd2, 0x2b, 0x2d, 0xe6, 0xd4, 0x61, 0xe3, 0xad, 0xc7, 0xc5, 0x49, 0xc8, 0xba, 0x94, - 0x73, 0xca, 0x09, 0xfd, 0xc3, 0x98, 0x72, 0x81, 0xd6, 0x21, 0x4f, 0xe8, 0x19, 0xb6, 0x36, 0xad, - 0x7a, 0x85, 0xc8, 0xa5, 0x73, 0x02, 0x77, 0xaf, 0x20, 0xf9, 0x88, 0x05, 0x9c, 0xa2, 0x57, 0xb0, - 0x72, 0x18, 0x9c, 0x31, 0x8e, 0xad, 0xcd, 0x7c, 0xbd, 0xba, 0xfd, 0xa4, 0xb1, 0xc8, 0xb9, 0x86, - 0x91, 0x93, 0x48, 0xa2, 0xf1, 0x0e, 0x87, 0x6a, 0x82, 0x8b, 0x1e, 0x42, 0x25, 0x22, 0xf7, 0x8c, - 0xe1, 0x19, 0x03, 0xb5, 0x60, 0xf5, 0x30, 0x98, 0xb0, 0x01, 0x6d, 0xb2, 0xe0, 0xcc, 0xeb, 0xe3, - 0xdc, 0xa6, 0x55, 0xaf, 0x6e, 0x3b, 0x8b, 0x8d, 0x25, 0x91, 0x24, 0x25, 0xe7, 0x7c, 0x0f, 0x78, - 0xcf, 0xe3, 0x5d, 0x16, 0x04, 0xb4, 0x1b, 0x39, 0x93, 0xe9, 0x74, 0xfa, 0x4c, 0xb9, 0x2b, 0x67, - 0x72, 0x1e, 0xc0, 0xfd, 0x05, 0xba, 0x74, 0x58, 0x9c, 0xdf, 0xc3, 0xea, 0xae, 0x3c, 0x5b, 0xb6, - 0xf2, 0x6f, 0xa1, 0x74, 0x3c, 0x12, 0x1e, 0x0b, 0xf8, 0x72, 0x6f, 0x94, 0x1a, 0x83, 0x24, 0x91, - 0x88, 0xf3, 0xef, 0x55, 0x63, 0xc0, 0x30, 0xd0, 0x26, 0x54, 0x9b, 0x2c, 0x10, 0xf4, 0x52, 0x9c, - 0xb8, 0xe2, 0xdc, 0x18, 0x4a, 0xb2, 0xd0, 0x67, 0xb0, 0xb6, 0xc7, 0xba, 0x03, 0x1a, 0x9e, 0x79, - 0x3e, 0x3d, 0x72, 0x87, 0xd4, 0xb8, 0x74, 0x85, 0x8b, 0xbe, 0x93, 0x5e, 0x7b, 0x81, 0x68, 0x8d, - 0x83, 0x2e, 0xce, 0xab, 0xa3, 0x3d, 0xce, 0xfa, 0xaa, 0x06, 0x46, 0x66, 0x12, 0xe8, 0x07, 0xa8, - 0x49, 0x35, 0x3d, 0x63, 0x9a, 0xe3, 0x82, 0x4a, 0x8c, 0x97, 0xd7, 0x7b, 0xd7, 0x48, 0xc9, 0xed, - 0x07, 0x22, 0x9c, 0x92, 0xb4, 0x2e, 0xb4, 0x01, 0x2b, 0x3b, 0xbe, 0xcf, 0x2e, 0xf0, 0xca, 0x66, - 0xbe, 0x5e, 0x21, 0x9a, 0x40, 0x5f, 0x41, 0x69, 0x47, 0x08, 0xca, 0x05, 0xc7, 0x45, 0x65, 0xec, - 0xe1, 0x62, 0x63, 0x1a, 0x44, 0x22, 0x30, 0x3a, 0x86, 0x8a, 0xb2, 0xbf, 0x13, 0xf6, 0x39, 0x2e, - 0x29, 0xc9, 0x2f, 0x6e, 0x70, 0xcc, 0x58, 0x46, 0x1f, 0x71, 0xa6, 0x03, 0xed, 0x43, 0xa5, 0xe9, - 0x76, 0xcf, 0x69, 0x2b, 0x64, 0x43, 0x5c, 0x56, 0x0a, 0x7f, 0xbe, 0x58, 0xa1, 0x82, 0x19, 0x85, - 0x46, 0x4d, 0x2c, 0x89, 0x76, 0xa0, 0xa4, 0x88, 0x53, 0x86, 0x2b, 0xb7, 0x53, 0x12, 0xc9, 0x21, - 0x07, 0x56, 0x9b, 0xfd, 0x90, 0x8d, 0x47, 0x27, 0x6e, 0x48, 0x03, 0x81, 0x41, 0x7d, 0xea, 0x14, - 0x0f, 0xbd, 0x81, 0xd2, 0xfe, 0xe5, 0x88, 0x85, 0x82, 0xe3, 0xea, 0xb2, 0xcb, 0xab, 0x41, 0xc6, - 0x80, 0x91, 0x40, 0x8f, 0x00, 0xf6, 0x2f, 0x45, 0xe8, 0x1e, 0x30, 0x19, 0xf6, 0x55, 0xf5, 0x39, - 0x12, 0x1c, 0xd4, 0x82, 0xe2, 0x5b, 0xb7, 0x43, 0x7d, 0x8e, 0x6b, 0x4a, 0x77, 0xe3, 0x06, 0x81, - 0xd5, 0x02, 0xda, 0x90, 0x91, 0x96, 0x79, 0x7d, 0x44, 0xc5, 0x05, 0x0b, 0x07, 0xef, 0x58, 0x8f, - 0xe2, 0x35, 0x9d, 0xd7, 0x09, 0x16, 0x7a, 0x06, 0xb5, 0x23, 0xa6, 0x83, 0xe7, 0xf9, 0x82, 0x86, - 0xf8, 0x13, 0x75, 0x98, 0x34, 0x53, 0xdd, 0x65, 0xdf, 0x15, 0x67, 0x2c, 0x1c, 0x72, 0xbc, 0xae, - 0x10, 0x33, 0x86, 0xcc, 0xa0, 0x36, 0xed, 0x86, 0x54, 0x70, 0x7c, 0x67, 0x59, 0x06, 0x69, 0x10, - 0x89, 0xc0, 0x08, 0x43, 0xa9, 0x7d, 0x3e, 0x6c, 0x7b, 0x7f, 0xa4, 0x18, 0x6d, 0x5a, 0xf5, 0x3c, - 0x89, 0x48, 0xf4, 0x02, 0xf2, 0xed, 0xf6, 0x01, 0xfe, 0xa9, 0xd2, 0x76, 0x3f, 0x43, 0x5b, 0xfb, - 0x80, 0x48, 0x14, 0x42, 0x50, 0x38, 0x75, 0xfb, 0x1c, 0x6f, 0xa8, 0x73, 0xa9, 0x35, 0xba, 0x07, - 0xc5, 0x53, 0x37, 0xec, 0x53, 0x81, 0xef, 0x2a, 0x9f, 0x0d, 0x85, 0x5e, 0x43, 0xe9, 0xbd, 0xef, - 0x0d, 0x3d, 0xc1, 0xf1, 0xbd, 0x65, 0x97, 0x53, 0x83, 0x8e, 0x47, 0x82, 0x44, 0x78, 0x79, 0x5a, - 0x15, 0x6f, 0x1a, 0xe2, 0x9f, 0x29, 0x9d, 0x11, 0x29, 0x77, 0x4c, 0xb8, 0x30, 0xde, 0xb4, 0xea, - 0x65, 0x12, 0x91, 0xf2, 0x68, 0x27, 0x63, 0xdf, 0xc7, 0xf7, 0x15, 0x5b, 0xad, 0xf5, 0xb7, 0x97, - 0x69, 0x70, 0x32, 0xe6, 0xe7, 0xd8, 0x56, 0x3b, 0x09, 0xce, 0x6c, 0xff, 0x2d, 0x73, 0x7b, 0xf8, - 0x41, 0x72, 0x5f, 0x72, 0xd0, 0x21, 0xac, 0xb6, 0x55, 0x5b, 0x3a, 0x51, 0xcd, 0x08, 0x3f, 0x54, - 0x7e, 0x3c, 0x6f, 0xc8, 0xce, 0xd5, 0x88, 0x3a, 0x97, 0xf4, 0x21, 0xd9, 0xbc, 0x1a, 0x1a, 0x4c, - 0x52, 0xa2, 0x51, 0x5d, 0xfd, 0x74, 0x56, 0x57, 0x6d, 0x28, 0xff, 0x46, 0x26, 0xb9, 0x64, 0x3f, - 0x52, 0xec, 0x98, 0x96, 0xc9, 0xb4, 0x13, 0x04, 0x4c, 0xb8, 0xba, 0xee, 0x3e, 0x56, 0xe1, 0x4e, - 0xb2, 0xd0, 0x57, 0x70, 0xef, 0xa3, 0x27, 0xce, 0x4f, 0x42, 0x36, 0xa1, 0x81, 0x1b, 0x74, 0x69, - 0x54, 0xd1, 0xf1, 0xa6, 0x72, 0x23, 0x63, 0xd7, 0xfe, 0x35, 0xa0, 0xf9, 0xea, 0x25, 0x4f, 0x37, - 0xa0, 0xd3, 0xa8, 0xea, 0x0f, 0xe8, 0x54, 0x16, 0xb0, 0x89, 0xeb, 0x8f, 0xa3, 0xda, 0xab, 0x89, - 0x6f, 0x72, 0x5f, 0x5b, 0xf6, 0xb7, 0xb0, 0x96, 0x2e, 0x2c, 0xb7, 0x92, 0x7e, 0x0d, 0xd5, 0xc4, - 0xed, 0xb9, 0x8d, 0xa8, 0xf3, 0x2f, 0x0b, 0xaa, 0x89, 0x2b, 0xae, 0x92, 0x71, 0x3a, 0xa2, 0x46, - 0x58, 0xad, 0xd1, 0x2e, 0xac, 0xec, 0x08, 0x11, 0xca, 0x56, 0x25, 0xf3, 0xf9, 0x97, 0xd7, 0x16, - 0x8a, 0x86, 0x82, 0xeb, 0xab, 0xac, 0x45, 0x65, 0xf0, 0xf7, 0x28, 0x17, 0x5e, 0xa0, 0x42, 0xad, - 0x3a, 0x4b, 0x85, 0x24, 0x59, 0xf6, 0xd7, 0x00, 0x33, 0xb1, 0x5b, 0xf9, 0xf0, 0x0f, 0x0b, 0xee, - 0xcc, 0x55, 0xc3, 0x85, 0x9e, 0x1c, 0xa4, 0x3d, 0xd9, 0xbe, 0x61, 0x65, 0x9d, 0xf7, 0xe7, 0xff, - 0x38, 0xed, 0x11, 0x14, 0x75, 0x0b, 0x5a, 0x78, 0x42, 0x1b, 0xca, 0x7b, 0x1e, 0x77, 0x3b, 0x3e, - 0xed, 0x29, 0xd1, 0x32, 0x89, 0x69, 0xd5, 0xff, 0xd4, 0xe9, 0x75, 0xf4, 0x34, 0xe1, 0xe8, 0x5a, - 0x83, 0xd6, 0x20, 0x17, 0xcf, 0x4e, 0xb9, 0xc3, 0x3d, 0x09, 0x96, 0x8d, 0x5f, 0xbb, 0x5a, 0x21, - 0x9a, 0x70, 0x5a, 0x50, 0xd4, 0xd5, 0x6b, 0x0e, 0x6f, 0x43, 0xb9, 0xe5, 0xf9, 0x54, 0xcd, 0x0f, - 0xfa, 0xcc, 0x31, 0x2d, 0xdd, 0xdb, 0x0f, 0x26, 0xc6, 0xac, 0x5c, 0x3a, 0x3f, 0x24, 0xc6, 0x04, - 0xe9, 0x87, 0x9a, 0x28, 0x8c, 0x1f, 0x6a, 0x8e, 0xb8, 0x07, 0xc5, 0x16, 0x0b, 0x87, 0xae, 0x30, - 0xca, 0x0c, 0x25, 0x5b, 0xd3, 0x61, 0x3f, 0x60, 0x21, 0x6d, 0x0b, 0x57, 0x8c, 0xb5, 0x2b, 0x65, - 0x92, 0xe2, 0x39, 0x0e, 0xac, 0x1d, 0x06, 0x7c, 0x44, 0xbb, 0x22, 0x7b, 0x24, 0x3d, 0x86, 0x4f, - 0x62, 0x8c, 0x19, 0x46, 0x13, 0x33, 0x95, 0x75, 0xfb, 0x99, 0xea, 0xef, 0x16, 0x54, 0xe2, 0xaa, - 0x89, 0x9a, 0x50, 0x54, 0x5f, 0x2c, 0x9a, 0x6c, 0x5f, 0x5c, 0x53, 0x66, 0x1b, 0x1f, 0x14, 0xda, - 0x74, 0x2f, 0x2d, 0x6a, 0x7f, 0x84, 0x6a, 0x82, 0xbd, 0x20, 0x49, 0xb6, 0x93, 0x49, 0x92, 0xd9, - 0x76, 0xb4, 0x91, 0x64, 0x0a, 0xed, 0x41, 0x51, 0x33, 0x17, 0x86, 0x1e, 0x41, 0xe1, 0xc0, 0x0d, - 0x75, 0xfa, 0xe4, 0x89, 0x5a, 0x4b, 0x5e, 0x9b, 0x9d, 0x09, 0x15, 0xee, 0x3c, 0x51, 0x6b, 0xe7, - 0x9f, 0x16, 0xd4, 0xcc, 0x98, 0x6a, 0x22, 0x48, 0x61, 0x5d, 0xdf, 0x62, 0x1a, 0xc6, 0x95, 0x4f, - 0xfb, 0xff, 0x7a, 0x49, 0x28, 0x23, 0x68, 0xe3, 0xaa, 0xac, 0x8e, 0xc6, 0x9c, 0x4a, 0xbb, 0x09, - 0x77, 0x17, 0x42, 0x6f, 0x75, 0x8d, 0x9e, 0xc3, 0x9d, 0xd9, 0x00, 0x9e, 0x9d, 0x27, 0x1b, 0x80, - 0x92, 0x30, 0x33, 0xa0, 0x3f, 0x86, 0xaa, 0x7c, 0xd0, 0x64, 0x8b, 0x39, 0xb0, 0xaa, 0x01, 0x26, - 0x32, 0x08, 0x0a, 0x03, 0x3a, 0xd5, 0xd9, 0x50, 0x21, 0x6a, 0xed, 0xfc, 0xcd, 0x92, 0xef, 0x92, - 0xd1, 0x58, 0xbc, 0xa3, 0x9c, 0xbb, 0x7d, 0x99, 0x80, 0x85, 0xc3, 0xc0, 0x13, 0x26, 0xfb, 0x3e, - 0xcb, 0x7a, 0x9f, 0x8c, 0xc6, 0x42, 0xc2, 0x8c, 0xd4, 0xc1, 0x4f, 0x88, 0x92, 0x42, 0xaf, 0xa0, - 0xb0, 0xe7, 0x0a, 0xd7, 0xe4, 0x42, 0xc6, 0x34, 0x26, 0x11, 0x09, 0x41, 0x49, 0xee, 0x96, 0xe4, - 0x23, 0x6c, 0x34, 0x16, 0xce, 0x33, 0x58, 0xbf, 0xaa, 0x7d, 0x81, 0x6b, 0x5f, 0x42, 0x35, 0xa1, - 0x45, 0xdd, 0xed, 0xe3, 0x96, 0x02, 0x94, 0x89, 0x5c, 0x4a, 0x5f, 0xe3, 0x83, 0xac, 0x6a, 0x1b, - 0xce, 0x27, 0x50, 0x53, 0xaa, 0xe3, 0x08, 0xfe, 0x29, 0x07, 0xa5, 0x48, 0xc5, 0xab, 0x94, 0xdf, - 0x4f, 0xb2, 0xfc, 0x9e, 0x77, 0xf9, 0x25, 0x14, 0x64, 0x8d, 0x31, 0x2e, 0x67, 0x8c, 0x32, 0xad, - 0x5e, 0x42, 0x4c, 0xc2, 0xd1, 0x77, 0x50, 0x24, 0x94, 0xcb, 0xb1, 0x4b, 0x3f, 0x50, 0x9e, 0x2e, - 0x16, 0xd4, 0x98, 0x99, 0xb0, 0x11, 0x92, 0xe2, 0x6d, 0xaf, 0x1f, 0xb8, 0x3e, 0x2e, 0x2c, 0x13, - 0xd7, 0x98, 0x84, 0xb8, 0x66, 0xcc, 0xc2, 0xfd, 0x17, 0x0b, 0xaa, 0x4b, 0x43, 0xbd, 0xfc, 0x09, - 0x39, 0xf7, 0xac, 0xcd, 0xff, 0x8f, 0xcf, 0xda, 0x3f, 0xe7, 0xd2, 0x8a, 0xd4, 0x04, 0x26, 0xef, - 0xd3, 0x88, 0x79, 0x81, 0x30, 0x29, 0x9b, 0xe0, 0xc8, 0x83, 0x36, 0x87, 0x3d, 0xd3, 0x18, 0xe4, - 0x52, 0x5e, 0xb3, 0x23, 0x26, 0x79, 0x55, 0x95, 0x06, 0x9a, 0x98, 0x95, 0xfd, 0xbc, 0x29, 0xfb, - 0x32, 0x35, 0xde, 0x73, 0x1a, 0xaa, 0xc0, 0x55, 0x88, 0x5a, 0xcb, 0x4a, 0x7f, 0xc4, 0x14, 0x77, - 0x45, 0x09, 0x1b, 0x4a, 0x59, 0xb9, 0xe8, 0xe1, 0xa2, 0x0e, 0x47, 0xf3, 0x22, 0xb2, 0x72, 0xd1, - 0xc3, 0xa5, 0xd8, 0xca, 0x85, 0xb2, 0x72, 0x2a, 0xa6, 0xb8, 0xac, 0x13, 0xf0, 0x54, 0x4c, 0x65, - 0x2b, 0x22, 0xcc, 0xf7, 0x3b, 0x6e, 0x77, 0x80, 0x2b, 0xba, 0x07, 0x46, 0xb4, 0x9c, 0x55, 0x65, - 0xcc, 0x3d, 0xd7, 0x57, 0xaf, 0x9a, 0x32, 0x89, 0x48, 0x67, 0x07, 0x2a, 0x71, 0xaa, 0xc8, 0xee, - 0xd6, 0xea, 0xa9, 0x4f, 0x51, 0x23, 0xb9, 0x56, 0x2f, 0xca, 0xf2, 0xdc, 0x7c, 0x96, 0xe7, 0x13, - 0x59, 0xfe, 0x0a, 0x6a, 0xa9, 0xa4, 0x91, 0x20, 0xc2, 0x2e, 0xb8, 0x51, 0xa4, 0xd6, 0x92, 0xd7, - 0x64, 0xbe, 0x7e, 0xb7, 0xd7, 0x88, 0x5a, 0x3b, 0x4f, 0xa1, 0x96, 0x4a, 0x97, 0x45, 0x75, 0xd9, - 0x79, 0x02, 0x35, 0xdd, 0xe0, 0xb2, 0xcb, 0xce, 0x7f, 0x2c, 0x58, 0x8b, 0x30, 0xa6, 0xf2, 0xfc, - 0x0a, 0xca, 0x13, 0x1a, 0x0a, 0x7a, 0x19, 0xf7, 0x22, 0x3c, 0x3f, 0x2a, 0x7f, 0x50, 0x08, 0x12, - 0x23, 0xd1, 0x37, 0x50, 0xe6, 0x4a, 0x0f, 0x8d, 0x66, 0x9d, 0x47, 0x59, 0x52, 0xc6, 0x5e, 0x8c, - 0x47, 0x5b, 0x50, 0xf0, 0x59, 0x9f, 0xab, 0xef, 0x5e, 0xdd, 0x7e, 0x90, 0x25, 0xf7, 0x96, 0xf5, - 0x89, 0x02, 0xa2, 0x37, 0x50, 0xbe, 0x70, 0xc3, 0xc0, 0x0b, 0xfa, 0xd1, 0x7b, 0xff, 0x71, 0x96, - 0xd0, 0x47, 0x8d, 0x23, 0xb1, 0x80, 0x53, 0x93, 0x97, 0xe8, 0x8c, 0x99, 0x98, 0x38, 0xbf, 0x95, - 0xb9, 0x2c, 0x49, 0xe3, 0xfe, 0x21, 0xd4, 0xf4, 0x7d, 0xf8, 0x40, 0x43, 0x2e, 0x27, 0x47, 0x6b, - 0xd9, 0x9d, 0xdd, 0x4d, 0x42, 0x49, 0x5a, 0xd2, 0xf9, 0xd1, 0xb4, 0xbb, 0x88, 0x21, 0x73, 0x69, - 0xe4, 0x76, 0x07, 0x6e, 0x3f, 0xfa, 0x4e, 0x11, 0x29, 0x77, 0x26, 0xc6, 0x9e, 0xbe, 0xb6, 0x11, - 0x29, 0x73, 0x33, 0xa4, 0x13, 0x8f, 0xcf, 0x86, 0xd8, 0x98, 0xde, 0xfe, 0x6b, 0x09, 0xa0, 0x19, - 0x9f, 0x07, 0x9d, 0xc0, 0x8a, 0xb2, 0x87, 0x9c, 0xa5, 0xcd, 0x53, 0xf9, 0x6d, 0x3f, 0xbd, 0x41, - 0x83, 0x45, 0x1f, 0x64, 0xf2, 0xab, 0xa1, 0x07, 0x3d, 0xcb, 0x2a, 0x13, 0xc9, 0xb9, 0xc9, 0x7e, - 0x7e, 0x0d, 0xca, 0xe8, 0x7d, 0x0f, 0x45, 0x9d, 0x05, 0x28, 0xab, 0x16, 0x26, 0xf3, 0xd6, 0x7e, - 0xb6, 0x1c, 0xa4, 0x95, 0x7e, 0x6e, 0x21, 0x62, 0x2a, 0x25, 0x72, 0x96, 0xb4, 0x42, 0x73, 0x63, - 0xb2, 0x02, 0x90, 0xea, 0x3a, 0x75, 0x0b, 0x7d, 0x0f, 0x45, 0x5d, 0xeb, 0xd0, 0xa7, 0x8b, 0x05, - 0x22, 0x7d, 0xcb, 0xb7, 0xeb, 0xd6, 0xe7, 0x16, 0x7a, 0x07, 0x05, 0xd9, 0xe4, 0x51, 0x46, 0xc7, - 0x4a, 0x4c, 0x08, 0xb6, 0xb3, 0x0c, 0x62, 0xa2, 0xf8, 0x23, 0xc0, 0x6c, 0xd4, 0x40, 0x19, 0xff, - 0xda, 0xcc, 0xcd, 0x2c, 0x76, 0xfd, 0x7a, 0xa0, 0x31, 0xf0, 0x4e, 0xf6, 0xd9, 0x33, 0x86, 0x32, - 0x3b, 0x6c, 0x7c, 0x8d, 0x6c, 0x67, 0x19, 0xc4, 0xa8, 0x3b, 0x87, 0x5a, 0xea, 0x5f, 0x5d, 0xf4, - 0x8b, 0x6c, 0x27, 0xaf, 0xfe, 0x49, 0x6c, 0xbf, 0xb8, 0x11, 0xd6, 0x58, 0x12, 0xc9, 0x59, 0xcd, - 0x6c, 0xa3, 0xc6, 0x75, 0x7e, 0xa7, 0xff, 0xa1, 0xb5, 0xb7, 0x6e, 0x8c, 0xd7, 0x56, 0x77, 0x0b, - 0xbf, 0xcb, 0x8d, 0x3a, 0x9d, 0xa2, 0xfa, 0xb3, 0xfb, 0xcb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, - 0xc1, 0x07, 0x8b, 0x2b, 0x8a, 0x17, 0x00, 0x00, + // 1959 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x6d, 0x6f, 0xdb, 0xc8, + 0xf1, 0xff, 0x53, 0x92, 0xf5, 0x30, 0xb2, 0x1c, 0x67, 0xff, 0x4e, 0xba, 0x61, 0x72, 0x89, 0xc3, + 0x24, 0x57, 0xa1, 0x29, 0xe4, 0x3b, 0x5f, 0xd3, 0x5c, 0x2e, 0x77, 0x40, 0x6d, 0xc9, 0xaa, 0x7d, + 0x48, 0x6c, 0x63, 0xe5, 0x24, 0x68, 0x0f, 0xe8, 0x81, 0x92, 0xd6, 0x32, 0x21, 0x8a, 0xab, 0x72, + 0x57, 0xb6, 0xd5, 0x57, 0x7d, 0xd1, 0xbe, 0x2b, 0xfa, 0x3d, 0x8a, 0x7e, 0x84, 0xbe, 0x2a, 0xd0, + 0x0f, 0xd4, 0x8f, 0x50, 0xec, 0x03, 0x29, 0xd2, 0x12, 0x65, 0xbb, 0x7d, 0xa5, 0x9d, 0xd9, 0xdf, + 0xcc, 0xec, 0x0c, 0x67, 0x67, 0x66, 0x05, 0xeb, 0x3d, 0x16, 0x88, 0x90, 0xf9, 0x3e, 0x0d, 0x1b, + 0xe3, 0x90, 0x09, 0x86, 0x36, 0xba, 0x13, 0xcf, 0xef, 0x5f, 0x36, 0x12, 0x1b, 0xe7, 0x5f, 0xda, + 0x6f, 0x07, 0x9e, 0x38, 0x9b, 0x74, 0x1b, 0x3d, 0x36, 0xda, 0x1a, 0xb1, 0xee, 0x74, 0x4b, 0xa1, + 0x86, 0x9e, 0xd8, 0x72, 0xc7, 0xde, 0x16, 0xa7, 0xe1, 0xb9, 0xd7, 0xa3, 0x7c, 0xcb, 0x08, 0x45, + 0xbf, 0x5a, 0xa5, 0xfd, 0x2a, 0x53, 0x98, 0xb3, 0x49, 0xd8, 0xa3, 0x63, 0xe6, 0x7b, 0xbd, 0xe9, + 0xd6, 0xb8, 0xbb, 0xa5, 0x57, 0x5a, 0xcc, 0xa9, 0xc3, 0xc6, 0x3b, 0x8f, 0x8b, 0xe3, 0x90, 0xf5, + 0x28, 0xe7, 0x94, 0x13, 0xfa, 0xfb, 0x09, 0xe5, 0x02, 0xad, 0x43, 0x9e, 0xd0, 0x53, 0x6c, 0x6d, + 0x5a, 0xf5, 0x0a, 0x91, 0x4b, 0xe7, 0x18, 0xee, 0x5d, 0x41, 0xf2, 0x31, 0x0b, 0x38, 0x45, 0xaf, + 0x61, 0xe5, 0x20, 0x38, 0x65, 0x1c, 0x5b, 0x9b, 0xf9, 0x7a, 0x75, 0xfb, 0x69, 0x63, 0x91, 0x73, + 0x0d, 0x23, 0x27, 0x91, 0x44, 0xe3, 0x1d, 0x0e, 0xd5, 0x04, 0x17, 0x3d, 0x82, 0x4a, 0x44, 0xb6, + 0x8c, 0xe1, 0x19, 0x03, 0xb5, 0x61, 0xf5, 0x20, 0x38, 0x67, 0x43, 0xda, 0x64, 0xc1, 0xa9, 0x37, + 0xc0, 0xb9, 0x4d, 0xab, 0x5e, 0xdd, 0x76, 0x16, 0x1b, 0x4b, 0x22, 0x49, 0x4a, 0xce, 0xf9, 0x1e, + 0x70, 0xcb, 0xe3, 0x3d, 0x16, 0x04, 0xb4, 0x17, 0x39, 0x93, 0xe9, 0x74, 0xfa, 0x4c, 0xb9, 0x2b, + 0x67, 0x72, 0x1e, 0xc2, 0x83, 0x05, 0xba, 0x74, 0x58, 0x9c, 0xdf, 0xc1, 0xea, 0xae, 0x3c, 0x5b, + 0xb6, 0xf2, 0x6f, 0xa1, 0x74, 0x34, 0x16, 0x1e, 0x0b, 0xf8, 0x72, 0x6f, 0x94, 0x1a, 0x83, 0x24, + 0x91, 0x88, 0xf3, 0xaf, 0x55, 0x63, 0xc0, 0x30, 0xd0, 0x26, 0x54, 0x9b, 0x2c, 0x10, 0xf4, 0x52, + 0x1c, 0xbb, 0xe2, 0xcc, 0x18, 0x4a, 0xb2, 0xd0, 0xe7, 0xb0, 0xd6, 0x62, 0xbd, 0x21, 0x0d, 0x4f, + 0x3d, 0x9f, 0x1e, 0xba, 0x23, 0x6a, 0x5c, 0xba, 0xc2, 0x45, 0xdf, 0x49, 0xaf, 0xbd, 0x40, 0xb4, + 0x27, 0x41, 0x0f, 0xe7, 0xd5, 0xd1, 0x9e, 0x64, 0x7d, 0x55, 0x03, 0x23, 0x33, 0x09, 0xf4, 0x03, + 0xd4, 0xa4, 0x9a, 0xbe, 0x31, 0xcd, 0x71, 0x41, 0x25, 0xc6, 0xab, 0xeb, 0xbd, 0x6b, 0xa4, 0xe4, + 0xf6, 0x02, 0x11, 0x4e, 0x49, 0x5a, 0x17, 0xda, 0x80, 0x95, 0x1d, 0xdf, 0x67, 0x17, 0x78, 0x65, + 0x33, 0x5f, 0xaf, 0x10, 0x4d, 0xa0, 0x5f, 0x42, 0x69, 0x47, 0x08, 0xca, 0x05, 0xc7, 0x45, 0x65, + 0xec, 0xd1, 0x62, 0x63, 0x1a, 0x44, 0x22, 0x30, 0x3a, 0x82, 0x8a, 0xb2, 0xbf, 0x13, 0x0e, 0x38, + 0x2e, 0x29, 0xc9, 0x2f, 0x6f, 0x70, 0xcc, 0x58, 0x46, 0x1f, 0x71, 0xa6, 0x03, 0xed, 0x41, 0xa5, + 0xe9, 0xf6, 0xce, 0x68, 0x3b, 0x64, 0x23, 0x5c, 0x56, 0x0a, 0x7f, 0xba, 0x58, 0xa1, 0x82, 0x19, + 0x85, 0x46, 0x4d, 0x2c, 0x89, 0x76, 0xa0, 0xa4, 0x88, 0x13, 0x86, 0x2b, 0xb7, 0x53, 0x12, 0xc9, + 0x21, 0x07, 0x56, 0x9b, 0x83, 0x90, 0x4d, 0xc6, 0xc7, 0x6e, 0x48, 0x03, 0x81, 0x41, 0x7d, 0xea, + 0x14, 0x0f, 0xbd, 0x85, 0xd2, 0xde, 0xe5, 0x98, 0x85, 0x82, 0xe3, 0xea, 0xb2, 0xcb, 0xab, 0x41, + 0xc6, 0x80, 0x91, 0x40, 0x8f, 0x01, 0xf6, 0x2e, 0x45, 0xe8, 0xee, 0x33, 0x19, 0xf6, 0x55, 0xf5, + 0x39, 0x12, 0x1c, 0xd4, 0x86, 0xe2, 0x3b, 0xb7, 0x4b, 0x7d, 0x8e, 0x6b, 0x4a, 0x77, 0xe3, 0x06, + 0x81, 0xd5, 0x02, 0xda, 0x90, 0x91, 0x96, 0x79, 0x7d, 0x48, 0xc5, 0x05, 0x0b, 0x87, 0xef, 0x59, + 0x9f, 0xe2, 0x35, 0x9d, 0xd7, 0x09, 0x16, 0x7a, 0x0e, 0xb5, 0x43, 0xa6, 0x83, 0xe7, 0xf9, 0x82, + 0x86, 0xf8, 0x8e, 0x3a, 0x4c, 0x9a, 0xa9, 0xee, 0xb2, 0xef, 0x8a, 0x53, 0x16, 0x8e, 0x38, 0x5e, + 0x57, 0x88, 0x19, 0x43, 0x66, 0x50, 0x87, 0xf6, 0x42, 0x2a, 0x38, 0xbe, 0xbb, 0x2c, 0x83, 0x34, + 0x88, 0x44, 0x60, 0x84, 0xa1, 0xd4, 0x39, 0x1b, 0x75, 0xbc, 0x3f, 0x50, 0x8c, 0x36, 0xad, 0x7a, + 0x9e, 0x44, 0x24, 0x7a, 0x09, 0xf9, 0x4e, 0x67, 0x1f, 0xff, 0xbf, 0xd2, 0xf6, 0x20, 0x43, 0x5b, + 0x67, 0x9f, 0x48, 0x14, 0x42, 0x50, 0x38, 0x71, 0x07, 0x1c, 0x6f, 0xa8, 0x73, 0xa9, 0x35, 0xba, + 0x0f, 0xc5, 0x13, 0x37, 0x1c, 0x50, 0x81, 0xef, 0x29, 0x9f, 0x0d, 0x85, 0xde, 0x40, 0xe9, 0x83, + 0xef, 0x8d, 0x3c, 0xc1, 0xf1, 0xfd, 0x65, 0x97, 0x53, 0x83, 0x8e, 0xc6, 0x82, 0x44, 0x78, 0x79, + 0x5a, 0x15, 0x6f, 0x1a, 0xe2, 0x9f, 0x28, 0x9d, 0x11, 0x29, 0x77, 0x4c, 0xb8, 0x30, 0xde, 0xb4, + 0xea, 0x65, 0x12, 0x91, 0xf2, 0x68, 0xc7, 0x13, 0xdf, 0xc7, 0x0f, 0x14, 0x5b, 0xad, 0xf5, 0xb7, + 0x97, 0x69, 0x70, 0x3c, 0xe1, 0x67, 0xd8, 0x56, 0x3b, 0x09, 0xce, 0x6c, 0xff, 0x1d, 0x73, 0xfb, + 0xf8, 0x61, 0x72, 0x5f, 0x72, 0xd0, 0x01, 0xac, 0x76, 0x54, 0x5b, 0x3a, 0x56, 0xcd, 0x08, 0x3f, + 0x52, 0x7e, 0xbc, 0x68, 0xc8, 0xce, 0xd5, 0x88, 0x3a, 0x97, 0xf4, 0x21, 0xd9, 0xbc, 0x1a, 0x1a, + 0x4c, 0x52, 0xa2, 0x51, 0x5d, 0xfd, 0x6c, 0x56, 0x57, 0x6d, 0x28, 0xff, 0x5a, 0x26, 0xb9, 0x64, + 0x3f, 0x56, 0xec, 0x98, 0x96, 0xc9, 0xb4, 0x13, 0x04, 0x4c, 0xb8, 0xba, 0xee, 0x3e, 0x51, 0xe1, + 0x4e, 0xb2, 0xd0, 0x36, 0x6c, 0x7c, 0xf2, 0xc4, 0x59, 0x8b, 0x0a, 0xd7, 0xf3, 0x69, 0x3f, 0xaa, + 0xe7, 0x78, 0x53, 0x39, 0xb1, 0x70, 0xcf, 0xfe, 0x15, 0xa0, 0xf9, 0xca, 0x25, 0x4f, 0x36, 0xa4, + 0xd3, 0xa8, 0xe2, 0x0f, 0xe9, 0x54, 0x16, 0xaf, 0x73, 0xd7, 0x9f, 0x44, 0x75, 0x57, 0x13, 0xdf, + 0xe4, 0xbe, 0xb6, 0xec, 0x6f, 0x61, 0x2d, 0x5d, 0x54, 0x6e, 0x25, 0xfd, 0x06, 0xaa, 0x89, 0x9b, + 0x73, 0x1b, 0x51, 0xe7, 0x9f, 0x16, 0x54, 0x13, 0xd7, 0x5b, 0x25, 0xe2, 0x74, 0x4c, 0x8d, 0xb0, + 0x5a, 0xa3, 0x5d, 0x58, 0xd9, 0x11, 0x22, 0x94, 0x6d, 0x4a, 0xe6, 0xf2, 0xcf, 0xaf, 0x2d, 0x12, + 0x0d, 0x05, 0xd7, 0xd7, 0x58, 0x8b, 0xca, 0xc0, 0xb7, 0x28, 0x17, 0x5e, 0xa0, 0xc2, 0xac, 0xba, + 0x4a, 0x85, 0x24, 0x59, 0xf6, 0xd7, 0x00, 0x33, 0xb1, 0x5b, 0xf9, 0xf0, 0x77, 0x0b, 0xee, 0xce, + 0x55, 0xc2, 0x85, 0x9e, 0xec, 0xa7, 0x3d, 0xd9, 0xbe, 0x61, 0x55, 0x9d, 0xf7, 0xe7, 0x7f, 0x38, + 0xed, 0x21, 0x14, 0x75, 0xfb, 0x59, 0x78, 0x42, 0x1b, 0xca, 0x2d, 0x8f, 0xbb, 0x5d, 0x9f, 0xf6, + 0x95, 0x68, 0x99, 0xc4, 0xb4, 0xea, 0x7d, 0xea, 0xf4, 0x3a, 0x7a, 0x9a, 0x70, 0x74, 0x9d, 0x41, + 0x6b, 0x90, 0x8b, 0xe7, 0xa6, 0xdc, 0x41, 0x4b, 0x82, 0x65, 0xd3, 0xd7, 0xae, 0x56, 0x88, 0x26, + 0x9c, 0x36, 0x14, 0x75, 0xe5, 0x9a, 0xc3, 0xdb, 0x50, 0x6e, 0x7b, 0x3e, 0x55, 0xb3, 0x83, 0x3e, + 0x73, 0x4c, 0x4b, 0xf7, 0xf6, 0x82, 0x73, 0x63, 0x56, 0x2e, 0x9d, 0x1f, 0x12, 0x23, 0x82, 0xf4, + 0x43, 0x4d, 0x13, 0xc6, 0x0f, 0x35, 0x43, 0xdc, 0x87, 0x62, 0x9b, 0x85, 0x23, 0x57, 0x18, 0x65, + 0x86, 0x92, 0x6d, 0xe9, 0x60, 0x10, 0xb0, 0x90, 0x76, 0x84, 0x2b, 0x26, 0xda, 0x95, 0x32, 0x49, + 0xf1, 0x1c, 0x07, 0xd6, 0x0e, 0x02, 0x3e, 0xa6, 0x3d, 0x91, 0x3d, 0x8e, 0x1e, 0xc1, 0x9d, 0x18, + 0x63, 0x06, 0xd1, 0xc4, 0x3c, 0x65, 0xdd, 0x7e, 0x9e, 0xfa, 0x9b, 0x05, 0x95, 0xb8, 0x62, 0xa2, + 0x26, 0x14, 0xd5, 0x17, 0x8b, 0xa6, 0xda, 0x97, 0xd7, 0x94, 0xd8, 0xc6, 0x47, 0x85, 0x36, 0x9d, + 0x4b, 0x8b, 0xda, 0x9f, 0xa0, 0x9a, 0x60, 0x2f, 0x48, 0x92, 0xed, 0x64, 0x92, 0x64, 0xb6, 0x1c, + 0x6d, 0x24, 0x99, 0x42, 0x2d, 0x28, 0x6a, 0xe6, 0xc2, 0xd0, 0x23, 0x28, 0xec, 0xbb, 0xa1, 0x4e, + 0x9f, 0x3c, 0x51, 0x6b, 0xc9, 0xeb, 0xb0, 0x53, 0xa1, 0xc2, 0x9d, 0x27, 0x6a, 0xed, 0xfc, 0xc3, + 0x82, 0x9a, 0x19, 0x51, 0x4d, 0x04, 0x29, 0xac, 0xeb, 0x5b, 0x4c, 0xc3, 0xb8, 0xee, 0x69, 0xff, + 0xdf, 0x2c, 0x09, 0x65, 0x04, 0x6d, 0x5c, 0x95, 0xd5, 0xd1, 0x98, 0x53, 0x69, 0x37, 0xe1, 0xde, + 0x42, 0xe8, 0xad, 0xae, 0xd1, 0x0b, 0xb8, 0x3b, 0x1b, 0xbe, 0xb3, 0xf3, 0x64, 0x03, 0x50, 0x12, + 0x66, 0x86, 0xf3, 0x27, 0x50, 0x95, 0x8f, 0x99, 0x6c, 0x31, 0x07, 0x56, 0x35, 0xc0, 0x44, 0x06, + 0x41, 0x61, 0x48, 0xa7, 0x3a, 0x1b, 0x2a, 0x44, 0xad, 0x9d, 0xbf, 0x5a, 0xf2, 0x4d, 0x32, 0x9e, + 0x88, 0xf7, 0x94, 0x73, 0x77, 0x20, 0x13, 0xb0, 0x70, 0x10, 0x78, 0xc2, 0x64, 0xdf, 0xe7, 0x59, + 0x6f, 0x93, 0xf1, 0x44, 0x48, 0x98, 0x91, 0xda, 0xff, 0x3f, 0xa2, 0xa4, 0xd0, 0x6b, 0x28, 0xb4, + 0x5c, 0xe1, 0x9a, 0x5c, 0xc8, 0x98, 0xc4, 0x24, 0x22, 0x21, 0x28, 0xc9, 0xdd, 0x92, 0x7c, 0x80, + 0x8d, 0x27, 0xc2, 0x79, 0x0e, 0xeb, 0x57, 0xb5, 0x2f, 0x70, 0xed, 0x2b, 0xa8, 0x26, 0xb4, 0xa8, + 0xbb, 0x7d, 0xd4, 0x56, 0x80, 0x32, 0x91, 0x4b, 0xe9, 0x6b, 0x7c, 0x90, 0x55, 0x6d, 0xc3, 0xb9, + 0x03, 0x35, 0xa5, 0x3a, 0x8e, 0xe0, 0x1f, 0x73, 0x50, 0x8a, 0x54, 0xbc, 0x4e, 0xf9, 0xfd, 0x34, + 0xcb, 0xef, 0x79, 0x97, 0x5f, 0x41, 0x41, 0xd6, 0x18, 0xe3, 0x72, 0xc6, 0x18, 0xd3, 0xee, 0x27, + 0xc4, 0x24, 0x1c, 0x7d, 0x07, 0x45, 0x42, 0xb9, 0x1c, 0xb9, 0xf4, 0xe3, 0xe4, 0xd9, 0x62, 0x41, + 0x8d, 0x99, 0x09, 0x1b, 0x21, 0x29, 0xde, 0xf1, 0x06, 0x81, 0xeb, 0xe3, 0xc2, 0x32, 0x71, 0x8d, + 0x49, 0x88, 0x6b, 0xc6, 0x2c, 0xdc, 0x7f, 0xb6, 0xa0, 0xba, 0x34, 0xd4, 0xcb, 0x9f, 0x8f, 0x73, + 0x4f, 0xda, 0xfc, 0x7f, 0xf9, 0xa4, 0xfd, 0x53, 0x2e, 0xad, 0x48, 0x4d, 0x5f, 0xf2, 0x3e, 0x8d, + 0x99, 0x17, 0x08, 0x93, 0xb2, 0x09, 0x8e, 0x3c, 0x68, 0x73, 0xd4, 0x37, 0x8d, 0x41, 0x2e, 0xe5, + 0x35, 0x3b, 0x64, 0x92, 0x57, 0x55, 0x69, 0xa0, 0x89, 0x59, 0xd9, 0xcf, 0x9b, 0xb2, 0x2f, 0x53, + 0xe3, 0x03, 0xa7, 0xa1, 0x0a, 0x5c, 0x85, 0xa8, 0xb5, 0xac, 0xf4, 0x87, 0x4c, 0x71, 0x57, 0x94, + 0xb0, 0xa1, 0x94, 0x95, 0x8b, 0x3e, 0x2e, 0xea, 0x70, 0x34, 0x2f, 0x22, 0x2b, 0x17, 0x7d, 0x5c, + 0x8a, 0xad, 0x5c, 0x28, 0x2b, 0x27, 0x62, 0x8a, 0xcb, 0x3a, 0x01, 0x4f, 0xc4, 0x54, 0xb6, 0x22, + 0xc2, 0x7c, 0xbf, 0xeb, 0xf6, 0x86, 0xb8, 0xa2, 0x7b, 0x60, 0x44, 0xcb, 0x39, 0x55, 0xc6, 0xdc, + 0x73, 0x7d, 0xf5, 0xa2, 0x29, 0x93, 0x88, 0x74, 0x76, 0xa0, 0x12, 0xa7, 0x8a, 0xec, 0x6e, 0xed, + 0xbe, 0xfa, 0x14, 0x35, 0x92, 0x6b, 0xf7, 0xa3, 0x2c, 0xcf, 0xcd, 0x67, 0x79, 0x3e, 0x91, 0xe5, + 0xaf, 0xa1, 0x96, 0x4a, 0x1a, 0x09, 0x22, 0xec, 0x82, 0x1b, 0x45, 0x6a, 0x2d, 0x79, 0x4d, 0xe6, + 0xeb, 0x37, 0x7b, 0x8d, 0xa8, 0xb5, 0xf3, 0x0c, 0x6a, 0xa9, 0x74, 0x59, 0x54, 0x97, 0x9d, 0xa7, + 0x50, 0xd3, 0x0d, 0x2e, 0xbb, 0xec, 0xfc, 0xdb, 0x82, 0xb5, 0x08, 0x63, 0x2a, 0xcf, 0x2f, 0xa0, + 0x7c, 0x4e, 0x43, 0x41, 0x2f, 0xe3, 0x5e, 0x84, 0xe7, 0xc7, 0xe4, 0x8f, 0x0a, 0x41, 0x62, 0x24, + 0xfa, 0x06, 0xca, 0x5c, 0xe9, 0xa1, 0xd1, 0xac, 0xf3, 0x38, 0x4b, 0xca, 0xd8, 0x8b, 0xf1, 0x68, + 0x0b, 0x0a, 0x3e, 0x1b, 0x70, 0xf5, 0xdd, 0xab, 0xdb, 0x0f, 0xb3, 0xe4, 0xde, 0xb1, 0x01, 0x51, + 0x40, 0xf4, 0x16, 0xca, 0x17, 0x6e, 0x18, 0x78, 0xc1, 0x20, 0x7a, 0xeb, 0x3f, 0xc9, 0x12, 0xfa, + 0xa4, 0x71, 0x24, 0x16, 0x70, 0x6a, 0xf2, 0x12, 0x9d, 0x32, 0x13, 0x13, 0xe7, 0x37, 0x32, 0x97, + 0x25, 0x69, 0xdc, 0x3f, 0x80, 0x9a, 0xbe, 0x0f, 0x1f, 0x69, 0xc8, 0xe5, 0xe4, 0x68, 0x2d, 0xbb, + 0xb3, 0xbb, 0x49, 0x28, 0x49, 0x4b, 0x3a, 0x3f, 0x9a, 0x76, 0x17, 0x31, 0x64, 0x2e, 0x8d, 0xdd, + 0xde, 0xd0, 0x1d, 0x44, 0xdf, 0x29, 0x22, 0xe5, 0xce, 0xb9, 0xb1, 0xa7, 0xaf, 0x6d, 0x44, 0xca, + 0xdc, 0x0c, 0xe9, 0xb9, 0xc7, 0x67, 0x43, 0x6c, 0x4c, 0x6f, 0xff, 0xa5, 0x04, 0xd0, 0x8c, 0xcf, + 0x83, 0x8e, 0x61, 0x45, 0xd9, 0x43, 0xce, 0xd2, 0xe6, 0xa9, 0xfc, 0xb6, 0x9f, 0xdd, 0xa0, 0xc1, + 0xa2, 0x8f, 0x32, 0xf9, 0xd5, 0xd0, 0x83, 0x9e, 0x67, 0x95, 0x89, 0xe4, 0xdc, 0x64, 0xbf, 0xb8, + 0x06, 0x65, 0xf4, 0x7e, 0x80, 0xa2, 0xce, 0x02, 0x94, 0x55, 0x0b, 0x93, 0x79, 0x6b, 0x3f, 0x5f, + 0x0e, 0xd2, 0x4a, 0xbf, 0xb0, 0x10, 0x31, 0x95, 0x12, 0x39, 0x4b, 0x5a, 0xa1, 0xb9, 0x31, 0x59, + 0x01, 0x48, 0x75, 0x9d, 0xba, 0x85, 0xbe, 0x87, 0xa2, 0xae, 0x75, 0xe8, 0xb3, 0xc5, 0x02, 0x91, + 0xbe, 0xe5, 0xdb, 0x75, 0xeb, 0x0b, 0x0b, 0xbd, 0x87, 0x82, 0x6c, 0xf2, 0x28, 0xa3, 0x63, 0x25, + 0x26, 0x04, 0xdb, 0x59, 0x06, 0x31, 0x51, 0xfc, 0x11, 0x60, 0x36, 0x6a, 0xa0, 0x8c, 0x7f, 0x6c, + 0xe6, 0x66, 0x16, 0xbb, 0x7e, 0x3d, 0xd0, 0x18, 0x78, 0x2f, 0xfb, 0xec, 0x29, 0x43, 0x99, 0x1d, + 0x36, 0xbe, 0x46, 0xb6, 0xb3, 0x0c, 0x62, 0xd4, 0x9d, 0x41, 0x2d, 0xf5, 0x8f, 0x2e, 0xfa, 0x59, + 0xb6, 0x93, 0x57, 0xff, 0x20, 0xb6, 0x5f, 0xde, 0x08, 0x6b, 0x2c, 0x89, 0xe4, 0xac, 0x66, 0xb6, + 0x51, 0xe3, 0x3a, 0xbf, 0xd3, 0xff, 0xce, 0xda, 0x5b, 0x37, 0xc6, 0x6b, 0xab, 0xbb, 0x85, 0xdf, + 0xe6, 0xc6, 0xdd, 0x6e, 0x51, 0xfd, 0xd1, 0xfd, 0xd5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, + 0x6b, 0x98, 0x85, 0x86, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/controller/pb/controller.proto b/controller/pb/controller.proto index 935264455764..bc8e6faaa933 100644 --- a/controller/pb/controller.proto +++ b/controller/pb/controller.proto @@ -80,7 +80,7 @@ message BuildOptions { string Ref = 29; string GroupRef = 30; repeated string Annotations = 31; - bool WithProvenanceResponse = 32; + bool WithDetailedResponse = 32; } message ExportEntry { diff --git a/docs/reference/buildx_bake.md b/docs/reference/buildx_bake.md index d50b8f7725a8..fbb38e3443ab 100644 --- a/docs/reference/buildx_bake.md +++ b/docs/reference/buildx_bake.md @@ -122,6 +122,7 @@ $ cat metadata.json "db": { "buildx.build.provenance": {}, "buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611", + "buildx.build.status": {}, "containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66", "containerimage.descriptor": { "annotations": { @@ -137,6 +138,7 @@ $ cat metadata.json "webapp-dev": { "buildx.build.provenance": {}, "buildx.build.ref": "mybuilder/mybuilder0/kamngmcgyzebqxwu98b4lfv3n", + "buildx.build.status": {}, "containerimage.config.digest": "sha256:9651cc2b3c508f697c9c43b67b64c8359c2865c019e680aac1c11f4b875b67e0", "containerimage.descriptor": { "annotations": { @@ -161,6 +163,12 @@ $ cat metadata.json > * `max` sets full provenance. > * `disabled`, `false` or `0` does not set any provenance. +> **Note** +> +> Build record status (`buildx.build.status`) is not set by default. Set the +> `BUILDX_METADATA_STATUS` environment variable to `1` or `true` to +> include build record status. The status only includes warnings at the moment. + ### Don't use cache when building the image (--no-cache) Same as `build --no-cache`. Don't use cache when building the image. diff --git a/docs/reference/buildx_build.md b/docs/reference/buildx_build.md index ff597807b074..647d4c0254bb 100644 --- a/docs/reference/buildx_build.md +++ b/docs/reference/buildx_build.md @@ -330,6 +330,7 @@ $ cat metadata.json { "buildx.build.provenance": {}, "buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611", + "buildx.build.status": {}, "containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66", "containerimage.descriptor": { "annotations": { @@ -353,6 +354,12 @@ $ cat metadata.json > * `max` sets full provenance. > * `disabled`, `false` or `0` does not set any provenance. +> **Note** +> +> Build record status (`buildx.build.status`) is not set by default. Set the +> `BUILDX_METADATA_STATUS` environment variable to `1` or `true` to +> include build record status. The status only includes warnings at the moment. + ### Ignore build cache for specific stages (--no-cache-filter) The `--no-cache-filter` lets you specify one or more stages of a multi-stage diff --git a/tests/build.go b/tests/build.go index efe2387457c1..4e1a414994f9 100644 --- a/tests/build.go +++ b/tests/build.go @@ -16,6 +16,7 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/continuity/fs/fstest" "github.com/creack/pty" + "github.com/moby/buildkit/client" "github.com/moby/buildkit/frontend/subrequests/lint" "github.com/moby/buildkit/frontend/subrequests/outline" "github.com/moby/buildkit/frontend/subrequests/targets" @@ -60,6 +61,7 @@ var buildTests = []func(t *testing.T, sb integration.Sandbox){ testBuildShmSize, testBuildUlimit, testBuildMetadata, + testBuildMetadataStatus, testBuildMultiExporters, testBuildLoadPush, testBuildSecret, @@ -616,6 +618,43 @@ func buildMetadata(t *testing.T, sb integration.Sandbox, metadataMode string) { require.Equal(t, provenancetypes.BuildKitBuildType, prv.BuildType) } +func testBuildMetadataStatus(t *testing.T, sb integration.Sandbox) { + dockerfile := []byte(` +frOM busybox as base +cOpy Dockerfile . +from scratch +COPy --from=base \ + /Dockerfile \ + / + `) + dir := tmpdir( + t, + fstest.CreateFile("Dockerfile", dockerfile, 0600), + ) + + cmd := buildxCmd( + sb, + withArgs("build", "--metadata-file", filepath.Join(dir, "md.json"), dir), + withEnv("BUILDX_METADATA_STATUS=1"), + ) + out, err := cmd.CombinedOutput() + require.NoError(t, err, string(out)) + + dt, err := os.ReadFile(filepath.Join(dir, "md.json")) + require.NoError(t, err) + + type mdT struct { + BuildRef string `json:"buildx.build.ref"` + BuildStatus client.SolveStatus `json:"buildx.build.status"` + } + var md mdT + err = json.Unmarshal(dt, &md) + require.NoError(t, err) + + require.NotEmpty(t, md.BuildRef) + require.Len(t, md.BuildStatus.Warnings, 3) +} + func testBuildMultiExporters(t *testing.T, sb integration.Sandbox) { if !isDockerContainerWorker(sb) { t.Skip("only testing with docker-container worker") diff --git a/util/confutil/metadata.go b/util/confutil/metadata.go index 2aad9f622c56..9d0d2cfba671 100644 --- a/util/confutil/metadata.go +++ b/util/confutil/metadata.go @@ -33,3 +33,12 @@ func MetadataProvenance() MetadataProvenanceMode { } return MetadataProvenanceModeMin } + +// MetadataStatus returns true if status enabled to set in the metadata file +func MetadataStatus() bool { + bmw, err := strconv.ParseBool(os.Getenv("BUILDX_METADATA_STATUS")) + if err != nil { + return false + } + return bmw +}