From 1b3068df7c1adb200bdf0d408340e55e38a43542 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 15 Oct 2021 15:01:36 +0200 Subject: [PATCH] vendor: update buildkit Signed-off-by: CrazyMax --- go.mod | 2 +- go.sum | 7 +- .../moby/buildkit/client/llb/exec.go | 58 + .../moby/buildkit/client/llb/meta.go | 62 +- .../moby/buildkit/client/llb/state.go | 8 + .../moby/buildkit/solver/pb/caps.go | 36 +- .../moby/buildkit/solver/pb/ops.pb.go | 1340 +++++++++++------ .../moby/buildkit/solver/pb/ops.proto | 18 +- vendor/modules.txt | 2 +- 9 files changed, 1001 insertions(+), 532 deletions(-) diff --git a/go.mod b/go.mod index a0f1fc065af2..c9111d5bfbc2 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/jinzhu/gorm v1.9.2 // indirect github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect - github.com/moby/buildkit v0.9.1-0.20210927192002-23c8affb1ffe + github.com/moby/buildkit v0.9.1-0.20211008210008-ba673bbdab4f github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 5039e5175c61..b0bf036910db 100644 --- a/go.sum +++ b/go.sum @@ -404,6 +404,7 @@ github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e h1:n81KvOMrLZa+VWHwST7dun9f0G98X3zREHS1ztYzZKU= github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod h1:xpWTC2KnJMiDLkoawhsPQcXjvwATEBcbq0xevG2YR9M= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= @@ -906,8 +907,8 @@ github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxd github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ= -github.com/moby/buildkit v0.9.1-0.20210927192002-23c8affb1ffe h1:SA9l85GRngGomGpyDmVdziovizKPH8peFyUUtsluh34= -github.com/moby/buildkit v0.9.1-0.20210927192002-23c8affb1ffe/go.mod h1:BmktjI4PV4waDqQWB19oWso7X4t9VTcak6q7ynntmkQ= +github.com/moby/buildkit v0.9.1-0.20211008210008-ba673bbdab4f h1:RCFnbn0W1+InqTusV4raeqAyxvRMzuVoyT+8yKOMbWs= +github.com/moby/buildkit v0.9.1-0.20211008210008-ba673bbdab4f/go.mod h1:be+M6HNNl/Et0cUrFWRwEnXC1OChl1wPxXO5uEg4w6A= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= @@ -1203,7 +1204,7 @@ github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dS github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85/go.mod h1:a7cilN64dG941IOXfhJhlH0qB92hxJ9A1ewrdUmJ6xo= github.com/tonistiigi/fsutil v0.0.0-20210818161904-4442383b5028 h1:uEkkUFMCPtzz1HVOa42u15OHems1ugiRt172tSRTWSk= github.com/tonistiigi/fsutil v0.0.0-20210818161904-4442383b5028/go.mod h1:E6osHKls9ix67jofYQ61RQKwlJhqJOZM2hintp+49iI= -github.com/tonistiigi/go-actions-cache v0.0.0-20210714033416-b93d7f1b2e70/go.mod h1:dNS+PPTqGnSl80x3wEyWWCHeON5xiBGtcM0uD6CgHNU= +github.com/tonistiigi/go-actions-cache v0.0.0-20211002214948-4d48f2ff622a/go.mod h1:YiIBjH5gP7mao3t0dBrNNBGuKYdeJmcAJjYLXr43k6A= github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.0.0-20210714055410-d010b05b4939 h1:s6wDMZYNyWt8KvkjhrMpOthFPgI3JB8ipJS+eCV/psg= github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.0.0-20210714055410-d010b05b4939/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/httptrace/otelhttptrace v0.0.0-20210714055410-d010b05b4939 h1:ZZ1KHKvs97BcRoblbm6RhrDzs/OejFv7miYSIcZI7Ds= diff --git a/vendor/github.com/moby/buildkit/client/llb/exec.go b/vendor/github.com/moby/buildkit/client/llb/exec.go index 8e28f7142f3c..59bcca07208c 100644 --- a/vendor/github.com/moby/buildkit/client/llb/exec.go +++ b/vendor/github.com/moby/buildkit/client/llb/exec.go @@ -192,6 +192,7 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, [] User: user, Hostname: hostname, } + extraHosts, err := getExtraHosts(e.base)(ctx, c) if err != nil { return "", nil, nil, nil, err @@ -204,6 +205,31 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, [] meta.ExtraHosts = hosts } + shmSize, err := getShmSize(e.base)(ctx, c) + if err != nil { + return "", nil, nil, nil, err + } + if shmSize != nil { + meta.ShmSize = *shmSize + } + + ulimits, err := getUlimit(e.base)(ctx, c) + if err != nil { + return "", nil, nil, nil, err + } + if len(ulimits) > 0 { + addCap(&e.constraints, pb.CapExecMetaUlimit) + ul := make([]*pb.Ulimit, len(ulimits)) + for i, u := range ulimits { + ul[i] = &pb.Ulimit{ + Name: u.Name, + Soft: u.Soft, + Hard: u.Hard, + } + } + meta.Ulimit = ul + } + network, err := getNetwork(e.base)(ctx, c) if err != nil { return "", nil, nil, nil, err @@ -498,6 +524,18 @@ func AddExtraHost(host string, ip net.IP) RunOption { }) } +func WithShmSize(kb int64) RunOption { + return runOptionFunc(func(ei *ExecInfo) { + ei.State = ei.State.WithShmSize(kb) + }) +} + +func AddUlimit(name UlimitName, soft int64, hard int64) RunOption { + return runOptionFunc(func(ei *ExecInfo) { + ei.State = ei.State.AddUlimit(name, soft, hard) + }) +} + func With(so ...StateOption) RunOption { return runOptionFunc(func(ei *ExecInfo) { ei.State = ei.State.With(so...) @@ -667,3 +705,23 @@ const ( SecurityModeInsecure = pb.SecurityMode_INSECURE SecurityModeSandbox = pb.SecurityMode_SANDBOX ) + +type UlimitName string + +const ( + UlimitCore UlimitName = "core" + UlimitCPU UlimitName = "cpu" + UlimitData UlimitName = "data" + UlimitFsize UlimitName = "fsize" + UlimitLocks UlimitName = "locks" + UlimitMemlock UlimitName = "memlock" + UlimitMsgqueue UlimitName = "msgqueue" + UlimitNice UlimitName = "nice" + UlimitNofile UlimitName = "nofile" + UlimitNproc UlimitName = "nproc" + UlimitRss UlimitName = "rss" + UlimitRtprio UlimitName = "rtprio" + UlimitRttime UlimitName = "rttime" + UlimitSigpending UlimitName = "sigpending" + UlimitStack UlimitName = "stack" +) diff --git a/vendor/github.com/moby/buildkit/client/llb/meta.go b/vendor/github.com/moby/buildkit/client/llb/meta.go index 93bb6ce7b560..4434d3937b2c 100644 --- a/vendor/github.com/moby/buildkit/client/llb/meta.go +++ b/vendor/github.com/moby/buildkit/client/llb/meta.go @@ -18,12 +18,15 @@ var ( keyArgs = contextKeyT("llb.exec.args") keyDir = contextKeyT("llb.exec.dir") keyEnv = contextKeyT("llb.exec.env") - keyUser = contextKeyT("llb.exec.user") - keyHostname = contextKeyT("llb.exec.hostname") keyExtraHost = contextKeyT("llb.exec.extrahost") - keyPlatform = contextKeyT("llb.platform") - keyNetwork = contextKeyT("llb.network") - keySecurity = contextKeyT("llb.security") + keyHostname = contextKeyT("llb.exec.hostname") + keyShmSize = contextKeyT("llb.exec.shmsize") + keyUlimit = contextKeyT("llb.exec.ulimit") + keyUser = contextKeyT("llb.exec.user") + + keyPlatform = contextKeyT("llb.platform") + keyNetwork = contextKeyT("llb.network") + keySecurity = contextKeyT("llb.security") ) func AddEnvf(key, value string, v ...interface{}) StateOption { @@ -232,6 +235,55 @@ type HostIP struct { IP net.IP } +func shmSize(kb int64) StateOption { + return func(s State) State { + return s.WithValue(keyShmSize, kb) + } +} + +func getShmSize(s State) func(context.Context, *Constraints) (*int64, error) { + return func(ctx context.Context, c *Constraints) (*int64, error) { + v, err := s.getValue(keyShmSize)(ctx, c) + if err != nil { + return nil, err + } + if v != nil { + kb := v.(int64) + return &kb, nil + } + return nil, nil + } +} + +func ulimit(name UlimitName, soft int64, hard int64) StateOption { + return func(s State) State { + return s.withValue(keyUlimit, func(ctx context.Context, c *Constraints) (interface{}, error) { + v, err := getUlimit(s)(ctx, c) + if err != nil { + return nil, err + } + return append(v, pb.Ulimit{ + Name: string(name), + Soft: soft, + Hard: hard, + }), nil + }) + } +} + +func getUlimit(s State) func(context.Context, *Constraints) ([]pb.Ulimit, error) { + return func(ctx context.Context, c *Constraints) ([]pb.Ulimit, error) { + v, err := s.getValue(keyUlimit)(ctx, c) + if err != nil { + return nil, err + } + if v != nil { + return v.([]pb.Ulimit), nil + } + return nil, nil + } +} + func Network(v pb.NetMode) StateOption { return func(s State) State { return s.WithValue(keyNetwork, v) diff --git a/vendor/github.com/moby/buildkit/client/llb/state.go b/vendor/github.com/moby/buildkit/client/llb/state.go index 9c13d73c52d2..7f8e4c8711b4 100644 --- a/vendor/github.com/moby/buildkit/client/llb/state.go +++ b/vendor/github.com/moby/buildkit/client/llb/state.go @@ -397,6 +397,14 @@ func (s State) AddExtraHost(host string, ip net.IP) State { return extraHost(host, ip)(s) } +func (s State) WithShmSize(kb int64) State { + return shmSize(kb)(s) +} + +func (s State) AddUlimit(name UlimitName, soft int64, hard int64) State { + return ulimit(name, soft, hard)(s) +} + func (s State) isFileOpCopyInput() {} type output struct { diff --git a/vendor/github.com/moby/buildkit/solver/pb/caps.go b/vendor/github.com/moby/buildkit/solver/pb/caps.go index 0f7aaeee60b0..56f50cf8d9f0 100644 --- a/vendor/github.com/moby/buildkit/solver/pb/caps.go +++ b/vendor/github.com/moby/buildkit/solver/pb/caps.go @@ -35,22 +35,22 @@ const ( CapBuildOpLLBFileName apicaps.CapID = "source.buildop.llbfilename" - CapExecMetaBase apicaps.CapID = "exec.meta.base" - CapExecMetaProxy apicaps.CapID = "exec.meta.proxyenv" - CapExecMetaNetwork apicaps.CapID = "exec.meta.network" - CapExecMetaSecurity apicaps.CapID = "exec.meta.security" - CapExecMetaSetsDefaultPath apicaps.CapID = "exec.meta.setsdefaultpath" - CapExecMountBind apicaps.CapID = "exec.mount.bind" - CapExecMountBindReadWriteNoOuput apicaps.CapID = "exec.mount.bind.readwrite-nooutput" - CapExecMountCache apicaps.CapID = "exec.mount.cache" - CapExecMountCacheSharing apicaps.CapID = "exec.mount.cache.sharing" - CapExecMountSelector apicaps.CapID = "exec.mount.selector" - CapExecMountTmpfs apicaps.CapID = "exec.mount.tmpfs" - CapExecMountSecret apicaps.CapID = "exec.mount.secret" - CapExecMountSSH apicaps.CapID = "exec.mount.ssh" - CapExecCgroupsMounted apicaps.CapID = "exec.cgroup" - + CapExecMetaBase apicaps.CapID = "exec.meta.base" + CapExecMetaNetwork apicaps.CapID = "exec.meta.network" + CapExecMetaProxy apicaps.CapID = "exec.meta.proxyenv" + CapExecMetaSecurity apicaps.CapID = "exec.meta.security" CapExecMetaSecurityDeviceWhitelistV1 apicaps.CapID = "exec.meta.security.devices.v1" + CapExecMetaSetsDefaultPath apicaps.CapID = "exec.meta.setsdefaultpath" + CapExecMetaUlimit apicaps.CapID = "exec.meta.ulimit" + CapExecMountBind apicaps.CapID = "exec.mount.bind" + CapExecMountBindReadWriteNoOuput apicaps.CapID = "exec.mount.bind.readwrite-nooutput" + CapExecMountCache apicaps.CapID = "exec.mount.cache" + CapExecMountCacheSharing apicaps.CapID = "exec.mount.cache.sharing" + CapExecMountSelector apicaps.CapID = "exec.mount.selector" + CapExecMountTmpfs apicaps.CapID = "exec.mount.tmpfs" + CapExecMountSecret apicaps.CapID = "exec.mount.secret" + CapExecMountSSH apicaps.CapID = "exec.mount.ssh" + CapExecCgroupsMounted apicaps.CapID = "exec.cgroup" CapFileBase apicaps.CapID = "file.base" CapFileRmWildcard apicaps.CapID = "file.rm.wildcard" @@ -236,6 +236,12 @@ func init() { Status: apicaps.CapStatusExperimental, }) + Caps.Init(apicaps.Cap{ + ID: CapExecMetaUlimit, + Enabled: true, + Status: apicaps.CapStatusExperimental, + }) + Caps.Init(apicaps.Cap{ ID: CapExecMountBind, Enabled: true, diff --git a/vendor/github.com/moby/buildkit/solver/pb/ops.pb.go b/vendor/github.com/moby/buildkit/solver/pb/ops.pb.go index 77feeac78108..ba0964eea087 100644 --- a/vendor/github.com/moby/buildkit/solver/pb/ops.pb.go +++ b/vendor/github.com/moby/buildkit/solver/pb/ops.pb.go @@ -468,6 +468,8 @@ type Meta struct { ProxyEnv *ProxyEnv `protobuf:"bytes,5,opt,name=proxy_env,json=proxyEnv,proto3" json:"proxy_env,omitempty"` ExtraHosts []*HostIP `protobuf:"bytes,6,rep,name=extraHosts,proto3" json:"extraHosts,omitempty"` Hostname string `protobuf:"bytes,7,opt,name=hostname,proto3" json:"hostname,omitempty"` + ShmSize int64 `protobuf:"varint,8,opt,name=shmSize,proto3" json:"shmSize,omitempty"` + Ulimit []*Ulimit `protobuf:"bytes,9,rep,name=ulimit,proto3" json:"ulimit,omitempty"` } func (m *Meta) Reset() { *m = Meta{} } @@ -548,6 +550,124 @@ func (m *Meta) GetHostname() string { return "" } +func (m *Meta) GetShmSize() int64 { + if m != nil { + return m.ShmSize + } + return 0 +} + +func (m *Meta) GetUlimit() []*Ulimit { + if m != nil { + return m.Ulimit + } + return nil +} + +type HostIP struct { + Host string `protobuf:"bytes,1,opt,name=Host,proto3" json:"Host,omitempty"` + IP string `protobuf:"bytes,2,opt,name=IP,proto3" json:"IP,omitempty"` +} + +func (m *HostIP) Reset() { *m = HostIP{} } +func (m *HostIP) String() string { return proto.CompactTextString(m) } +func (*HostIP) ProtoMessage() {} +func (*HostIP) Descriptor() ([]byte, []int) { + return fileDescriptor_8de16154b2733812, []int{5} +} +func (m *HostIP) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HostIP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *HostIP) XXX_Merge(src proto.Message) { + xxx_messageInfo_HostIP.Merge(m, src) +} +func (m *HostIP) XXX_Size() int { + return m.Size() +} +func (m *HostIP) XXX_DiscardUnknown() { + xxx_messageInfo_HostIP.DiscardUnknown(m) +} + +var xxx_messageInfo_HostIP proto.InternalMessageInfo + +func (m *HostIP) GetHost() string { + if m != nil { + return m.Host + } + return "" +} + +func (m *HostIP) GetIP() string { + if m != nil { + return m.IP + } + return "" +} + +type Ulimit struct { + Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` + Soft int64 `protobuf:"varint,2,opt,name=Soft,proto3" json:"Soft,omitempty"` + Hard int64 `protobuf:"varint,3,opt,name=Hard,proto3" json:"Hard,omitempty"` +} + +func (m *Ulimit) Reset() { *m = Ulimit{} } +func (m *Ulimit) String() string { return proto.CompactTextString(m) } +func (*Ulimit) ProtoMessage() {} +func (*Ulimit) Descriptor() ([]byte, []int) { + return fileDescriptor_8de16154b2733812, []int{6} +} +func (m *Ulimit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Ulimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *Ulimit) XXX_Merge(src proto.Message) { + xxx_messageInfo_Ulimit.Merge(m, src) +} +func (m *Ulimit) XXX_Size() int { + return m.Size() +} +func (m *Ulimit) XXX_DiscardUnknown() { + xxx_messageInfo_Ulimit.DiscardUnknown(m) +} + +var xxx_messageInfo_Ulimit proto.InternalMessageInfo + +func (m *Ulimit) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Ulimit) GetSoft() int64 { + if m != nil { + return m.Soft + } + return 0 +} + +func (m *Ulimit) GetHard() int64 { + if m != nil { + return m.Hard + } + return 0 +} + // Mount specifies how to mount an input Op as a filesystem. type Mount struct { Input InputIndex `protobuf:"varint,1,opt,name=input,proto3,customtype=InputIndex" json:"input"` @@ -566,7 +686,7 @@ func (m *Mount) Reset() { *m = Mount{} } func (m *Mount) String() string { return proto.CompactTextString(m) } func (*Mount) ProtoMessage() {} func (*Mount) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{5} + return fileDescriptor_8de16154b2733812, []int{7} } func (m *Mount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -659,7 +779,7 @@ func (m *CacheOpt) Reset() { *m = CacheOpt{} } func (m *CacheOpt) String() string { return proto.CompactTextString(m) } func (*CacheOpt) ProtoMessage() {} func (*CacheOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{6} + return fileDescriptor_8de16154b2733812, []int{8} } func (m *CacheOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -717,7 +837,7 @@ func (m *SecretOpt) Reset() { *m = SecretOpt{} } func (m *SecretOpt) String() string { return proto.CompactTextString(m) } func (*SecretOpt) ProtoMessage() {} func (*SecretOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{7} + return fileDescriptor_8de16154b2733812, []int{9} } func (m *SecretOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -796,7 +916,7 @@ func (m *SSHOpt) Reset() { *m = SSHOpt{} } func (m *SSHOpt) String() string { return proto.CompactTextString(m) } func (*SSHOpt) ProtoMessage() {} func (*SSHOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{8} + return fileDescriptor_8de16154b2733812, []int{10} } func (m *SSHOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -869,7 +989,7 @@ func (m *SourceOp) Reset() { *m = SourceOp{} } func (m *SourceOp) String() string { return proto.CompactTextString(m) } func (*SourceOp) ProtoMessage() {} func (*SourceOp) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{9} + return fileDescriptor_8de16154b2733812, []int{11} } func (m *SourceOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -921,7 +1041,7 @@ func (m *BuildOp) Reset() { *m = BuildOp{} } func (m *BuildOp) String() string { return proto.CompactTextString(m) } func (*BuildOp) ProtoMessage() {} func (*BuildOp) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{10} + return fileDescriptor_8de16154b2733812, []int{12} } func (m *BuildOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -976,7 +1096,7 @@ func (m *BuildInput) Reset() { *m = BuildInput{} } func (m *BuildInput) String() string { return proto.CompactTextString(m) } func (*BuildInput) ProtoMessage() {} func (*BuildInput) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{11} + return fileDescriptor_8de16154b2733812, []int{13} } func (m *BuildInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1017,7 +1137,7 @@ func (m *OpMetadata) Reset() { *m = OpMetadata{} } func (m *OpMetadata) String() string { return proto.CompactTextString(m) } func (*OpMetadata) ProtoMessage() {} func (*OpMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{12} + return fileDescriptor_8de16154b2733812, []int{14} } func (m *OpMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1080,7 +1200,7 @@ func (m *Source) Reset() { *m = Source{} } func (m *Source) String() string { return proto.CompactTextString(m) } func (*Source) ProtoMessage() {} func (*Source) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{13} + return fileDescriptor_8de16154b2733812, []int{15} } func (m *Source) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1128,7 +1248,7 @@ func (m *Locations) Reset() { *m = Locations{} } func (m *Locations) String() string { return proto.CompactTextString(m) } func (*Locations) ProtoMessage() {} func (*Locations) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{14} + return fileDescriptor_8de16154b2733812, []int{16} } func (m *Locations) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1171,7 +1291,7 @@ func (m *SourceInfo) Reset() { *m = SourceInfo{} } func (m *SourceInfo) String() string { return proto.CompactTextString(m) } func (*SourceInfo) ProtoMessage() {} func (*SourceInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{15} + return fileDescriptor_8de16154b2733812, []int{17} } func (m *SourceInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1227,7 +1347,7 @@ func (m *Location) Reset() { *m = Location{} } func (m *Location) String() string { return proto.CompactTextString(m) } func (*Location) ProtoMessage() {} func (*Location) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{16} + return fileDescriptor_8de16154b2733812, []int{18} } func (m *Location) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1276,7 +1396,7 @@ func (m *Range) Reset() { *m = Range{} } func (m *Range) String() string { return proto.CompactTextString(m) } func (*Range) ProtoMessage() {} func (*Range) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{17} + return fileDescriptor_8de16154b2733812, []int{19} } func (m *Range) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1325,7 +1445,7 @@ func (m *Position) Reset() { *m = Position{} } func (m *Position) String() string { return proto.CompactTextString(m) } func (*Position) ProtoMessage() {} func (*Position) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{18} + return fileDescriptor_8de16154b2733812, []int{20} } func (m *Position) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1372,7 +1492,7 @@ func (m *ExportCache) Reset() { *m = ExportCache{} } func (m *ExportCache) String() string { return proto.CompactTextString(m) } func (*ExportCache) ProtoMessage() {} func (*ExportCache) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{19} + return fileDescriptor_8de16154b2733812, []int{21} } func (m *ExportCache) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1416,7 +1536,7 @@ func (m *ProxyEnv) Reset() { *m = ProxyEnv{} } func (m *ProxyEnv) String() string { return proto.CompactTextString(m) } func (*ProxyEnv) ProtoMessage() {} func (*ProxyEnv) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{20} + return fileDescriptor_8de16154b2733812, []int{22} } func (m *ProxyEnv) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1485,7 +1605,7 @@ func (m *WorkerConstraints) Reset() { *m = WorkerConstraints{} } func (m *WorkerConstraints) String() string { return proto.CompactTextString(m) } func (*WorkerConstraints) ProtoMessage() {} func (*WorkerConstraints) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{21} + return fileDescriptor_8de16154b2733812, []int{23} } func (m *WorkerConstraints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1532,7 +1652,7 @@ func (m *Definition) Reset() { *m = Definition{} } func (m *Definition) String() string { return proto.CompactTextString(m) } func (*Definition) ProtoMessage() {} func (*Definition) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{22} + return fileDescriptor_8de16154b2733812, []int{24} } func (m *Definition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1578,54 +1698,6 @@ func (m *Definition) GetSource() *Source { return nil } -type HostIP struct { - Host string `protobuf:"bytes,1,opt,name=Host,proto3" json:"Host,omitempty"` - IP string `protobuf:"bytes,2,opt,name=IP,proto3" json:"IP,omitempty"` -} - -func (m *HostIP) Reset() { *m = HostIP{} } -func (m *HostIP) String() string { return proto.CompactTextString(m) } -func (*HostIP) ProtoMessage() {} -func (*HostIP) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{23} -} -func (m *HostIP) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *HostIP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *HostIP) XXX_Merge(src proto.Message) { - xxx_messageInfo_HostIP.Merge(m, src) -} -func (m *HostIP) XXX_Size() int { - return m.Size() -} -func (m *HostIP) XXX_DiscardUnknown() { - xxx_messageInfo_HostIP.DiscardUnknown(m) -} - -var xxx_messageInfo_HostIP proto.InternalMessageInfo - -func (m *HostIP) GetHost() string { - if m != nil { - return m.Host - } - return "" -} - -func (m *HostIP) GetIP() string { - if m != nil { - return m.IP - } - return "" -} - type FileOp struct { Actions []*FileAction `protobuf:"bytes,2,rep,name=actions,proto3" json:"actions,omitempty"` } @@ -1634,7 +1706,7 @@ func (m *FileOp) Reset() { *m = FileOp{} } func (m *FileOp) String() string { return proto.CompactTextString(m) } func (*FileOp) ProtoMessage() {} func (*FileOp) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{24} + return fileDescriptor_8de16154b2733812, []int{25} } func (m *FileOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1682,7 +1754,7 @@ func (m *FileAction) Reset() { *m = FileAction{} } func (m *FileAction) String() string { return proto.CompactTextString(m) } func (*FileAction) ProtoMessage() {} func (*FileAction) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{25} + return fileDescriptor_8de16154b2733812, []int{26} } func (m *FileAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1809,7 +1881,7 @@ func (m *FileActionCopy) Reset() { *m = FileActionCopy{} } func (m *FileActionCopy) String() string { return proto.CompactTextString(m) } func (*FileActionCopy) ProtoMessage() {} func (*FileActionCopy) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{26} + return fileDescriptor_8de16154b2733812, []int{27} } func (m *FileActionCopy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1942,7 +2014,7 @@ func (m *FileActionMkFile) Reset() { *m = FileActionMkFile{} } func (m *FileActionMkFile) String() string { return proto.CompactTextString(m) } func (*FileActionMkFile) ProtoMessage() {} func (*FileActionMkFile) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{27} + return fileDescriptor_8de16154b2733812, []int{28} } func (m *FileActionMkFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2019,7 +2091,7 @@ func (m *FileActionMkDir) Reset() { *m = FileActionMkDir{} } func (m *FileActionMkDir) String() string { return proto.CompactTextString(m) } func (*FileActionMkDir) ProtoMessage() {} func (*FileActionMkDir) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{28} + return fileDescriptor_8de16154b2733812, []int{29} } func (m *FileActionMkDir) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2092,7 +2164,7 @@ func (m *FileActionRm) Reset() { *m = FileActionRm{} } func (m *FileActionRm) String() string { return proto.CompactTextString(m) } func (*FileActionRm) ProtoMessage() {} func (*FileActionRm) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{29} + return fileDescriptor_8de16154b2733812, []int{30} } func (m *FileActionRm) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2147,7 +2219,7 @@ func (m *ChownOpt) Reset() { *m = ChownOpt{} } func (m *ChownOpt) String() string { return proto.CompactTextString(m) } func (*ChownOpt) ProtoMessage() {} func (*ChownOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{30} + return fileDescriptor_8de16154b2733812, []int{31} } func (m *ChownOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2197,7 +2269,7 @@ func (m *UserOpt) Reset() { *m = UserOpt{} } func (m *UserOpt) String() string { return proto.CompactTextString(m) } func (*UserOpt) ProtoMessage() {} func (*UserOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{31} + return fileDescriptor_8de16154b2733812, []int{32} } func (m *UserOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2276,7 +2348,7 @@ func (m *NamedUserOpt) Reset() { *m = NamedUserOpt{} } func (m *NamedUserOpt) String() string { return proto.CompactTextString(m) } func (*NamedUserOpt) ProtoMessage() {} func (*NamedUserOpt) Descriptor() ([]byte, []int) { - return fileDescriptor_8de16154b2733812, []int{32} + return fileDescriptor_8de16154b2733812, []int{33} } func (m *NamedUserOpt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2318,6 +2390,8 @@ func init() { proto.RegisterType((*Input)(nil), "pb.Input") proto.RegisterType((*ExecOp)(nil), "pb.ExecOp") proto.RegisterType((*Meta)(nil), "pb.Meta") + proto.RegisterType((*HostIP)(nil), "pb.HostIP") + proto.RegisterType((*Ulimit)(nil), "pb.Ulimit") proto.RegisterType((*Mount)(nil), "pb.Mount") proto.RegisterType((*CacheOpt)(nil), "pb.CacheOpt") proto.RegisterType((*SecretOpt)(nil), "pb.SecretOpt") @@ -2343,7 +2417,6 @@ func init() { proto.RegisterType((*WorkerConstraints)(nil), "pb.WorkerConstraints") proto.RegisterType((*Definition)(nil), "pb.Definition") proto.RegisterMapType((map[github_com_opencontainers_go_digest.Digest]OpMetadata)(nil), "pb.Definition.MetadataEntry") - proto.RegisterType((*HostIP)(nil), "pb.HostIP") proto.RegisterType((*FileOp)(nil), "pb.FileOp") proto.RegisterType((*FileAction)(nil), "pb.FileAction") proto.RegisterType((*FileActionCopy)(nil), "pb.FileActionCopy") @@ -2358,149 +2431,152 @@ func init() { func init() { proto.RegisterFile("ops.proto", fileDescriptor_8de16154b2733812) } var fileDescriptor_8de16154b2733812 = []byte{ - // 2267 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6e, 0x1c, 0xc7, - 0xf1, 0xe7, 0x7e, 0xef, 0xd6, 0x2e, 0xa9, 0xfd, 0xb7, 0x65, 0x7b, 0xcd, 0xbf, 0x42, 0xd2, 0x63, - 0xc7, 0xa0, 0x28, 0x69, 0x09, 0xd0, 0x80, 0x65, 0x18, 0x41, 0x10, 0xee, 0x87, 0xc0, 0xb5, 0x25, - 0x2e, 0xd1, 0x2b, 0xc9, 0xb9, 0x09, 0xc3, 0xd9, 0x26, 0x39, 0xe0, 0xec, 0xf4, 0xa0, 0xa7, 0x57, - 0xe2, 0x5e, 0x72, 0xf0, 0x13, 0x18, 0x08, 0x90, 0x5b, 0x12, 0xe4, 0x1d, 0x72, 0xcd, 0x31, 0x80, - 0x8f, 0x3e, 0xe4, 0x60, 0xe4, 0xe0, 0x04, 0xd2, 0x3d, 0x4f, 0x90, 0x00, 0x41, 0x55, 0xf7, 0x7c, - 0x2c, 0x45, 0x41, 0x12, 0x12, 0xe4, 0x34, 0xdd, 0x55, 0xbf, 0xaa, 0xae, 0xae, 0xaa, 0xae, 0xae, - 0x1e, 0x68, 0xc8, 0x28, 0xee, 0x46, 0x4a, 0x6a, 0xc9, 0x8a, 0xd1, 0xf1, 0xfa, 0x9d, 0x53, 0x5f, - 0x9f, 0xcd, 0x8f, 0xbb, 0x9e, 0x9c, 0xed, 0x9e, 0xca, 0x53, 0xb9, 0x4b, 0xac, 0xe3, 0xf9, 0x09, - 0xcd, 0x68, 0x42, 0x23, 0x23, 0xe2, 0xfc, 0xa1, 0x08, 0xc5, 0x71, 0xc4, 0x3e, 0x84, 0xaa, 0x1f, - 0x46, 0x73, 0x1d, 0x77, 0x0a, 0x5b, 0xa5, 0xed, 0xe6, 0x5e, 0xa3, 0x1b, 0x1d, 0x77, 0x47, 0x48, - 0xe1, 0x96, 0xc1, 0xb6, 0xa0, 0x2c, 0x2e, 0x84, 0xd7, 0x29, 0x6e, 0x15, 0xb6, 0x9b, 0x7b, 0x80, - 0x80, 0xe1, 0x85, 0xf0, 0xc6, 0xd1, 0xc1, 0x0a, 0x27, 0x0e, 0xfb, 0x04, 0xaa, 0xb1, 0x9c, 0x2b, - 0x4f, 0x74, 0x4a, 0x84, 0x69, 0x21, 0x66, 0x42, 0x14, 0x42, 0x59, 0x2e, 0x6a, 0x3a, 0xf1, 0x03, - 0xd1, 0x29, 0x67, 0x9a, 0xee, 0xf9, 0x81, 0xc1, 0x10, 0x87, 0x7d, 0x04, 0x95, 0xe3, 0xb9, 0x1f, - 0x4c, 0x3b, 0x15, 0x82, 0x34, 0x11, 0xd2, 0x43, 0x02, 0x61, 0x0c, 0x8f, 0x6d, 0x43, 0x3d, 0x0a, - 0x5c, 0x7d, 0x22, 0xd5, 0xac, 0x03, 0xd9, 0x82, 0x47, 0x96, 0xc6, 0x53, 0x2e, 0xbb, 0x0b, 0x4d, - 0x4f, 0x86, 0xb1, 0x56, 0xae, 0x1f, 0xea, 0xb8, 0xd3, 0x24, 0xf0, 0xbb, 0x08, 0xfe, 0x5a, 0xaa, - 0x73, 0xa1, 0xfa, 0x19, 0x93, 0xe7, 0x91, 0xbd, 0x32, 0x14, 0x65, 0xe4, 0xfc, 0xa6, 0x00, 0xf5, - 0x44, 0x2b, 0x73, 0xa0, 0xb5, 0xaf, 0xbc, 0x33, 0x5f, 0x0b, 0x4f, 0xcf, 0x95, 0xe8, 0x14, 0xb6, - 0x0a, 0xdb, 0x0d, 0xbe, 0x44, 0x63, 0x6b, 0x50, 0x1c, 0x4f, 0xc8, 0x51, 0x0d, 0x5e, 0x1c, 0x4f, - 0x58, 0x07, 0x6a, 0x8f, 0x5d, 0xe5, 0xbb, 0xa1, 0x26, 0xcf, 0x34, 0x78, 0x32, 0x65, 0x37, 0xa0, - 0x31, 0x9e, 0x3c, 0x16, 0x2a, 0xf6, 0x65, 0x48, 0xfe, 0x68, 0xf0, 0x8c, 0xc0, 0x36, 0x00, 0xc6, - 0x93, 0x7b, 0xc2, 0x45, 0xa5, 0x71, 0xa7, 0xb2, 0x55, 0xda, 0x6e, 0xf0, 0x1c, 0xc5, 0xf9, 0x15, - 0x54, 0x28, 0x46, 0xec, 0x4b, 0xa8, 0x4e, 0xfd, 0x53, 0x11, 0x6b, 0x63, 0x4e, 0x6f, 0xef, 0xbb, - 0x1f, 0x37, 0x57, 0xfe, 0xfa, 0xe3, 0xe6, 0x4e, 0x2e, 0x19, 0x64, 0x24, 0x42, 0x4f, 0x86, 0xda, - 0xf5, 0x43, 0xa1, 0xe2, 0xdd, 0x53, 0x79, 0xc7, 0x88, 0x74, 0x07, 0xf4, 0xe1, 0x56, 0x03, 0xbb, - 0x09, 0x15, 0x3f, 0x9c, 0x8a, 0x0b, 0xb2, 0xbf, 0xd4, 0x7b, 0xc7, 0xaa, 0x6a, 0x8e, 0xe7, 0x3a, - 0x9a, 0xeb, 0x11, 0xb2, 0xb8, 0x41, 0x38, 0xbf, 0x2b, 0x40, 0xd5, 0xe4, 0x00, 0xbb, 0x01, 0xe5, - 0x99, 0xd0, 0x2e, 0xad, 0xdf, 0xdc, 0xab, 0xa3, 0x6f, 0x1f, 0x08, 0xed, 0x72, 0xa2, 0x62, 0x7a, - 0xcd, 0xe4, 0x1c, 0x7d, 0x5f, 0xcc, 0xd2, 0xeb, 0x01, 0x52, 0xb8, 0x65, 0xb0, 0x9f, 0x42, 0x2d, - 0x14, 0xfa, 0x99, 0x54, 0xe7, 0xe4, 0xa3, 0x35, 0x13, 0xf4, 0x43, 0xa1, 0x1f, 0xc8, 0xa9, 0xe0, - 0x09, 0x8f, 0xdd, 0x86, 0x7a, 0x2c, 0xbc, 0xb9, 0xf2, 0xf5, 0x82, 0xfc, 0xb5, 0xb6, 0xd7, 0xa6, - 0x2c, 0xb3, 0x34, 0x02, 0xa7, 0x08, 0xe7, 0xcf, 0x05, 0x28, 0xa3, 0x19, 0x8c, 0x41, 0xd9, 0x55, - 0xa7, 0x26, 0xbb, 0x1b, 0x9c, 0xc6, 0xac, 0x0d, 0x25, 0x11, 0x3e, 0x25, 0x8b, 0x1a, 0x1c, 0x87, - 0x48, 0xf1, 0x9e, 0x4d, 0x6d, 0x8c, 0x70, 0x88, 0x72, 0xf3, 0x58, 0x28, 0x1b, 0x1a, 0x1a, 0xb3, - 0x9b, 0xd0, 0x88, 0x94, 0xbc, 0x58, 0x3c, 0x41, 0xe9, 0x4a, 0x2e, 0xf1, 0x90, 0x38, 0x0c, 0x9f, - 0xf2, 0x7a, 0x64, 0x47, 0x6c, 0x07, 0x40, 0x5c, 0x68, 0xe5, 0x1e, 0xc8, 0x58, 0xc7, 0x9d, 0x2a, - 0xed, 0x9d, 0xf2, 0x1d, 0x09, 0xa3, 0x23, 0x9e, 0xe3, 0xb2, 0x75, 0xa8, 0x9f, 0xc9, 0x58, 0x87, - 0xee, 0x4c, 0x74, 0x6a, 0xb4, 0x5c, 0x3a, 0x77, 0xfe, 0x51, 0x84, 0x0a, 0xb9, 0x8b, 0x6d, 0x63, - 0x74, 0xa2, 0xb9, 0x09, 0x74, 0xa9, 0xc7, 0x6c, 0x74, 0x80, 0xf2, 0x20, 0x0d, 0x0e, 0xe6, 0xc4, - 0x3a, 0x7a, 0x2a, 0x10, 0x9e, 0x96, 0xca, 0xa6, 0x62, 0x3a, 0xc7, 0x6d, 0x4d, 0x31, 0x5b, 0xcc, - 0x4e, 0x69, 0xcc, 0x6e, 0x41, 0x55, 0x52, 0x88, 0x69, 0xb3, 0xaf, 0x08, 0xbc, 0x85, 0xa0, 0x72, - 0x25, 0xdc, 0xa9, 0x0c, 0x83, 0x05, 0xb9, 0xa0, 0xce, 0xd3, 0x39, 0xbb, 0x05, 0x0d, 0x8a, 0xe9, - 0xc3, 0x45, 0x24, 0x3a, 0x55, 0x8a, 0xd1, 0x6a, 0x1a, 0x6f, 0x24, 0xf2, 0x8c, 0x8f, 0x87, 0xd8, - 0x73, 0xbd, 0x33, 0x31, 0x8e, 0x74, 0xe7, 0x7a, 0xe6, 0xcb, 0xbe, 0xa5, 0xf1, 0x94, 0x8b, 0x6a, - 0x63, 0xe1, 0x29, 0xa1, 0x11, 0xfa, 0x2e, 0x41, 0x57, 0x6d, 0xe8, 0x0d, 0x91, 0x67, 0x7c, 0xe6, - 0x40, 0x75, 0x32, 0x39, 0x40, 0xe4, 0x7b, 0x59, 0x91, 0x31, 0x14, 0x6e, 0x39, 0x66, 0x0f, 0xf1, - 0x3c, 0xd0, 0xa3, 0x41, 0xe7, 0x7d, 0xe3, 0xa0, 0x64, 0xee, 0x8c, 0xa0, 0x9e, 0x98, 0x80, 0xa7, - 0x79, 0x34, 0xb0, 0xe7, 0xbc, 0x38, 0x1a, 0xb0, 0x3b, 0x50, 0x8b, 0xcf, 0x5c, 0xe5, 0x87, 0xa7, - 0xe4, 0xd7, 0xb5, 0xbd, 0x77, 0x52, 0x8b, 0x27, 0x86, 0x8e, 0xab, 0x24, 0x18, 0x47, 0x42, 0x23, - 0x35, 0xf1, 0x25, 0x5d, 0x6d, 0x28, 0xcd, 0xfd, 0x29, 0xe9, 0x59, 0xe5, 0x38, 0x44, 0xca, 0xa9, - 0x6f, 0x72, 0x70, 0x95, 0xe3, 0x10, 0x83, 0x35, 0x93, 0x53, 0x53, 0x2e, 0x57, 0x39, 0x8d, 0xd1, - 0x76, 0x19, 0x69, 0x5f, 0x86, 0x6e, 0x90, 0xf8, 0x3f, 0x99, 0x3b, 0x41, 0xb2, 0xf7, 0xff, 0xc9, - 0x6a, 0xbf, 0x2e, 0x40, 0x3d, 0xa9, 0xf1, 0x58, 0xb0, 0xfc, 0xa9, 0x08, 0xb5, 0x7f, 0xe2, 0x0b, - 0x65, 0x17, 0xce, 0x51, 0xd8, 0x1d, 0xa8, 0xb8, 0x5a, 0xab, 0xa4, 0x0c, 0xbc, 0x9f, 0xbf, 0x20, - 0xba, 0xfb, 0xc8, 0x19, 0x86, 0x5a, 0x2d, 0xb8, 0x41, 0xad, 0x7f, 0x0e, 0x90, 0x11, 0xd1, 0xd6, - 0x73, 0xb1, 0xb0, 0x5a, 0x71, 0xc8, 0xae, 0x43, 0xe5, 0xa9, 0x1b, 0xcc, 0x85, 0xcd, 0x6f, 0x33, - 0xf9, 0xa2, 0xf8, 0x79, 0xc1, 0xf9, 0x53, 0x11, 0x6a, 0xf6, 0xc2, 0x60, 0xb7, 0xa1, 0x46, 0x17, - 0x86, 0xb5, 0xe8, 0xea, 0x43, 0x93, 0x40, 0xd8, 0x6e, 0x7a, 0x13, 0xe6, 0x6c, 0xb4, 0xaa, 0xcc, - 0x8d, 0x68, 0x6d, 0xcc, 0xee, 0xc5, 0xd2, 0x54, 0x9c, 0xd8, 0x2b, 0x6f, 0x0d, 0xd1, 0x03, 0x71, - 0xe2, 0x87, 0x3e, 0xfa, 0x87, 0x23, 0x8b, 0xdd, 0x4e, 0x76, 0x5d, 0x26, 0x8d, 0xef, 0xe5, 0x35, - 0xbe, 0xbc, 0xe9, 0x11, 0x34, 0x73, 0xcb, 0x5c, 0xb1, 0xeb, 0x8f, 0xf3, 0xbb, 0xb6, 0x4b, 0x92, - 0x3a, 0x73, 0x5f, 0x67, 0x5e, 0xf8, 0x0f, 0xfc, 0xf7, 0x19, 0x40, 0xa6, 0xf2, 0xcd, 0x8b, 0x8e, - 0xf3, 0x4d, 0x09, 0x60, 0x1c, 0x61, 0xc9, 0x9d, 0xba, 0x54, 0xf7, 0x5b, 0xfe, 0x69, 0x28, 0x95, - 0x78, 0x42, 0xc7, 0x98, 0xe4, 0xeb, 0xbc, 0x69, 0x68, 0x74, 0x62, 0xd8, 0x3e, 0x34, 0xa7, 0x22, - 0xf6, 0x94, 0x4f, 0x09, 0x65, 0x9d, 0xbe, 0x89, 0x7b, 0xca, 0xf4, 0x74, 0x07, 0x19, 0xc2, 0xf8, - 0x2a, 0x2f, 0xc3, 0xf6, 0xa0, 0x25, 0x2e, 0x22, 0xa9, 0xb4, 0x5d, 0xc5, 0xf4, 0x15, 0xd7, 0x4c, - 0x87, 0x82, 0x74, 0x5a, 0x89, 0x37, 0x45, 0x36, 0x61, 0x2e, 0x94, 0x3d, 0x37, 0x32, 0x97, 0x6a, - 0x73, 0xaf, 0x73, 0x69, 0xbd, 0xbe, 0x1b, 0x19, 0xa7, 0xf5, 0x3e, 0xc5, 0xbd, 0x7e, 0xf3, 0xb7, - 0xcd, 0x5b, 0xb9, 0x9b, 0x74, 0x26, 0x8f, 0x17, 0xbb, 0x94, 0x2f, 0xe7, 0xbe, 0xde, 0x9d, 0x6b, - 0x3f, 0xd8, 0x75, 0x23, 0x1f, 0xd5, 0xa1, 0xe0, 0x68, 0xc0, 0x49, 0xf5, 0xfa, 0xcf, 0xa1, 0x7d, - 0xd9, 0xee, 0xb7, 0x89, 0xc1, 0xfa, 0x5d, 0x68, 0xa4, 0x76, 0xbc, 0x4e, 0xb0, 0x9e, 0x0f, 0xde, - 0x1f, 0x0b, 0x50, 0x35, 0xa7, 0x8a, 0xdd, 0x85, 0x46, 0x20, 0x3d, 0x17, 0x0d, 0x48, 0x5a, 0xbb, - 0x0f, 0xb2, 0x43, 0xd7, 0xbd, 0x9f, 0xf0, 0x8c, 0x57, 0x33, 0x2c, 0x26, 0x99, 0x1f, 0x9e, 0xc8, - 0xe4, 0x14, 0xac, 0x65, 0x42, 0xa3, 0xf0, 0x44, 0x72, 0xc3, 0x5c, 0xff, 0x0a, 0xd6, 0x96, 0x55, - 0x5c, 0x61, 0xe7, 0x47, 0xcb, 0xe9, 0x4a, 0x35, 0x3b, 0x15, 0xca, 0x9b, 0x7d, 0x17, 0x1a, 0x29, - 0x9d, 0xed, 0xbc, 0x6c, 0x78, 0x2b, 0x2f, 0x99, 0xb3, 0xd5, 0x09, 0x00, 0x32, 0xd3, 0xb0, 0x58, - 0x61, 0x0f, 0x49, 0xf7, 0xa8, 0x31, 0x23, 0x9d, 0xd3, 0xbd, 0xe7, 0x6a, 0x97, 0x4c, 0x69, 0x71, - 0x1a, 0xb3, 0x2e, 0xc0, 0x34, 0x3d, 0xb0, 0xaf, 0x38, 0xc6, 0x39, 0x84, 0x33, 0x86, 0x7a, 0x62, - 0x04, 0xdb, 0x82, 0x66, 0x6c, 0x57, 0xc6, 0x8e, 0x09, 0x97, 0xab, 0xf0, 0x3c, 0x09, 0x3b, 0x1f, - 0xe5, 0x86, 0xa7, 0x62, 0xa9, 0xf3, 0xe1, 0x48, 0xe1, 0x96, 0xe1, 0x7c, 0x0d, 0x15, 0x22, 0xe0, - 0x31, 0x8b, 0xb5, 0xab, 0xb4, 0x6d, 0xa2, 0x4c, 0x53, 0x21, 0x63, 0x5a, 0xb6, 0x57, 0xc6, 0x44, - 0xe4, 0x06, 0xc0, 0x3e, 0xc6, 0xd6, 0x65, 0x6a, 0x3d, 0x7a, 0x15, 0x0e, 0xd9, 0xce, 0xcf, 0xa0, - 0x9e, 0x90, 0x71, 0xe7, 0xf7, 0xfd, 0x50, 0x58, 0x13, 0x69, 0x8c, 0xcd, 0x67, 0xff, 0xcc, 0x55, - 0xae, 0xa7, 0x85, 0x69, 0x11, 0x2a, 0x3c, 0x23, 0x38, 0x1f, 0x41, 0x33, 0x77, 0x7a, 0x30, 0xdd, - 0x1e, 0x53, 0x18, 0xcd, 0x19, 0x36, 0x13, 0xe7, 0xf7, 0xd8, 0x1a, 0x27, 0xdd, 0xce, 0x4f, 0x00, - 0xce, 0xb4, 0x8e, 0x9e, 0x50, 0xfb, 0x63, 0x7d, 0xdf, 0x40, 0x0a, 0x21, 0xd8, 0x26, 0x34, 0x71, - 0x12, 0x5b, 0xbe, 0xc9, 0x77, 0x92, 0x88, 0x0d, 0xe0, 0xff, 0xa1, 0x71, 0x92, 0x8a, 0x97, 0x6c, - 0xe8, 0x12, 0xe9, 0x0f, 0xa0, 0x1e, 0x4a, 0xcb, 0x33, 0xdd, 0x58, 0x2d, 0x94, 0xa9, 0x9c, 0x1b, - 0x04, 0x96, 0x57, 0x31, 0x72, 0x6e, 0x10, 0x10, 0xd3, 0xb9, 0x05, 0xff, 0xf7, 0x52, 0x93, 0xcf, - 0xde, 0x83, 0xea, 0x89, 0x1f, 0x68, 0xba, 0x11, 0xb0, 0xfb, 0xb3, 0x33, 0xe7, 0x5f, 0x05, 0x80, - 0x2c, 0xec, 0x98, 0xcc, 0x58, 0xda, 0x11, 0xd3, 0x32, 0xa5, 0x3c, 0x80, 0xfa, 0xcc, 0x16, 0x09, - 0x1b, 0xd0, 0x1b, 0xcb, 0xa9, 0xd2, 0x4d, 0x6a, 0x88, 0x29, 0x1f, 0x7b, 0xb6, 0x7c, 0xbc, 0x4d, - 0x23, 0x9e, 0xae, 0x40, 0x5d, 0x4c, 0xfe, 0x41, 0x05, 0xd9, 0x29, 0xe4, 0x96, 0xb3, 0xfe, 0x15, - 0xac, 0x2e, 0x2d, 0xf9, 0x86, 0x17, 0x46, 0x56, 0xec, 0xf2, 0x47, 0xf0, 0x36, 0x54, 0x4d, 0x67, - 0x8a, 0xf9, 0x82, 0x23, 0xab, 0x86, 0xc6, 0xd4, 0x4e, 0x1c, 0x25, 0xcf, 0x9a, 0xd1, 0x91, 0xb3, - 0x07, 0x55, 0xf3, 0x6e, 0x63, 0xdb, 0x50, 0x73, 0x3d, 0x73, 0x56, 0x73, 0xf5, 0x02, 0x99, 0xfb, - 0x44, 0xe6, 0x09, 0xdb, 0xf9, 0x4b, 0x11, 0x20, 0xa3, 0xbf, 0x45, 0x3b, 0xfb, 0x05, 0xac, 0xc5, - 0xc2, 0x93, 0xe1, 0xd4, 0x55, 0x0b, 0xe2, 0xda, 0xf7, 0xc9, 0x55, 0x22, 0x97, 0x90, 0xb9, 0xd6, - 0xb6, 0xf4, 0xfa, 0xd6, 0x76, 0x1b, 0xca, 0x9e, 0x8c, 0x16, 0xf6, 0x16, 0x61, 0xcb, 0x1b, 0xe9, - 0xcb, 0x68, 0x81, 0xaf, 0x54, 0x44, 0xb0, 0x2e, 0x54, 0x67, 0xe7, 0xf4, 0x92, 0x35, 0xaf, 0x80, - 0xeb, 0xcb, 0xd8, 0x07, 0xe7, 0x38, 0xc6, 0x77, 0xaf, 0x41, 0xb1, 0x5b, 0x50, 0x99, 0x9d, 0x4f, - 0x7d, 0x45, 0x4d, 0x71, 0xd3, 0xb4, 0x8d, 0x79, 0xf8, 0xc0, 0x57, 0xf8, 0xba, 0x25, 0x0c, 0x73, - 0xa0, 0xa8, 0x66, 0xf4, 0x10, 0x68, 0x9a, 0x27, 0x4e, 0xce, 0x9b, 0xb3, 0x83, 0x15, 0x5e, 0x54, - 0xb3, 0x5e, 0x1d, 0xaa, 0xc6, 0xaf, 0xce, 0x3f, 0x4b, 0xb0, 0xb6, 0x6c, 0x25, 0xe6, 0x41, 0xac, - 0xbc, 0x24, 0x0f, 0x62, 0xe5, 0xa5, 0x5d, 0x7f, 0x31, 0xd7, 0xf5, 0x3b, 0x50, 0x91, 0xcf, 0x42, - 0xa1, 0xf2, 0x4f, 0xf6, 0xfe, 0x99, 0x7c, 0x16, 0x62, 0x0f, 0x6b, 0x58, 0x4b, 0x2d, 0x61, 0xc5, - 0xb6, 0x84, 0x1f, 0xc3, 0xea, 0x89, 0x0c, 0x02, 0xf9, 0x6c, 0xb2, 0x98, 0x05, 0x7e, 0x78, 0x6e, - 0xfb, 0xc2, 0x65, 0x22, 0xdb, 0x86, 0x6b, 0x53, 0x5f, 0xa1, 0x39, 0x7d, 0x19, 0x6a, 0x11, 0xd2, - 0x23, 0x08, 0x71, 0x97, 0xc9, 0xec, 0x4b, 0xd8, 0x72, 0xb5, 0x16, 0xb3, 0x48, 0x3f, 0x0a, 0x23, - 0xd7, 0x3b, 0x1f, 0x48, 0x8f, 0xce, 0xec, 0x2c, 0x72, 0xb5, 0x7f, 0xec, 0x07, 0xf8, 0xde, 0xab, - 0x91, 0xe8, 0x6b, 0x71, 0xec, 0x13, 0x58, 0xf3, 0x94, 0x70, 0xb5, 0x18, 0x88, 0x58, 0x1f, 0xb9, - 0xfa, 0xac, 0x53, 0x27, 0xc9, 0x4b, 0x54, 0xdc, 0x83, 0x8b, 0xd6, 0x7e, 0xed, 0x07, 0x53, 0xcf, - 0x55, 0xd3, 0x4e, 0xc3, 0xec, 0x61, 0x89, 0xc8, 0xba, 0xc0, 0x88, 0x30, 0x9c, 0x45, 0x7a, 0x91, - 0x42, 0x81, 0xa0, 0x57, 0x70, 0xb0, 0xaa, 0x6a, 0x7f, 0x26, 0x62, 0xed, 0xce, 0x22, 0xfa, 0xd5, - 0x50, 0xe2, 0x19, 0x81, 0xdd, 0x84, 0xb6, 0x1f, 0x7a, 0xc1, 0x7c, 0x2a, 0x9e, 0x44, 0xb8, 0x11, - 0x15, 0xc6, 0x9d, 0x16, 0xd5, 0xa0, 0x6b, 0x96, 0x7e, 0x64, 0xc9, 0x08, 0x15, 0x17, 0x97, 0xa0, - 0xab, 0x06, 0x6a, 0xe9, 0x09, 0xd4, 0xf9, 0xb6, 0x00, 0xed, 0xcb, 0x89, 0x87, 0x61, 0x8b, 0x70, - 0xf3, 0xf6, 0x08, 0xe3, 0x38, 0x0d, 0x65, 0x31, 0x17, 0xca, 0xe4, 0x52, 0x2c, 0xe5, 0x2e, 0xc5, - 0x34, 0x2d, 0xca, 0xaf, 0x4e, 0x8b, 0xa5, 0x8d, 0x56, 0x2e, 0x6d, 0xd4, 0xf9, 0x6d, 0x01, 0xae, - 0x5d, 0x4a, 0xee, 0x37, 0xb6, 0x68, 0x0b, 0x9a, 0x33, 0xf7, 0x5c, 0x1c, 0xb9, 0x8a, 0x52, 0xa6, - 0x64, 0xba, 0xc6, 0x1c, 0xe9, 0xbf, 0x60, 0x5f, 0x08, 0xad, 0xfc, 0x89, 0xba, 0xd2, 0xb6, 0x24, - 0x41, 0x0e, 0xa5, 0xbe, 0x27, 0xe7, 0xf6, 0xc2, 0x4d, 0x12, 0x24, 0x21, 0xbe, 0x9c, 0x46, 0xa5, - 0x2b, 0xd2, 0xc8, 0x39, 0x84, 0x7a, 0x62, 0x20, 0xdb, 0xb4, 0x7f, 0x15, 0x0a, 0xd9, 0xdf, 0xad, - 0x47, 0xb1, 0x50, 0x68, 0xbb, 0xf9, 0xc5, 0xf0, 0x21, 0x54, 0x4e, 0x95, 0x9c, 0x47, 0xb6, 0x62, - 0x2f, 0x21, 0x0c, 0xc7, 0x99, 0x40, 0xcd, 0x52, 0xd8, 0x0e, 0x54, 0x8f, 0x17, 0x87, 0x49, 0xbf, - 0x63, 0xcb, 0x05, 0xce, 0xa7, 0x16, 0x81, 0x35, 0xc8, 0x20, 0xd8, 0x75, 0x28, 0x1f, 0x2f, 0x46, - 0x03, 0xf3, 0x06, 0xc4, 0x4a, 0x86, 0xb3, 0x5e, 0xd5, 0x18, 0xe4, 0xdc, 0x87, 0x56, 0x5e, 0x0e, - 0x9d, 0x92, 0xeb, 0xa3, 0x68, 0x9c, 0x95, 0xec, 0xe2, 0x6b, 0x4a, 0xf6, 0xce, 0x36, 0xd4, 0xec, - 0xff, 0x1b, 0xd6, 0x80, 0xca, 0xa3, 0xc3, 0xc9, 0xf0, 0x61, 0x7b, 0x85, 0xd5, 0xa1, 0x7c, 0x30, - 0x9e, 0x3c, 0x6c, 0x17, 0x70, 0x74, 0x38, 0x3e, 0x1c, 0xb6, 0x8b, 0x3b, 0x37, 0xa1, 0x95, 0xff, - 0x83, 0xc3, 0x9a, 0x50, 0x9b, 0xec, 0x1f, 0x0e, 0x7a, 0xe3, 0x5f, 0xb6, 0x57, 0x58, 0x0b, 0xea, - 0xa3, 0xc3, 0xc9, 0xb0, 0xff, 0x88, 0x0f, 0xdb, 0x85, 0x9d, 0x5f, 0x40, 0x23, 0xfd, 0x91, 0x80, - 0x1a, 0x7a, 0xa3, 0xc3, 0x41, 0x7b, 0x85, 0x01, 0x54, 0x27, 0xc3, 0x3e, 0x1f, 0xa2, 0xde, 0x1a, - 0x94, 0x26, 0x93, 0x83, 0x76, 0x11, 0x57, 0xed, 0xef, 0xf7, 0x0f, 0x86, 0xed, 0x12, 0x0e, 0x1f, - 0x3e, 0x38, 0xba, 0x37, 0x69, 0x97, 0x77, 0x3e, 0x83, 0x6b, 0x97, 0x1e, 0xeb, 0x24, 0x7d, 0xb0, - 0xcf, 0x87, 0xa8, 0xa9, 0x09, 0xb5, 0x23, 0x3e, 0x7a, 0xbc, 0xff, 0x70, 0xd8, 0x2e, 0x20, 0xe3, - 0xfe, 0xb8, 0xff, 0xd5, 0x70, 0xd0, 0x2e, 0xf6, 0x6e, 0x7c, 0xf7, 0x7c, 0xa3, 0xf0, 0xfd, 0xf3, - 0x8d, 0xc2, 0x0f, 0xcf, 0x37, 0x0a, 0x7f, 0x7f, 0xbe, 0x51, 0xf8, 0xf6, 0xc5, 0xc6, 0xca, 0xf7, - 0x2f, 0x36, 0x56, 0x7e, 0x78, 0xb1, 0xb1, 0x72, 0x5c, 0xa5, 0xff, 0xa9, 0x9f, 0xfe, 0x3b, 0x00, - 0x00, 0xff, 0xff, 0x3a, 0xd6, 0xef, 0x88, 0x8f, 0x15, 0x00, 0x00, + // 2320 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1c, 0xc7, + 0x11, 0xe6, 0xbe, 0x77, 0x6b, 0x97, 0xd4, 0xa6, 0x2d, 0xdb, 0x6b, 0x46, 0x21, 0xe9, 0xb1, 0x62, + 0x50, 0x94, 0xb4, 0x04, 0x68, 0xc0, 0x32, 0x8c, 0x20, 0x08, 0xf7, 0x21, 0x70, 0x2d, 0x89, 0x4b, + 0xf4, 0xea, 0x91, 0x9b, 0x30, 0x9c, 0xed, 0x25, 0x07, 0x9c, 0x99, 0x1e, 0xcc, 0xf4, 0x4a, 0xdc, + 0x1c, 0x72, 0x70, 0xfe, 0x80, 0x81, 0x00, 0xb9, 0x25, 0x41, 0xfe, 0x43, 0xae, 0xb9, 0xfb, 0xe8, + 0x43, 0x0e, 0x46, 0x0e, 0x4e, 0x20, 0xdd, 0xf3, 0x0b, 0x12, 0x20, 0xa8, 0xea, 0x9e, 0xc7, 0x52, + 0x14, 0x24, 0x21, 0x41, 0x4e, 0xd3, 0xfd, 0xd5, 0xd7, 0xd5, 0xd5, 0x5d, 0xd5, 0xd5, 0xd5, 0x03, + 0x0d, 0x19, 0xc6, 0xdd, 0x30, 0x92, 0x4a, 0xb2, 0x62, 0x78, 0xbc, 0x7e, 0xfb, 0xc4, 0x55, 0xa7, + 0xf3, 0xe3, 0xae, 0x23, 0xfd, 0xdd, 0x13, 0x79, 0x22, 0x77, 0x49, 0x74, 0x3c, 0x9f, 0x51, 0x8f, + 0x3a, 0xd4, 0xd2, 0x43, 0xac, 0x3f, 0x15, 0xa1, 0x38, 0x0e, 0xd9, 0xc7, 0x50, 0x75, 0x83, 0x70, + 0xae, 0xe2, 0x4e, 0x61, 0xab, 0xb4, 0xdd, 0xdc, 0x6b, 0x74, 0xc3, 0xe3, 0xee, 0x08, 0x11, 0x6e, + 0x04, 0x6c, 0x0b, 0xca, 0xe2, 0x5c, 0x38, 0x9d, 0xe2, 0x56, 0x61, 0xbb, 0xb9, 0x07, 0x48, 0x18, + 0x9e, 0x0b, 0x67, 0x1c, 0x1e, 0xac, 0x70, 0x92, 0xb0, 0x4f, 0xa1, 0x1a, 0xcb, 0x79, 0xe4, 0x88, + 0x4e, 0x89, 0x38, 0x2d, 0xe4, 0x4c, 0x08, 0x21, 0x96, 0x91, 0xa2, 0xa6, 0x99, 0xeb, 0x89, 0x4e, + 0x39, 0xd3, 0x74, 0xd7, 0xf5, 0x34, 0x87, 0x24, 0xec, 0x13, 0xa8, 0x1c, 0xcf, 0x5d, 0x6f, 0xda, + 0xa9, 0x10, 0xa5, 0x89, 0x94, 0x1e, 0x02, 0xc4, 0xd1, 0x32, 0xb6, 0x0d, 0xf5, 0xd0, 0xb3, 0xd5, + 0x4c, 0x46, 0x7e, 0x07, 0xb2, 0x09, 0x8f, 0x0c, 0xc6, 0x53, 0x29, 0xbb, 0x03, 0x4d, 0x47, 0x06, + 0xb1, 0x8a, 0x6c, 0x37, 0x50, 0x71, 0xa7, 0x49, 0xe4, 0xf7, 0x91, 0xfc, 0x44, 0x46, 0x67, 0x22, + 0xea, 0x67, 0x42, 0x9e, 0x67, 0xf6, 0xca, 0x50, 0x94, 0xa1, 0xf5, 0xbb, 0x02, 0xd4, 0x13, 0xad, + 0xcc, 0x82, 0xd6, 0x7e, 0xe4, 0x9c, 0xba, 0x4a, 0x38, 0x6a, 0x1e, 0x89, 0x4e, 0x61, 0xab, 0xb0, + 0xdd, 0xe0, 0x4b, 0x18, 0x5b, 0x83, 0xe2, 0x78, 0x42, 0x1b, 0xd5, 0xe0, 0xc5, 0xf1, 0x84, 0x75, + 0xa0, 0xf6, 0xd8, 0x8e, 0x5c, 0x3b, 0x50, 0xb4, 0x33, 0x0d, 0x9e, 0x74, 0xd9, 0x35, 0x68, 0x8c, + 0x27, 0x8f, 0x45, 0x14, 0xbb, 0x32, 0xa0, 0xfd, 0x68, 0xf0, 0x0c, 0x60, 0x1b, 0x00, 0xe3, 0xc9, + 0x5d, 0x61, 0xa3, 0xd2, 0xb8, 0x53, 0xd9, 0x2a, 0x6d, 0x37, 0x78, 0x0e, 0xb1, 0x7e, 0x0d, 0x15, + 0xf2, 0x11, 0xfb, 0x0a, 0xaa, 0x53, 0xf7, 0x44, 0xc4, 0x4a, 0x9b, 0xd3, 0xdb, 0xfb, 0xf6, 0x87, + 0xcd, 0x95, 0xbf, 0xfd, 0xb0, 0xb9, 0x93, 0x0b, 0x06, 0x19, 0x8a, 0xc0, 0x91, 0x81, 0xb2, 0xdd, + 0x40, 0x44, 0xf1, 0xee, 0x89, 0xbc, 0xad, 0x87, 0x74, 0x07, 0xf4, 0xe1, 0x46, 0x03, 0xbb, 0x01, + 0x15, 0x37, 0x98, 0x8a, 0x73, 0xb2, 0xbf, 0xd4, 0x7b, 0xcf, 0xa8, 0x6a, 0x8e, 0xe7, 0x2a, 0x9c, + 0xab, 0x11, 0x8a, 0xb8, 0x66, 0x58, 0x7f, 0x28, 0x40, 0x55, 0xc7, 0x00, 0xbb, 0x06, 0x65, 0x5f, + 0x28, 0x9b, 0xe6, 0x6f, 0xee, 0xd5, 0x71, 0x6f, 0x1f, 0x08, 0x65, 0x73, 0x42, 0x31, 0xbc, 0x7c, + 0x39, 0xc7, 0xbd, 0x2f, 0x66, 0xe1, 0xf5, 0x00, 0x11, 0x6e, 0x04, 0xec, 0xa7, 0x50, 0x0b, 0x84, + 0x7a, 0x2e, 0xa3, 0x33, 0xda, 0xa3, 0x35, 0xed, 0xf4, 0x43, 0xa1, 0x1e, 0xc8, 0xa9, 0xe0, 0x89, + 0x8c, 0xdd, 0x82, 0x7a, 0x2c, 0x9c, 0x79, 0xe4, 0xaa, 0x05, 0xed, 0xd7, 0xda, 0x5e, 0x9b, 0xa2, + 0xcc, 0x60, 0x44, 0x4e, 0x19, 0xd6, 0x6f, 0x8a, 0x50, 0x46, 0x33, 0x18, 0x83, 0xb2, 0x1d, 0x9d, + 0xe8, 0xe8, 0x6e, 0x70, 0x6a, 0xb3, 0x36, 0x94, 0x44, 0xf0, 0x8c, 0x2c, 0x6a, 0x70, 0x6c, 0x22, + 0xe2, 0x3c, 0x9f, 0x1a, 0x1f, 0x61, 0x13, 0xc7, 0xcd, 0x63, 0x11, 0x19, 0xd7, 0x50, 0x9b, 0xdd, + 0x80, 0x46, 0x18, 0xc9, 0xf3, 0xc5, 0x53, 0x1c, 0x5d, 0xc9, 0x05, 0x1e, 0x82, 0xc3, 0xe0, 0x19, + 0xaf, 0x87, 0xa6, 0xc5, 0x76, 0x00, 0xc4, 0xb9, 0x8a, 0xec, 0x03, 0x19, 0xab, 0xb8, 0x53, 0xa5, + 0xb5, 0x53, 0xbc, 0x23, 0x30, 0x3a, 0xe2, 0x39, 0x29, 0x5b, 0x87, 0xfa, 0xa9, 0x8c, 0x55, 0x60, + 0xfb, 0xa2, 0x53, 0xa3, 0xe9, 0xd2, 0x3e, 0x06, 0x50, 0x7c, 0xea, 0x4f, 0xdc, 0x5f, 0x89, 0x4e, + 0x1d, 0xbd, 0xc2, 0x93, 0x2e, 0xb3, 0xa0, 0x3a, 0xf7, 0x5c, 0xdf, 0x55, 0x9d, 0x46, 0xa6, 0xfd, + 0x11, 0x21, 0xdc, 0x48, 0xac, 0x5b, 0x50, 0xd5, 0xf3, 0xe1, 0x72, 0xb0, 0x65, 0x82, 0x96, 0xda, + 0x18, 0xac, 0xa3, 0xa3, 0x24, 0x58, 0x47, 0x47, 0xd6, 0x00, 0xaa, 0x7a, 0x3c, 0xb2, 0x0f, 0xd1, + 0x1a, 0xc3, 0xc6, 0x36, 0x62, 0x13, 0x39, 0x53, 0x3a, 0x38, 0x38, 0xb5, 0x49, 0xab, 0x1d, 0xe9, + 0x7d, 0x2b, 0x71, 0x6a, 0x5b, 0xff, 0x2c, 0x42, 0x85, 0x1c, 0xcc, 0xb6, 0x31, 0x9e, 0xc2, 0xb9, + 0x9e, 0xb4, 0xd4, 0x63, 0x26, 0x9e, 0x80, 0x22, 0x37, 0x0d, 0x27, 0x8c, 0xe2, 0x75, 0xf4, 0xad, + 0x27, 0x1c, 0x25, 0x23, 0x63, 0x4f, 0xda, 0xc7, 0x39, 0xa6, 0x18, 0xdf, 0xda, 0x37, 0xd4, 0x66, + 0x37, 0xa1, 0x2a, 0x29, 0x28, 0xc9, 0x3d, 0xaf, 0x09, 0x55, 0x43, 0x41, 0xe5, 0x91, 0xb0, 0xa7, + 0x32, 0xf0, 0x16, 0xe4, 0xb4, 0x3a, 0x4f, 0xfb, 0xec, 0x26, 0x34, 0x28, 0x0a, 0x1f, 0x2e, 0x42, + 0xd1, 0xa9, 0x52, 0x54, 0xad, 0xa6, 0x11, 0x8a, 0x20, 0xcf, 0xe4, 0x98, 0x76, 0x1c, 0xdb, 0x39, + 0x15, 0xe3, 0x50, 0x75, 0xae, 0x66, 0xde, 0xef, 0x1b, 0x8c, 0xa7, 0x52, 0x54, 0x1b, 0x0b, 0x27, + 0x12, 0x0a, 0xa9, 0xef, 0x13, 0x75, 0xd5, 0x04, 0xab, 0x06, 0x79, 0x26, 0x47, 0x47, 0x4e, 0x26, + 0x07, 0xc8, 0xfc, 0x20, 0x4b, 0x8b, 0x1a, 0xe1, 0x46, 0xa2, 0xd7, 0x10, 0xcf, 0x3d, 0x35, 0x1a, + 0x74, 0x3e, 0xd4, 0x1b, 0x94, 0xf4, 0xad, 0x11, 0xd4, 0x13, 0x13, 0xc8, 0xa5, 0x03, 0xe3, 0xb6, + 0xe2, 0x68, 0xc0, 0x6e, 0x63, 0xf8, 0xd8, 0x91, 0x1b, 0x9c, 0xd0, 0xbe, 0xae, 0xed, 0xbd, 0x97, + 0x5a, 0x3c, 0xd1, 0x38, 0xce, 0x92, 0x70, 0x2c, 0x09, 0x8d, 0xd4, 0xc4, 0x57, 0x74, 0xb5, 0xa1, + 0x34, 0x77, 0xa7, 0xa4, 0x67, 0x95, 0x63, 0x13, 0x91, 0x13, 0x57, 0x7b, 0x7f, 0x95, 0x63, 0x13, + 0x9d, 0xe5, 0xcb, 0xa9, 0x4e, 0xf0, 0xab, 0x9c, 0xda, 0x68, 0xbb, 0x0c, 0x95, 0x2b, 0x03, 0xdb, + 0x4b, 0xf6, 0x3f, 0xe9, 0x5b, 0x5e, 0xb2, 0xf6, 0xff, 0xcb, 0x6c, 0xbf, 0x2d, 0x40, 0x3d, 0xb9, + 0x95, 0x30, 0xc5, 0xba, 0x53, 0x11, 0x28, 0x77, 0xe6, 0x8a, 0xc8, 0x4c, 0x9c, 0x43, 0xd8, 0x6d, + 0xa8, 0xd8, 0x4a, 0x45, 0x49, 0xe2, 0xfa, 0x30, 0x7f, 0xa5, 0x75, 0xf7, 0x51, 0x32, 0x0c, 0x54, + 0xb4, 0xe0, 0x9a, 0xb5, 0xfe, 0x05, 0x40, 0x06, 0xa2, 0xad, 0x67, 0x62, 0x61, 0xb4, 0x62, 0x93, + 0x5d, 0x85, 0xca, 0x33, 0xdb, 0x9b, 0x0b, 0x13, 0xdf, 0xba, 0xf3, 0x65, 0xf1, 0x8b, 0x82, 0xf5, + 0x97, 0x22, 0xd4, 0xcc, 0x15, 0xc7, 0x6e, 0x41, 0x8d, 0xae, 0x38, 0x63, 0xd1, 0xe5, 0x87, 0x26, + 0xa1, 0xb0, 0xdd, 0xf4, 0xee, 0xce, 0xd9, 0x68, 0x54, 0xe9, 0x3b, 0xdc, 0xd8, 0x98, 0xdd, 0xe4, + 0xa5, 0xa9, 0x98, 0x99, 0x4b, 0x7a, 0x0d, 0xd9, 0x03, 0x31, 0x73, 0x03, 0x17, 0xf7, 0x87, 0xa3, + 0x88, 0xdd, 0x4a, 0x56, 0x5d, 0x26, 0x8d, 0x1f, 0xe4, 0x35, 0xbe, 0xba, 0xe8, 0x11, 0x34, 0x73, + 0xd3, 0x5c, 0xb2, 0xea, 0xeb, 0xf9, 0x55, 0x9b, 0x29, 0x49, 0x9d, 0xae, 0x30, 0xb2, 0x5d, 0xf8, + 0x2f, 0xf6, 0xef, 0x73, 0x80, 0x4c, 0xe5, 0xdb, 0x27, 0x1d, 0xeb, 0xeb, 0x12, 0xc0, 0x38, 0xc4, + 0x4b, 0x62, 0x6a, 0xd3, 0x4d, 0xd5, 0x72, 0x4f, 0x02, 0x19, 0x89, 0xa7, 0x74, 0x8c, 0x69, 0x7c, + 0x9d, 0x37, 0x35, 0x46, 0x27, 0x86, 0xed, 0x43, 0x73, 0x2a, 0x62, 0x27, 0x72, 0x29, 0xa0, 0xcc, + 0xa6, 0x6f, 0xe2, 0x9a, 0x32, 0x3d, 0xdd, 0x41, 0xc6, 0xd0, 0x7b, 0x95, 0x1f, 0xc3, 0xf6, 0xa0, + 0x25, 0xce, 0x43, 0x19, 0x29, 0x33, 0x8b, 0xae, 0x84, 0xae, 0xe8, 0x9a, 0x0a, 0x71, 0x9a, 0x89, + 0x37, 0x45, 0xd6, 0x61, 0x36, 0x94, 0x1d, 0x3b, 0xd4, 0x65, 0x40, 0x73, 0xaf, 0x73, 0x61, 0xbe, + 0xbe, 0x1d, 0xea, 0x4d, 0xeb, 0x7d, 0x86, 0x6b, 0xfd, 0xfa, 0xef, 0x9b, 0x37, 0x73, 0x77, 0xbf, + 0x2f, 0x8f, 0x17, 0xbb, 0x14, 0x2f, 0x67, 0xae, 0xda, 0x9d, 0x2b, 0xd7, 0xdb, 0xb5, 0x43, 0x17, + 0xd5, 0xe1, 0xc0, 0xd1, 0x80, 0x93, 0xea, 0xf5, 0x9f, 0x43, 0xfb, 0xa2, 0xdd, 0xef, 0xe2, 0x83, + 0xf5, 0x3b, 0xd0, 0x48, 0xed, 0x78, 0xd3, 0xc0, 0x7a, 0xde, 0x79, 0x7f, 0x2e, 0x40, 0x55, 0x9f, + 0x2a, 0x76, 0x07, 0x1a, 0x9e, 0x74, 0x6c, 0x34, 0x20, 0x29, 0x46, 0x3f, 0xca, 0x0e, 0x5d, 0xf7, + 0x7e, 0x22, 0xd3, 0xbb, 0x9a, 0x71, 0x31, 0xc8, 0xdc, 0x60, 0x26, 0x93, 0x53, 0xb0, 0x96, 0x0d, + 0x1a, 0x05, 0x33, 0xc9, 0xb5, 0x70, 0xfd, 0x1e, 0xac, 0x2d, 0xab, 0xb8, 0xc4, 0xce, 0x4f, 0x96, + 0xc3, 0x95, 0x72, 0x76, 0x3a, 0x28, 0x6f, 0xf6, 0x1d, 0x68, 0xa4, 0x38, 0xdb, 0x79, 0xd5, 0xf0, + 0x56, 0x7e, 0x64, 0xce, 0x56, 0xcb, 0x03, 0xc8, 0x4c, 0xc3, 0x64, 0x85, 0x55, 0x6f, 0x90, 0xdd, + 0xb5, 0x69, 0x9f, 0xee, 0x3d, 0x5b, 0xd9, 0x64, 0x4a, 0x8b, 0x53, 0x9b, 0x75, 0x01, 0xa6, 0xe9, + 0x81, 0x7d, 0xcd, 0x31, 0xce, 0x31, 0xac, 0x31, 0xd4, 0x13, 0x23, 0xd8, 0x16, 0x34, 0x63, 0x33, + 0x33, 0xd6, 0x78, 0x38, 0x5d, 0x85, 0xe7, 0x21, 0xac, 0xd5, 0x22, 0x3b, 0x38, 0x11, 0x4b, 0xb5, + 0x1a, 0x47, 0x84, 0x1b, 0x81, 0xf5, 0x04, 0x2a, 0x04, 0xe0, 0x31, 0x8b, 0x95, 0x1d, 0x29, 0x53, + 0xf6, 0xe9, 0x32, 0x48, 0xc6, 0x34, 0x6d, 0xaf, 0x8c, 0x81, 0xc8, 0x35, 0x81, 0x5d, 0xc7, 0x62, + 0x6b, 0x6a, 0x76, 0xf4, 0x32, 0x1e, 0x8a, 0xad, 0x9f, 0x41, 0x3d, 0x81, 0x71, 0xe5, 0xf7, 0xdd, + 0x40, 0x18, 0x13, 0xa9, 0x8d, 0xe5, 0x72, 0xff, 0xd4, 0x8e, 0x6c, 0x47, 0x09, 0x5d, 0x22, 0x54, + 0x78, 0x06, 0x58, 0x9f, 0x40, 0x33, 0x77, 0x7a, 0x30, 0xdc, 0x1e, 0x93, 0x1b, 0xf5, 0x19, 0xd6, + 0x1d, 0xeb, 0x8f, 0x58, 0xcc, 0x27, 0xf5, 0xd9, 0x4f, 0x00, 0x4e, 0x95, 0x0a, 0x9f, 0x52, 0xc1, + 0x66, 0xf6, 0xbe, 0x81, 0x08, 0x31, 0xd8, 0x26, 0x34, 0xb1, 0x13, 0x1b, 0xb9, 0x8e, 0x77, 0x1a, + 0x11, 0x6b, 0xc2, 0x8f, 0xa1, 0x31, 0x4b, 0x87, 0x97, 0x8c, 0xeb, 0x92, 0xd1, 0x1f, 0x41, 0x3d, + 0x90, 0x46, 0xa6, 0xeb, 0xc7, 0x5a, 0x20, 0xd3, 0x71, 0xb6, 0xe7, 0x19, 0x59, 0x45, 0x8f, 0xb3, + 0x3d, 0x8f, 0x84, 0xd6, 0x4d, 0xf8, 0xd1, 0x2b, 0xcf, 0x12, 0xf6, 0x01, 0x54, 0x67, 0xae, 0xa7, + 0xe8, 0x46, 0xc0, 0x7a, 0xd5, 0xf4, 0xac, 0x7f, 0x17, 0x00, 0x32, 0xb7, 0x63, 0x30, 0x63, 0x6a, + 0x47, 0x4e, 0x4b, 0xa7, 0x72, 0x0f, 0xea, 0xbe, 0x49, 0x12, 0xc6, 0xa1, 0xd7, 0x96, 0x43, 0xa5, + 0x9b, 0xe4, 0x10, 0x9d, 0x3e, 0xf6, 0x4c, 0xfa, 0x78, 0x97, 0xa7, 0x43, 0x3a, 0x03, 0x55, 0x31, + 0xf9, 0x27, 0x20, 0x64, 0xa7, 0x90, 0x1b, 0xc9, 0xfa, 0x3d, 0x58, 0x5d, 0x9a, 0xf2, 0x2d, 0x2f, + 0x8c, 0x2c, 0xd9, 0xe5, 0x8f, 0xe0, 0x1e, 0x54, 0xf5, 0xdb, 0x91, 0x6d, 0x43, 0xcd, 0x76, 0xf4, + 0xe9, 0xcb, 0x65, 0x00, 0x14, 0xee, 0x13, 0xcc, 0x13, 0xb1, 0xf5, 0xd7, 0x22, 0x40, 0x86, 0xbf, + 0x43, 0x81, 0xfa, 0x25, 0xac, 0xc5, 0xc2, 0x91, 0xc1, 0xd4, 0x8e, 0x16, 0x24, 0x35, 0x6f, 0xa4, + 0xcb, 0x86, 0x5c, 0x60, 0xe6, 0x8a, 0xd5, 0xd2, 0x9b, 0x8b, 0xd5, 0x6d, 0x28, 0x3b, 0x32, 0x5c, + 0x98, 0x7b, 0x81, 0x2d, 0x2f, 0xa4, 0x2f, 0xc3, 0x05, 0xbe, 0x94, 0x91, 0xc1, 0xba, 0x50, 0xf5, + 0xcf, 0xe8, 0x35, 0xad, 0x5f, 0x22, 0x57, 0x97, 0xb9, 0x0f, 0xce, 0xb0, 0x8d, 0x6f, 0x6f, 0xcd, + 0x62, 0x37, 0xa1, 0xe2, 0x9f, 0x4d, 0xdd, 0x88, 0xca, 0xdc, 0xa6, 0x2e, 0x04, 0xf3, 0xf4, 0x81, + 0x1b, 0xe1, 0x0b, 0x9b, 0x38, 0xcc, 0x82, 0x62, 0xe4, 0xd3, 0x63, 0xa4, 0xa9, 0x9f, 0x59, 0xb9, + 0xdd, 0xf4, 0x0f, 0x56, 0x78, 0x31, 0xf2, 0x7b, 0x75, 0xa8, 0xea, 0x7d, 0xb5, 0xfe, 0x55, 0x82, + 0xb5, 0x65, 0x2b, 0xd1, 0xb3, 0x71, 0xe4, 0x24, 0x9e, 0x8d, 0x23, 0x27, 0xad, 0xe3, 0x8b, 0xb9, + 0x3a, 0xde, 0x82, 0x8a, 0x7c, 0x1e, 0x88, 0x28, 0xff, 0xdb, 0xa0, 0x7f, 0x2a, 0x9f, 0x07, 0x58, + 0x95, 0x6a, 0xd1, 0x52, 0x91, 0x57, 0x31, 0x45, 0xde, 0x75, 0x58, 0x9d, 0x49, 0xcf, 0x93, 0xcf, + 0x27, 0x0b, 0xdf, 0x73, 0x83, 0x33, 0x53, 0xe9, 0x2d, 0x83, 0x6c, 0x1b, 0xae, 0x4c, 0xdd, 0x08, + 0xcd, 0xe9, 0xcb, 0x40, 0x89, 0x80, 0x1e, 0x62, 0xc8, 0xbb, 0x08, 0xb3, 0xaf, 0x60, 0xcb, 0x56, + 0x4a, 0xf8, 0xa1, 0x7a, 0x14, 0x84, 0xb6, 0x73, 0x36, 0x90, 0x0e, 0x9d, 0x42, 0x3f, 0xb4, 0x95, + 0x7b, 0xec, 0x7a, 0xf8, 0xe6, 0xac, 0xd1, 0xd0, 0x37, 0xf2, 0xd8, 0xa7, 0xb0, 0xe6, 0x44, 0xc2, + 0x56, 0x62, 0x20, 0x62, 0x75, 0x64, 0xab, 0x53, 0x7a, 0xb8, 0xd5, 0xf9, 0x05, 0x14, 0xd7, 0x60, + 0xa3, 0xb5, 0x4f, 0x5c, 0x6f, 0xea, 0xe0, 0x23, 0xaa, 0xa1, 0xd7, 0xb0, 0x04, 0xb2, 0x2e, 0x30, + 0x02, 0x86, 0x7e, 0xa8, 0x16, 0x29, 0x15, 0x88, 0x7a, 0x89, 0x04, 0xf3, 0xa4, 0x72, 0x7d, 0x11, + 0x2b, 0xdb, 0x0f, 0xe9, 0x77, 0x47, 0x89, 0x67, 0x00, 0xbb, 0x01, 0x6d, 0x37, 0x70, 0xbc, 0xf9, + 0x54, 0x3c, 0x0d, 0x71, 0x21, 0x51, 0x10, 0x77, 0x5a, 0x94, 0x55, 0xae, 0x18, 0xfc, 0xc8, 0xc0, + 0x48, 0x15, 0xe7, 0x17, 0xa8, 0xab, 0x9a, 0x6a, 0xf0, 0x84, 0x6a, 0x7d, 0x53, 0x80, 0xf6, 0xc5, + 0xc0, 0x43, 0xb7, 0x85, 0xb8, 0x78, 0xf3, 0x84, 0xc4, 0x76, 0xea, 0xca, 0x62, 0xce, 0x95, 0xc9, + 0x35, 0x57, 0xca, 0x5d, 0x73, 0x69, 0x58, 0x94, 0x5f, 0x1f, 0x16, 0x4b, 0x0b, 0xad, 0x5c, 0x58, + 0xa8, 0xf5, 0xfb, 0x02, 0x5c, 0xb9, 0x10, 0xdc, 0x6f, 0x6d, 0xd1, 0x16, 0x34, 0x7d, 0xfb, 0x4c, + 0x1c, 0xd9, 0x11, 0x85, 0x4c, 0x49, 0xd7, 0x81, 0x39, 0xe8, 0x7f, 0x60, 0x5f, 0x00, 0xad, 0xfc, + 0x89, 0xba, 0xd4, 0xb6, 0x24, 0x40, 0x0e, 0xa5, 0xba, 0x2b, 0xe7, 0xe6, 0x0a, 0x4d, 0x02, 0x24, + 0x01, 0x5f, 0x0d, 0xa3, 0xd2, 0x25, 0x61, 0x64, 0x1d, 0x42, 0x3d, 0x31, 0x90, 0x6d, 0x9a, 0x3f, + 0x1b, 0x85, 0xec, 0x0f, 0xdb, 0xa3, 0x58, 0x44, 0x68, 0xbb, 0xfe, 0xcd, 0xf1, 0x31, 0x54, 0x4e, + 0x22, 0x39, 0x0f, 0x4d, 0x0e, 0x5e, 0x62, 0x68, 0x89, 0x35, 0x81, 0x9a, 0x41, 0xd8, 0x0e, 0x54, + 0x8f, 0x17, 0xe9, 0xdf, 0x02, 0x93, 0x2e, 0xb0, 0x3f, 0x35, 0x0c, 0xcc, 0x41, 0x9a, 0xc1, 0xae, + 0x42, 0xf9, 0x78, 0x31, 0x1a, 0xe8, 0x57, 0x1d, 0x66, 0x32, 0xec, 0xf5, 0xaa, 0xda, 0x20, 0xeb, + 0x3e, 0xb4, 0xf2, 0xe3, 0x70, 0x53, 0x72, 0x95, 0x11, 0xb5, 0xb3, 0x94, 0x5d, 0x7c, 0x43, 0xca, + 0xde, 0xd9, 0x86, 0x9a, 0xf9, 0x87, 0xc4, 0x1a, 0x50, 0x79, 0x74, 0x38, 0x19, 0x3e, 0x6c, 0xaf, + 0xb0, 0x3a, 0x94, 0x0f, 0xc6, 0x93, 0x87, 0xed, 0x02, 0xb6, 0x0e, 0xc7, 0x87, 0xc3, 0x76, 0x71, + 0xe7, 0x06, 0xb4, 0xf2, 0x7f, 0x91, 0x58, 0x13, 0x6a, 0x93, 0xfd, 0xc3, 0x41, 0x6f, 0xfc, 0xcb, + 0xf6, 0x0a, 0x6b, 0x41, 0x7d, 0x74, 0x38, 0x19, 0xf6, 0x1f, 0xf1, 0x61, 0xbb, 0xb0, 0xf3, 0x0b, + 0x68, 0xa4, 0xbf, 0x06, 0x50, 0x43, 0x6f, 0x74, 0x38, 0x68, 0xaf, 0x30, 0x80, 0xea, 0x64, 0xd8, + 0xe7, 0x43, 0xd4, 0x5b, 0x83, 0xd2, 0x64, 0x72, 0xd0, 0x2e, 0xe2, 0xac, 0xfd, 0xfd, 0xfe, 0xc1, + 0xb0, 0x5d, 0xc2, 0xe6, 0xc3, 0x07, 0x47, 0x77, 0x27, 0xed, 0xf2, 0xce, 0xe7, 0x70, 0xe5, 0xc2, + 0xf3, 0x9b, 0x46, 0x1f, 0xec, 0xf3, 0x21, 0x6a, 0x6a, 0x42, 0xed, 0x88, 0x8f, 0x1e, 0xef, 0x3f, + 0x1c, 0xb6, 0x0b, 0x28, 0xb8, 0x3f, 0xee, 0xdf, 0x1b, 0x0e, 0xda, 0xc5, 0xde, 0xb5, 0x6f, 0x5f, + 0x6c, 0x14, 0xbe, 0x7b, 0xb1, 0x51, 0xf8, 0xfe, 0xc5, 0x46, 0xe1, 0x1f, 0x2f, 0x36, 0x0a, 0xdf, + 0xbc, 0xdc, 0x58, 0xf9, 0xee, 0xe5, 0xc6, 0xca, 0xf7, 0x2f, 0x37, 0x56, 0x8e, 0xab, 0xf4, 0x4f, + 0xf7, 0xb3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x50, 0xda, 0x43, 0x13, 0x16, 0x00, 0x00, } func (m *Op) Marshal() (dAtA []byte, err error) { @@ -2831,6 +2907,25 @@ func (m *Meta) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Ulimit) > 0 { + for iNdEx := len(m.Ulimit) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Ulimit[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOps(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } + } + if m.ShmSize != 0 { + i = encodeVarintOps(dAtA, i, uint64(m.ShmSize)) + i-- + dAtA[i] = 0x40 + } if len(m.Hostname) > 0 { i -= len(m.Hostname) copy(dAtA[i:], m.Hostname) @@ -2899,7 +2994,7 @@ func (m *Meta) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Mount) Marshal() (dAtA []byte, err error) { +func (m *HostIP) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2909,51 +3004,128 @@ func (m *Mount) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Mount) MarshalTo(dAtA []byte) (int, error) { +func (m *HostIP) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Mount) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *HostIP) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ResultID) > 0 { - i -= len(m.ResultID) - copy(dAtA[i:], m.ResultID) - i = encodeVarintOps(dAtA, i, uint64(len(m.ResultID))) - i-- - dAtA[i] = 0x1 + if len(m.IP) > 0 { + i -= len(m.IP) + copy(dAtA[i:], m.IP) + i = encodeVarintOps(dAtA, i, uint64(len(m.IP))) i-- - dAtA[i] = 0xba + dAtA[i] = 0x12 } - if m.SSHOpt != nil { - { - size, err := m.SSHOpt.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOps(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 + if len(m.Host) > 0 { + i -= len(m.Host) + copy(dAtA[i:], m.Host) + i = encodeVarintOps(dAtA, i, uint64(len(m.Host))) i-- - dAtA[i] = 0xb2 + dAtA[i] = 0xa } - if m.SecretOpt != nil { - { - size, err := m.SecretOpt.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOps(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- + return len(dAtA) - i, nil +} + +func (m *Ulimit) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Ulimit) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Ulimit) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Hard != 0 { + i = encodeVarintOps(dAtA, i, uint64(m.Hard)) + i-- + dAtA[i] = 0x18 + } + if m.Soft != 0 { + i = encodeVarintOps(dAtA, i, uint64(m.Soft)) + i-- + dAtA[i] = 0x10 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintOps(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *Mount) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Mount) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Mount) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ResultID) > 0 { + i -= len(m.ResultID) + copy(dAtA[i:], m.ResultID) + i = encodeVarintOps(dAtA, i, uint64(len(m.ResultID))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xba + } + if m.SSHOpt != nil { + { + size, err := m.SSHOpt.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOps(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 + } + if m.SecretOpt != nil { + { + size, err := m.SecretOpt.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOps(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- dAtA[i] = 0xaa } if m.CacheOpt != nil { @@ -3898,43 +4070,6 @@ func (m *Definition) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *HostIP) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *HostIP) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *HostIP) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.IP) > 0 { - i -= len(m.IP) - copy(dAtA[i:], m.IP) - i = encodeVarintOps(dAtA, i, uint64(len(m.IP))) - i-- - dAtA[i] = 0x12 - } - if len(m.Host) > 0 { - i -= len(m.Host) - copy(dAtA[i:], m.Host) - i = encodeVarintOps(dAtA, i, uint64(len(m.Host))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *FileOp) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4755,6 +4890,51 @@ func (m *Meta) Size() (n int) { if l > 0 { n += 1 + l + sovOps(uint64(l)) } + if m.ShmSize != 0 { + n += 1 + sovOps(uint64(m.ShmSize)) + } + if len(m.Ulimit) > 0 { + for _, e := range m.Ulimit { + l = e.Size() + n += 1 + l + sovOps(uint64(l)) + } + } + return n +} + +func (m *HostIP) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Host) + if l > 0 { + n += 1 + l + sovOps(uint64(l)) + } + l = len(m.IP) + if l > 0 { + n += 1 + l + sovOps(uint64(l)) + } + return n +} + +func (m *Ulimit) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovOps(uint64(l)) + } + if m.Soft != 0 { + n += 1 + sovOps(uint64(m.Soft)) + } + if m.Hard != 0 { + n += 1 + sovOps(uint64(m.Hard)) + } return n } @@ -5165,23 +5345,6 @@ func (m *Definition) Size() (n int) { return n } -func (m *HostIP) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Host) - if l > 0 { - n += 1 + l + sovOps(uint64(l)) - } - l = len(m.IP) - if l > 0 { - n += 1 + l + sovOps(uint64(l)) - } - return n -} - func (m *FileOp) Size() (n int) { if m == nil { return 0 @@ -6295,7 +6458,308 @@ func (m *Meta) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Env", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Env", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Env = append(m.Env, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Cwd", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Cwd = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.User = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProxyEnv", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ProxyEnv == nil { + m.ProxyEnv = &ProxyEnv{} + } + if err := m.ProxyEnv.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtraHosts", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ExtraHosts = append(m.ExtraHosts, &HostIP{}) + if err := m.ExtraHosts[len(m.ExtraHosts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hostname", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Hostname = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShmSize", wireType) + } + m.ShmSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShmSize |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ulimit", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Ulimit = append(m.Ulimit, &Ulimit{}) + if err := m.Ulimit[len(m.Ulimit)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipOps(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthOps + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *HostIP) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: HostIP: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: HostIP: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Host", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6323,11 +6787,11 @@ func (m *Meta) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Env = append(m.Env, string(dAtA[iNdEx:postIndex])) + m.Host = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Cwd", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IP", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6355,45 +6819,63 @@ func (m *Meta) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Cwd = string(dAtA[iNdEx:postIndex]) + m.IP = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOps - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipOps(dAtA[iNdEx:]) + if err != nil { + return err } - intStringLen := int(stringLen) - if intStringLen < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthOps } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOps + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF } - if postIndex > l { + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Ulimit) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { return io.ErrUnexpectedEOF } - m.User = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Ulimit: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Ulimit: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProxyEnv", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOps @@ -6403,33 +6885,29 @@ func (m *Meta) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthOps } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthOps } if postIndex > l { return io.ErrUnexpectedEOF } - if m.ProxyEnv == nil { - m.ProxyEnv = &ProxyEnv{} - } - if err := m.ProxyEnv.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExtraHosts", wireType) + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Soft", wireType) } - var msglen int + m.Soft = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOps @@ -6439,31 +6917,16 @@ func (m *Meta) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.Soft |= int64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthOps - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOps - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ExtraHosts = append(m.ExtraHosts, &HostIP{}) - if err := m.ExtraHosts[len(m.ExtraHosts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hostname", wireType) + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Hard", wireType) } - var stringLen uint64 + m.Hard = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOps @@ -6473,24 +6936,11 @@ func (m *Meta) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Hard |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOps - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOps - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hostname = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOps(dAtA[iNdEx:]) @@ -9614,120 +10064,6 @@ func (m *Definition) Unmarshal(dAtA []byte) error { } return nil } -func (m *HostIP) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOps - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: HostIP: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: HostIP: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Host", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOps - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOps - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOps - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Host = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IP", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOps - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOps - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOps - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IP = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOps(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOps - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *FileOp) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/vendor/github.com/moby/buildkit/solver/pb/ops.proto b/vendor/github.com/moby/buildkit/solver/pb/ops.proto index 39983e0eeec2..85af7cc1f3a2 100644 --- a/vendor/github.com/moby/buildkit/solver/pb/ops.proto +++ b/vendor/github.com/moby/buildkit/solver/pb/ops.proto @@ -58,6 +58,19 @@ message Meta { ProxyEnv proxy_env = 5; repeated HostIP extraHosts = 6; string hostname = 7; + int64 shmSize = 8; + repeated Ulimit ulimit = 9; +} + +message HostIP { + string Host = 1; + string IP = 2; +} + +message Ulimit { + string Name = 1; + int64 Soft = 2; + int64 Hard = 3; } enum NetMode { @@ -243,11 +256,6 @@ message Definition { Source Source = 3; } -message HostIP { - string Host = 1; - string IP = 2; -} - message FileOp { repeated FileAction actions = 2; } diff --git a/vendor/modules.txt b/vendor/modules.txt index ac195a40da97..ee11dd47033f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -281,7 +281,7 @@ github.com/miekg/pkcs11 github.com/mitchellh/go-wordwrap # github.com/mitchellh/mapstructure v1.4.1 github.com/mitchellh/mapstructure -# github.com/moby/buildkit v0.9.1-0.20210927192002-23c8affb1ffe +# github.com/moby/buildkit v0.9.1-0.20211008210008-ba673bbdab4f ## explicit github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/types