diff --git a/client/client_test.go b/client/client_test.go index f4a76fea..a6cf97af 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -3148,12 +3148,13 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) { defer c.Close() base := llb.Image("docker.io/library/busybox:latest").Dir("/out") - cmd := `sh -c "echo -n $HTTP_PROXY-$HTTPS_PROXY-$NO_PROXY-$no_proxy > env"` + cmd := `sh -c "echo -n $HTTP_PROXY-$HTTPS_PROXY-$NO_PROXY-$no_proxy-$ALL_PROXY-$all_proxy > env"` st := base.Run(llb.Shlex(cmd), llb.WithProxy(llb.ProxyEnv{ HTTPProxy: "httpvalue", HTTPSProxy: "httpsvalue", NoProxy: "noproxyvalue", + AllProxy: "allproxyvalue", })) out := st.AddMount("/out", llb.Scratch()) @@ -3176,7 +3177,7 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) { dt, err := ioutil.ReadFile(filepath.Join(destDir, "env")) require.NoError(t, err) - require.Equal(t, string(dt), "httpvalue-httpsvalue-noproxyvalue-noproxyvalue") + require.Equal(t, string(dt), "httpvalue-httpsvalue-noproxyvalue-noproxyvalue-allproxyvalue-allproxyvalue") // repeat to make sure proxy doesn't change cache st = base.Run(llb.Shlex(cmd), llb.WithProxy(llb.ProxyEnv{ @@ -3204,7 +3205,7 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) { dt, err = ioutil.ReadFile(filepath.Join(destDir, "env")) require.NoError(t, err) - require.Equal(t, string(dt), "httpvalue-httpsvalue-noproxyvalue-noproxyvalue") + require.Equal(t, string(dt), "httpvalue-httpsvalue-noproxyvalue-noproxyvalue-allproxyvalue-allproxyvalue") } func requiresLinux(t *testing.T) { diff --git a/client/llb/exec.go b/client/llb/exec.go index decc0d74..54182e3f 100644 --- a/client/llb/exec.go +++ b/client/llb/exec.go @@ -233,6 +233,7 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, [] HttpsProxy: p.HTTPSProxy, FtpProxy: p.FTPProxy, NoProxy: p.NoProxy, + AllProxy: p.AllProxy, } addCap(&e.constraints, pb.CapExecMetaProxy) } @@ -645,6 +646,7 @@ type ProxyEnv struct { HTTPSProxy string FTPProxy string NoProxy string + AllProxy string } type CacheMountSharingMode int diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go index 7c749a7b..02f08f48 100644 --- a/frontend/dockerfile/dockerfile2llb/convert.go +++ b/frontend/dockerfile/dockerfile2llb/convert.go @@ -1338,6 +1338,10 @@ func proxyEnvFromBuildArgs(args map[string]string) *llb.ProxyEnv { pe.NoProxy = v isNil = false } + if strings.EqualFold(k, "all_proxy") { + pe.AllProxy = v + isNil = false + } } if isNil { return nil diff --git a/solver/llbsolver/ops/exec.go b/solver/llbsolver/ops/exec.go index 24aa46aa..c8f0aaf0 100644 --- a/solver/llbsolver/ops/exec.go +++ b/solver/llbsolver/ops/exec.go @@ -352,6 +352,9 @@ func proxyEnvList(p *pb.ProxyEnv) []string { if v := p.NoProxy; v != "" { out = append(out, "NO_PROXY="+v, "no_proxy="+v) } + if v := p.AllProxy; v != "" { + out = append(out, "ALL_PROXY="+v, "all_proxy="+v) + } return out } diff --git a/solver/pb/ops.pb.go b/solver/pb/ops.pb.go index 825ffb18..08d87e12 100644 --- a/solver/pb/ops.pb.go +++ b/solver/pb/ops.pb.go @@ -1409,6 +1409,7 @@ type ProxyEnv struct { HttpsProxy string `protobuf:"bytes,2,opt,name=https_proxy,json=httpsProxy,proto3" json:"https_proxy,omitempty"` FtpProxy string `protobuf:"bytes,3,opt,name=ftp_proxy,json=ftpProxy,proto3" json:"ftp_proxy,omitempty"` NoProxy string `protobuf:"bytes,4,opt,name=no_proxy,json=noProxy,proto3" json:"no_proxy,omitempty"` + AllProxy string `protobuf:"bytes,5,opt,name=all_proxy,json=allProxy,proto3" json:"all_proxy,omitempty"` } func (m *ProxyEnv) Reset() { *m = ProxyEnv{} } @@ -1468,6 +1469,13 @@ func (m *ProxyEnv) GetNoProxy() string { return "" } +func (m *ProxyEnv) GetAllProxy() string { + if m != nil { + return m.AllProxy + } + return "" +} + // WorkerConstraints defines conditions for the worker type WorkerConstraints struct { Filter []string `protobuf:"bytes,1,rep,name=filter,proto3" json:"filter,omitempty"` @@ -2332,146 +2340,147 @@ func init() { func init() { proto.RegisterFile("ops.proto", fileDescriptor_8de16154b2733812) } var fileDescriptor_8de16154b2733812 = []byte{ - // 2217 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0x17, 0xbf, 0xc9, 0x47, 0x49, 0x66, 0x27, 0x4e, 0xc2, 0xa8, 0xae, 0xa4, 0x6c, 0xdc, 0x40, - 0x96, 0x6d, 0x0a, 0x50, 0x80, 0x38, 0x08, 0x8a, 0xa2, 0xe2, 0x87, 0x21, 0xc6, 0xb6, 0x28, 0x0c, - 0xfd, 0xd1, 0x9b, 0xb1, 0x5a, 0x0e, 0xa9, 0x85, 0xc8, 0x9d, 0xc5, 0xec, 0xd0, 0x16, 0x2f, 0x3d, - 0xf8, 0x2f, 0x08, 0x50, 0xa0, 0xb7, 0x16, 0xe8, 0xa5, 0x7f, 0x41, 0xaf, 0x3d, 0x16, 0xc8, 0x31, - 0x87, 0x1e, 0x82, 0x1e, 0xd2, 0xc2, 0xbe, 0xf7, 0x3f, 0x28, 0x50, 0xbc, 0x37, 0xb3, 0x1f, 0x94, - 0x65, 0xd8, 0x46, 0x8b, 0x9e, 0x76, 0xe6, 0xbd, 0xdf, 0xbc, 0x79, 0xf3, 0xbe, 0xe6, 0xcd, 0x42, - 0x4d, 0x86, 0x51, 0x2b, 0x54, 0x52, 0x4b, 0x96, 0x0f, 0x4f, 0x36, 0x6e, 0x4f, 0x7c, 0x7d, 0x3a, - 0x3f, 0x69, 0x79, 0x72, 0xb6, 0x37, 0x91, 0x13, 0xb9, 0x47, 0xac, 0x93, 0xf9, 0x98, 0x66, 0x34, - 0xa1, 0x91, 0x59, 0xe2, 0xfc, 0x31, 0x0f, 0xf9, 0x41, 0xc8, 0x3e, 0x85, 0xb2, 0x1f, 0x84, 0x73, - 0x1d, 0x35, 0x73, 0xdb, 0x85, 0x9d, 0xfa, 0x7e, 0xad, 0x15, 0x9e, 0xb4, 0xfa, 0x48, 0xe1, 0x96, - 0xc1, 0xb6, 0xa1, 0x28, 0xce, 0x85, 0xd7, 0xcc, 0x6f, 0xe7, 0x76, 0xea, 0xfb, 0x80, 0x80, 0xde, - 0xb9, 0xf0, 0x06, 0xe1, 0xe1, 0x0a, 0x27, 0x0e, 0xfb, 0x1c, 0xca, 0x91, 0x9c, 0x2b, 0x4f, 0x34, - 0x0b, 0x84, 0x59, 0x45, 0xcc, 0x90, 0x28, 0x84, 0xb2, 0x5c, 0x94, 0x34, 0xf6, 0xa7, 0xa2, 0x59, - 0x4c, 0x25, 0xdd, 0xf5, 0xa7, 0x06, 0x43, 0x1c, 0xf6, 0x19, 0x94, 0x4e, 0xe6, 0xfe, 0x74, 0xd4, - 0x2c, 0x11, 0xa4, 0x8e, 0x90, 0x36, 0x12, 0x08, 0x63, 0x78, 0x6c, 0x07, 0xaa, 0xe1, 0xd4, 0xd5, - 0x63, 0xa9, 0x66, 0x4d, 0x48, 0x37, 0x3c, 0xb6, 0x34, 0x9e, 0x70, 0xd9, 0x1d, 0xa8, 0x7b, 0x32, - 0x88, 0xb4, 0x72, 0xfd, 0x40, 0x47, 0xcd, 0x3a, 0x81, 0x3f, 0x44, 0xf0, 0x13, 0xa9, 0xce, 0x84, - 0xea, 0xa4, 0x4c, 0x9e, 0x45, 0xb6, 0x8b, 0x90, 0x97, 0xa1, 0xf3, 0xbb, 0x1c, 0x54, 0x63, 0xa9, - 0xcc, 0x81, 0xd5, 0x03, 0xe5, 0x9d, 0xfa, 0x5a, 0x78, 0x7a, 0xae, 0x44, 0x33, 0xb7, 0x9d, 0xdb, - 0xa9, 0xf1, 0x25, 0x1a, 0x5b, 0x87, 0xfc, 0x60, 0x48, 0x86, 0xaa, 0xf1, 0xfc, 0x60, 0xc8, 0x9a, - 0x50, 0x79, 0xec, 0x2a, 0xdf, 0x0d, 0x34, 0x59, 0xa6, 0xc6, 0xe3, 0x29, 0xbb, 0x06, 0xb5, 0xc1, - 0xf0, 0xb1, 0x50, 0x91, 0x2f, 0x03, 0xb2, 0x47, 0x8d, 0xa7, 0x04, 0xb6, 0x09, 0x30, 0x18, 0xde, - 0x15, 0x2e, 0x0a, 0x8d, 0x9a, 0xa5, 0xed, 0xc2, 0x4e, 0x8d, 0x67, 0x28, 0xce, 0x6f, 0xa0, 0x44, - 0x3e, 0x62, 0xdf, 0x40, 0x79, 0xe4, 0x4f, 0x44, 0xa4, 0x8d, 0x3a, 0xed, 0xfd, 0xef, 0x7e, 0xdc, - 0x5a, 0xf9, 0xfb, 0x8f, 0x5b, 0xbb, 0x99, 0x60, 0x90, 0xa1, 0x08, 0x3c, 0x19, 0x68, 0xd7, 0x0f, - 0x84, 0x8a, 0xf6, 0x26, 0xf2, 0xb6, 0x59, 0xd2, 0xea, 0xd2, 0x87, 0x5b, 0x09, 0xec, 0x06, 0x94, - 0xfc, 0x60, 0x24, 0xce, 0x49, 0xff, 0x42, 0xfb, 0x03, 0x2b, 0xaa, 0x3e, 0x98, 0xeb, 0x70, 0xae, - 0xfb, 0xc8, 0xe2, 0x06, 0xe1, 0xfc, 0x21, 0x07, 0x65, 0x13, 0x03, 0xec, 0x1a, 0x14, 0x67, 0x42, - 0xbb, 0xb4, 0x7f, 0x7d, 0xbf, 0x8a, 0xb6, 0x7d, 0x20, 0xb4, 0xcb, 0x89, 0x8a, 0xe1, 0x35, 0x93, - 0x73, 0xb4, 0x7d, 0x3e, 0x0d, 0xaf, 0x07, 0x48, 0xe1, 0x96, 0xc1, 0x7e, 0x0e, 0x95, 0x40, 0xe8, - 0xe7, 0x52, 0x9d, 0x91, 0x8d, 0xd6, 0x8d, 0xd3, 0x8f, 0x84, 0x7e, 0x20, 0x47, 0x82, 0xc7, 0x3c, - 0x76, 0x0b, 0xaa, 0x91, 0xf0, 0xe6, 0xca, 0xd7, 0x0b, 0xb2, 0xd7, 0xfa, 0x7e, 0x83, 0xa2, 0xcc, - 0xd2, 0x08, 0x9c, 0x20, 0x9c, 0xbf, 0xe6, 0xa0, 0x88, 0x6a, 0x30, 0x06, 0x45, 0x57, 0x4d, 0x4c, - 0x74, 0xd7, 0x38, 0x8d, 0x59, 0x03, 0x0a, 0x22, 0x78, 0x46, 0x1a, 0xd5, 0x38, 0x0e, 0x91, 0xe2, - 0x3d, 0x1f, 0x59, 0x1f, 0xe1, 0x10, 0xd7, 0xcd, 0x23, 0xa1, 0xac, 0x6b, 0x68, 0xcc, 0x6e, 0x40, - 0x2d, 0x54, 0xf2, 0x7c, 0xf1, 0x14, 0x57, 0x97, 0x32, 0x81, 0x87, 0xc4, 0x5e, 0xf0, 0x8c, 0x57, - 0x43, 0x3b, 0x62, 0xbb, 0x00, 0xe2, 0x5c, 0x2b, 0xf7, 0x50, 0x46, 0x3a, 0x6a, 0x96, 0xe9, 0xec, - 0x14, 0xef, 0x48, 0xe8, 0x1f, 0xf3, 0x0c, 0x97, 0x6d, 0x40, 0xf5, 0x54, 0x46, 0x3a, 0x70, 0x67, - 0xa2, 0x59, 0xa1, 0xed, 0x92, 0xb9, 0xf3, 0xaf, 0x3c, 0x94, 0xc8, 0x5c, 0x6c, 0x07, 0xbd, 0x13, - 0xce, 0x8d, 0xa3, 0x0b, 0x6d, 0x66, 0xbd, 0x03, 0x14, 0x07, 0x89, 0x73, 0x30, 0x26, 0x36, 0xd0, - 0x52, 0x53, 0xe1, 0x69, 0xa9, 0x6c, 0x28, 0x26, 0x73, 0x3c, 0xd6, 0x08, 0xa3, 0xc5, 0x9c, 0x94, - 0xc6, 0xec, 0x26, 0x94, 0x25, 0xb9, 0x98, 0x0e, 0xfb, 0x06, 0xc7, 0x5b, 0x08, 0x0a, 0x57, 0xc2, - 0x1d, 0xc9, 0x60, 0xba, 0x20, 0x13, 0x54, 0x79, 0x32, 0x67, 0x37, 0xa1, 0x46, 0x3e, 0x7d, 0xb8, - 0x08, 0x45, 0xb3, 0x4c, 0x3e, 0x5a, 0x4b, 0xfc, 0x8d, 0x44, 0x9e, 0xf2, 0x31, 0x89, 0x3d, 0xd7, - 0x3b, 0x15, 0x83, 0x50, 0x37, 0xaf, 0xa6, 0xb6, 0xec, 0x58, 0x1a, 0x4f, 0xb8, 0x28, 0x36, 0x12, - 0x9e, 0x12, 0x1a, 0xa1, 0x1f, 0x12, 0x74, 0xcd, 0xba, 0xde, 0x10, 0x79, 0xca, 0x67, 0x0e, 0x94, - 0x87, 0xc3, 0x43, 0x44, 0x7e, 0x94, 0x16, 0x19, 0x43, 0xe1, 0x96, 0x63, 0xce, 0x10, 0xcd, 0xa7, - 0xba, 0xdf, 0x6d, 0x7e, 0x6c, 0x0c, 0x14, 0xcf, 0x9d, 0x3e, 0x54, 0x63, 0x15, 0x30, 0x9b, 0xfb, - 0x5d, 0x9b, 0xe7, 0xf9, 0x7e, 0x97, 0xdd, 0x86, 0x4a, 0x74, 0xea, 0x2a, 0x3f, 0x98, 0x90, 0x5d, - 0xd7, 0xf7, 0x3f, 0x48, 0x34, 0x1e, 0x1a, 0x3a, 0xee, 0x12, 0x63, 0x1c, 0x09, 0xb5, 0x44, 0xc5, - 0xd7, 0x64, 0x35, 0xa0, 0x30, 0xf7, 0x47, 0x24, 0x67, 0x8d, 0xe3, 0x10, 0x29, 0x13, 0xdf, 0xc4, - 0xe0, 0x1a, 0xc7, 0x21, 0x3a, 0x6b, 0x26, 0x47, 0xa6, 0x5c, 0xae, 0x71, 0x1a, 0xa3, 0xee, 0x32, - 0xd4, 0xbe, 0x0c, 0xdc, 0x69, 0x6c, 0xff, 0x78, 0xee, 0x4c, 0xe3, 0xb3, 0xff, 0x5f, 0x76, 0xfb, - 0x6d, 0x0e, 0xaa, 0x71, 0x8d, 0xc7, 0x82, 0xe5, 0x8f, 0x44, 0xa0, 0xfd, 0xb1, 0x2f, 0x94, 0xdd, - 0x38, 0x43, 0x61, 0xb7, 0xa1, 0xe4, 0x6a, 0xad, 0xe2, 0x32, 0xf0, 0x71, 0xf6, 0x82, 0x68, 0x1d, - 0x20, 0xa7, 0x17, 0x68, 0xb5, 0xe0, 0x06, 0xb5, 0xf1, 0x15, 0x40, 0x4a, 0x44, 0x5d, 0xcf, 0xc4, - 0xc2, 0x4a, 0xc5, 0x21, 0xbb, 0x0a, 0xa5, 0x67, 0xee, 0x74, 0x2e, 0x6c, 0x7c, 0x9b, 0xc9, 0xd7, - 0xf9, 0xaf, 0x72, 0xce, 0x5f, 0xf2, 0x50, 0xb1, 0x17, 0x06, 0xbb, 0x05, 0x15, 0xba, 0x30, 0xac, - 0x46, 0x97, 0x27, 0x4d, 0x0c, 0x61, 0x7b, 0xc9, 0x4d, 0x98, 0xd1, 0xd1, 0x8a, 0x32, 0x37, 0xa2, - 0xd5, 0x31, 0xbd, 0x17, 0x0b, 0x23, 0x31, 0xb6, 0x57, 0xde, 0x3a, 0xa2, 0xbb, 0x62, 0xec, 0x07, - 0x3e, 0xda, 0x87, 0x23, 0x8b, 0xdd, 0x8a, 0x4f, 0x5d, 0x24, 0x89, 0x1f, 0x65, 0x25, 0xbe, 0x7e, - 0xe8, 0x3e, 0xd4, 0x33, 0xdb, 0x5c, 0x72, 0xea, 0xeb, 0xd9, 0x53, 0xdb, 0x2d, 0x49, 0x9c, 0xb9, - 0xaf, 0x53, 0x2b, 0xfc, 0x17, 0xf6, 0xfb, 0x12, 0x20, 0x15, 0xf9, 0xee, 0x45, 0xc7, 0x79, 0x51, - 0x00, 0x18, 0x84, 0x58, 0x72, 0x47, 0x2e, 0xd5, 0xfd, 0x55, 0x7f, 0x12, 0x48, 0x25, 0x9e, 0x52, - 0x1a, 0xd3, 0xfa, 0x2a, 0xaf, 0x1b, 0x1a, 0x65, 0x0c, 0x3b, 0x80, 0xfa, 0x48, 0x44, 0x9e, 0xf2, - 0x29, 0xa0, 0xac, 0xd1, 0xb7, 0xf0, 0x4c, 0xa9, 0x9c, 0x56, 0x37, 0x45, 0x18, 0x5b, 0x65, 0xd7, - 0xb0, 0x7d, 0x58, 0x15, 0xe7, 0xa1, 0x54, 0xda, 0xee, 0x62, 0xfa, 0x8a, 0x2b, 0xa6, 0x43, 0x41, - 0x3a, 0xed, 0xc4, 0xeb, 0x22, 0x9d, 0x30, 0x17, 0x8a, 0x9e, 0x1b, 0x9a, 0x4b, 0xb5, 0xbe, 0xdf, - 0xbc, 0xb0, 0x5f, 0xc7, 0x0d, 0x8d, 0xd1, 0xda, 0x5f, 0xe0, 0x59, 0x5f, 0xfc, 0x63, 0xeb, 0x66, - 0xe6, 0x26, 0x9d, 0xc9, 0x93, 0xc5, 0x1e, 0xc5, 0xcb, 0x99, 0xaf, 0xf7, 0xe6, 0xda, 0x9f, 0xee, - 0xb9, 0xa1, 0x8f, 0xe2, 0x70, 0x61, 0xbf, 0xcb, 0x49, 0xf4, 0xc6, 0x2f, 0xa1, 0x71, 0x51, 0xef, - 0xf7, 0xf1, 0xc1, 0xc6, 0x1d, 0xa8, 0x25, 0x7a, 0xbc, 0x6d, 0x61, 0x35, 0xeb, 0xbc, 0x3f, 0xe7, - 0xa0, 0x6c, 0xb2, 0x8a, 0xdd, 0x81, 0xda, 0x54, 0x7a, 0x2e, 0x2a, 0x10, 0xb7, 0x76, 0x9f, 0xa4, - 0x49, 0xd7, 0xba, 0x1f, 0xf3, 0x8c, 0x55, 0x53, 0x2c, 0x06, 0x99, 0x1f, 0x8c, 0x65, 0x9c, 0x05, - 0xeb, 0xe9, 0xa2, 0x7e, 0x30, 0x96, 0xdc, 0x30, 0x37, 0xee, 0xc1, 0xfa, 0xb2, 0x88, 0x4b, 0xf4, - 0xfc, 0x6c, 0x39, 0x5c, 0xa9, 0x66, 0x27, 0x8b, 0xb2, 0x6a, 0xdf, 0x81, 0x5a, 0x42, 0x67, 0xbb, - 0xaf, 0x2b, 0xbe, 0x9a, 0x5d, 0x99, 0xd1, 0xd5, 0x99, 0x02, 0xa4, 0xaa, 0x61, 0xb1, 0xc2, 0x1e, - 0x92, 0xee, 0x51, 0xa3, 0x46, 0x32, 0xa7, 0x7b, 0xcf, 0xd5, 0x2e, 0xa9, 0xb2, 0xca, 0x69, 0xcc, - 0x5a, 0x00, 0xa3, 0x24, 0x61, 0xdf, 0x90, 0xc6, 0x19, 0x84, 0x33, 0x80, 0x6a, 0xac, 0x04, 0xdb, - 0x86, 0x7a, 0x64, 0x77, 0xc6, 0x8e, 0x09, 0xb7, 0x2b, 0xf1, 0x2c, 0x09, 0x3b, 0x1f, 0xe5, 0x06, - 0x13, 0xb1, 0xd4, 0xf9, 0x70, 0xa4, 0x70, 0xcb, 0x70, 0x9e, 0x40, 0x89, 0x08, 0x98, 0x66, 0x91, - 0x76, 0x95, 0xb6, 0x4d, 0x94, 0x69, 0x2a, 0x64, 0x44, 0xdb, 0xb6, 0x8b, 0x18, 0x88, 0xdc, 0x00, - 0xd8, 0x75, 0x6c, 0x5d, 0x46, 0xd6, 0xa2, 0x97, 0xe1, 0x90, 0xed, 0xfc, 0x02, 0xaa, 0x31, 0x19, - 0x4f, 0x7e, 0xdf, 0x0f, 0x84, 0x55, 0x91, 0xc6, 0xd8, 0x7c, 0x76, 0x4e, 0x5d, 0xe5, 0x7a, 0x5a, - 0x98, 0x16, 0xa1, 0xc4, 0x53, 0x82, 0xf3, 0x19, 0xd4, 0x33, 0xd9, 0x83, 0xe1, 0xf6, 0x98, 0xdc, - 0x68, 0x72, 0xd8, 0x4c, 0x9c, 0x17, 0xd8, 0x1a, 0xc7, 0xdd, 0xce, 0xcf, 0x00, 0x4e, 0xb5, 0x0e, - 0x9f, 0x52, 0xfb, 0x63, 0x6d, 0x5f, 0x43, 0x0a, 0x21, 0xd8, 0x16, 0xd4, 0x71, 0x12, 0x59, 0xbe, - 0x89, 0x77, 0x5a, 0x11, 0x19, 0xc0, 0x4f, 0xa1, 0x36, 0x4e, 0x96, 0x17, 0xac, 0xeb, 0xe2, 0xd5, - 0x9f, 0x40, 0x35, 0x90, 0x96, 0x67, 0xba, 0xb1, 0x4a, 0x20, 0x89, 0xe5, 0xdc, 0x84, 0x9f, 0xbc, - 0xd6, 0xc7, 0xb3, 0x8f, 0xa0, 0x3c, 0xf6, 0xa7, 0x9a, 0x8a, 0x3e, 0x36, 0x78, 0x76, 0xe6, 0xfc, - 0x3b, 0x07, 0x90, 0x7a, 0x16, 0xe3, 0x15, 0xab, 0x37, 0x62, 0x56, 0x4d, 0xb5, 0x9e, 0x42, 0x75, - 0x66, 0xeb, 0x80, 0xf5, 0xd9, 0xb5, 0xe5, 0x68, 0x68, 0xc5, 0x65, 0xc2, 0x54, 0x88, 0x7d, 0x5b, - 0x21, 0xde, 0xa7, 0xd7, 0x4e, 0x76, 0xa0, 0x46, 0x25, 0xfb, 0x66, 0x82, 0x34, 0xd1, 0xb8, 0xe5, - 0x6c, 0xdc, 0x83, 0xb5, 0xa5, 0x2d, 0xdf, 0xf1, 0x4e, 0x48, 0xeb, 0x59, 0x36, 0xcb, 0x6e, 0x41, - 0xd9, 0x34, 0x9f, 0x18, 0x12, 0x38, 0xb2, 0x62, 0x68, 0x4c, 0x1d, 0xc3, 0x71, 0xfc, 0x72, 0xe9, - 0x1f, 0x3b, 0xfb, 0x50, 0x36, 0x4f, 0x33, 0xb6, 0x03, 0x15, 0xd7, 0x33, 0xe9, 0x98, 0x29, 0x09, - 0xc8, 0x3c, 0x20, 0x32, 0x8f, 0xd9, 0xce, 0xdf, 0xf2, 0x00, 0x29, 0xfd, 0x3d, 0x3a, 0xd6, 0xaf, - 0x61, 0x3d, 0x12, 0x9e, 0x0c, 0x46, 0xae, 0x5a, 0x10, 0xd7, 0x3e, 0x41, 0x2e, 0x5b, 0x72, 0x01, - 0x99, 0xe9, 0x5e, 0x0b, 0x6f, 0xef, 0x5e, 0x77, 0xa0, 0xe8, 0xc9, 0x70, 0x61, 0x2f, 0x0a, 0xb6, - 0x7c, 0x90, 0x8e, 0x0c, 0x17, 0xf8, 0x10, 0x45, 0x04, 0x6b, 0x41, 0x79, 0x76, 0x46, 0x8f, 0x55, - 0xd3, 0xe8, 0x5f, 0x5d, 0xc6, 0x3e, 0x38, 0xc3, 0x31, 0x3e, 0x6d, 0x0d, 0x8a, 0xdd, 0x84, 0xd2, - 0xec, 0x6c, 0xe4, 0x2b, 0xea, 0x7b, 0xeb, 0xa6, 0x33, 0xcc, 0xc2, 0xbb, 0xbe, 0xc2, 0x07, 0x2c, - 0x61, 0x98, 0x03, 0x79, 0x35, 0xa3, 0x5e, 0xbf, 0x6e, 0x5e, 0x31, 0x19, 0x6b, 0xce, 0x0e, 0x57, - 0x78, 0x5e, 0xcd, 0xda, 0x55, 0x28, 0x1b, 0xbb, 0x3a, 0x7f, 0x2a, 0xc0, 0xfa, 0xb2, 0x96, 0x18, - 0x07, 0x91, 0xf2, 0xe2, 0x38, 0x88, 0x94, 0x97, 0x34, 0xf6, 0xf9, 0x4c, 0x63, 0xef, 0x40, 0x49, - 0x3e, 0x0f, 0x84, 0xca, 0xbe, 0xca, 0x3b, 0xa7, 0xf2, 0x79, 0x80, 0x6d, 0xaa, 0x61, 0x2d, 0x75, - 0x7d, 0x25, 0xdb, 0xf5, 0x5d, 0x87, 0xb5, 0xb1, 0x9c, 0x4e, 0xe5, 0xf3, 0xe1, 0x62, 0x36, 0xf5, - 0x83, 0x33, 0xdb, 0xfa, 0x2d, 0x13, 0xd9, 0x0e, 0x5c, 0x19, 0xf9, 0x0a, 0xd5, 0xe9, 0xc8, 0x40, - 0x8b, 0x80, 0xde, 0x39, 0x88, 0xbb, 0x48, 0x66, 0xdf, 0xc0, 0xb6, 0xab, 0xb5, 0x98, 0x85, 0xfa, - 0x51, 0x10, 0xba, 0xde, 0x59, 0x57, 0x7a, 0x94, 0xb3, 0xb3, 0xd0, 0xd5, 0xfe, 0x89, 0x3f, 0xc5, - 0x27, 0x5d, 0x85, 0x96, 0xbe, 0x15, 0xc7, 0x3e, 0x87, 0x75, 0x4f, 0x09, 0x57, 0x8b, 0xae, 0x88, - 0xf4, 0xb1, 0xab, 0x4f, 0x9b, 0x55, 0x5a, 0x79, 0x81, 0x8a, 0x67, 0x70, 0x51, 0xdb, 0x27, 0xfe, - 0x74, 0xe4, 0xb9, 0x6a, 0xd4, 0xac, 0x99, 0x33, 0x2c, 0x11, 0x59, 0x0b, 0x18, 0x11, 0x7a, 0xb3, - 0x50, 0x2f, 0x12, 0x28, 0x10, 0xf4, 0x12, 0x0e, 0x16, 0x4e, 0xed, 0xcf, 0x44, 0xa4, 0xdd, 0x59, - 0x48, 0x7f, 0x13, 0x0a, 0x3c, 0x25, 0x38, 0xdf, 0xe6, 0xa0, 0x71, 0x31, 0x44, 0xd0, 0xc0, 0x21, - 0xaa, 0x69, 0x93, 0x0d, 0xc7, 0x89, 0xd1, 0xf3, 0x19, 0xa3, 0xc7, 0x37, 0x54, 0x21, 0x73, 0x43, - 0x25, 0x0e, 0x2c, 0xbe, 0xd9, 0x81, 0x4b, 0x2a, 0x95, 0x2e, 0xaa, 0xf4, 0xfb, 0x1c, 0x5c, 0xb9, - 0x10, 0x86, 0xef, 0xac, 0xd1, 0x36, 0xd4, 0x67, 0xee, 0x99, 0x38, 0x76, 0x15, 0x39, 0xb7, 0x60, - 0x5a, 0xb8, 0x0c, 0xe9, 0x7f, 0xa0, 0x5f, 0x00, 0xab, 0xd9, 0xd8, 0xbf, 0x54, 0xb7, 0xd8, 0x95, - 0x47, 0x52, 0xdf, 0x95, 0x73, 0x7b, 0xfb, 0xc5, 0xae, 0x8c, 0x89, 0xaf, 0x3b, 0xbc, 0x70, 0x89, - 0xc3, 0x9d, 0x23, 0xa8, 0xc6, 0x0a, 0xb2, 0x2d, 0xfb, 0xc4, 0xcf, 0xa5, 0xbf, 0x9a, 0x1e, 0x45, - 0x42, 0xa1, 0xee, 0xe6, 0xbd, 0xff, 0x29, 0x94, 0x26, 0x4a, 0xce, 0x43, 0x5b, 0x5b, 0x97, 0x10, - 0x86, 0xe3, 0x0c, 0xa1, 0x62, 0x29, 0x6c, 0x17, 0xca, 0x27, 0x8b, 0xa3, 0xb8, 0xf9, 0xb0, 0x89, - 0x8d, 0xf3, 0x91, 0x45, 0x60, 0xb5, 0x30, 0x08, 0x76, 0x15, 0x8a, 0x27, 0x8b, 0x7e, 0xd7, 0x3c, - 0xc8, 0xb0, 0xe6, 0xe0, 0xac, 0x5d, 0x36, 0x0a, 0x39, 0xf7, 0x61, 0x35, 0xbb, 0x0e, 0x8d, 0x92, - 0x69, 0x6a, 0x68, 0x9c, 0x16, 0xd7, 0xfc, 0x5b, 0x8a, 0xeb, 0xee, 0x0e, 0x54, 0xec, 0xcf, 0x14, - 0x56, 0x83, 0xd2, 0xa3, 0xa3, 0x61, 0xef, 0x61, 0x63, 0x85, 0x55, 0xa1, 0x78, 0x38, 0x18, 0x3e, - 0x6c, 0xe4, 0x70, 0x74, 0x34, 0x38, 0xea, 0x35, 0xf2, 0xbb, 0x37, 0x60, 0x35, 0xfb, 0x3b, 0x85, - 0xd5, 0xa1, 0x32, 0x3c, 0x38, 0xea, 0xb6, 0x07, 0xbf, 0x6e, 0xac, 0xb0, 0x55, 0xa8, 0xf6, 0x8f, - 0x86, 0xbd, 0xce, 0x23, 0xde, 0x6b, 0xe4, 0x76, 0x7f, 0x05, 0xb5, 0xe4, 0x55, 0x8f, 0x12, 0xda, - 0xfd, 0xa3, 0x6e, 0x63, 0x85, 0x01, 0x94, 0x87, 0xbd, 0x0e, 0xef, 0xa1, 0xdc, 0x0a, 0x14, 0x86, - 0xc3, 0xc3, 0x46, 0x1e, 0x77, 0xed, 0x1c, 0x74, 0x0e, 0x7b, 0x8d, 0x02, 0x0e, 0x1f, 0x3e, 0x38, - 0xbe, 0x3b, 0x6c, 0x14, 0x77, 0xbf, 0x84, 0x2b, 0x17, 0x5e, 0xce, 0xb4, 0xfa, 0xf0, 0x80, 0xf7, - 0x50, 0x52, 0x1d, 0x2a, 0xc7, 0xbc, 0xff, 0xf8, 0xe0, 0x61, 0xaf, 0x91, 0x43, 0xc6, 0xfd, 0x41, - 0xe7, 0x5e, 0xaf, 0xdb, 0xc8, 0xb7, 0xaf, 0x7d, 0xf7, 0x72, 0x33, 0xf7, 0xfd, 0xcb, 0xcd, 0xdc, - 0x0f, 0x2f, 0x37, 0x73, 0xff, 0x7c, 0xb9, 0x99, 0xfb, 0xf6, 0xd5, 0xe6, 0xca, 0xf7, 0xaf, 0x36, - 0x57, 0x7e, 0x78, 0xb5, 0xb9, 0x72, 0x52, 0xa6, 0x9f, 0x9b, 0x5f, 0xfc, 0x27, 0x00, 0x00, 0xff, - 0xff, 0xa4, 0x50, 0x4f, 0x17, 0x1c, 0x15, 0x00, 0x00, + // 2231 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1c, 0xc7, + 0xf1, 0xe7, 0xbe, 0x77, 0x6b, 0x49, 0x6a, 0xff, 0x6d, 0xd9, 0x5e, 0xf3, 0xaf, 0x90, 0xf4, 0x48, + 0x31, 0x28, 0x4a, 0x5a, 0x02, 0x34, 0x60, 0x19, 0x46, 0x10, 0x84, 0xfb, 0x10, 0xb8, 0x96, 0xc4, + 0x25, 0x7a, 0xf5, 0xc8, 0x4d, 0x18, 0xce, 0x36, 0xc9, 0x01, 0x67, 0xa7, 0x07, 0x3d, 0xbd, 0x12, + 0xf7, 0x92, 0x83, 0x3f, 0x81, 0x81, 0x00, 0xb9, 0x25, 0x41, 0x2e, 0xf9, 0x04, 0xb9, 0xe6, 0x18, + 0xc0, 0x47, 0x1f, 0x72, 0x30, 0x72, 0x70, 0x02, 0xe9, 0x9e, 0x6f, 0x10, 0x20, 0xa8, 0xea, 0x9e, + 0xc7, 0x52, 0x14, 0x24, 0x21, 0x41, 0x4e, 0xd3, 0x5d, 0xf5, 0xab, 0xea, 0xea, 0xaa, 0xea, 0xea, + 0xea, 0x81, 0x86, 0x8c, 0xe2, 0x4e, 0xa4, 0xa4, 0x96, 0xac, 0x18, 0x1d, 0xad, 0xdd, 0x39, 0xf1, + 0xf5, 0xe9, 0xec, 0xa8, 0xe3, 0xc9, 0xe9, 0xce, 0x89, 0x3c, 0x91, 0x3b, 0xc4, 0x3a, 0x9a, 0x1d, + 0xd3, 0x8c, 0x26, 0x34, 0x32, 0x22, 0xce, 0x1f, 0x8a, 0x50, 0x1c, 0x45, 0xec, 0x53, 0xa8, 0xfa, + 0x61, 0x34, 0xd3, 0x71, 0xbb, 0xb0, 0x59, 0xda, 0x6a, 0xee, 0x36, 0x3a, 0xd1, 0x51, 0x67, 0x88, + 0x14, 0x6e, 0x19, 0x6c, 0x13, 0xca, 0xe2, 0x5c, 0x78, 0xed, 0xe2, 0x66, 0x61, 0xab, 0xb9, 0x0b, + 0x08, 0x18, 0x9c, 0x0b, 0x6f, 0x14, 0xed, 0x2f, 0x71, 0xe2, 0xb0, 0xcf, 0xa0, 0x1a, 0xcb, 0x99, + 0xf2, 0x44, 0xbb, 0x44, 0x98, 0x65, 0xc4, 0x8c, 0x89, 0x42, 0x28, 0xcb, 0x45, 0x4d, 0xc7, 0x7e, + 0x20, 0xda, 0xe5, 0x4c, 0xd3, 0x3d, 0x3f, 0x30, 0x18, 0xe2, 0xb0, 0xeb, 0x50, 0x39, 0x9a, 0xf9, + 0xc1, 0xa4, 0x5d, 0x21, 0x48, 0x13, 0x21, 0x5d, 0x24, 0x10, 0xc6, 0xf0, 0xd8, 0x16, 0xd4, 0xa3, + 0xc0, 0xd5, 0xc7, 0x52, 0x4d, 0xdb, 0x90, 0x2d, 0x78, 0x68, 0x69, 0x3c, 0xe5, 0xb2, 0xbb, 0xd0, + 0xf4, 0x64, 0x18, 0x6b, 0xe5, 0xfa, 0xa1, 0x8e, 0xdb, 0x4d, 0x02, 0x7f, 0x88, 0xe0, 0xa7, 0x52, + 0x9d, 0x09, 0xd5, 0xcb, 0x98, 0x3c, 0x8f, 0xec, 0x96, 0xa1, 0x28, 0x23, 0xe7, 0x37, 0x05, 0xa8, + 0x27, 0x5a, 0x99, 0x03, 0xcb, 0x7b, 0xca, 0x3b, 0xf5, 0xb5, 0xf0, 0xf4, 0x4c, 0x89, 0x76, 0x61, + 0xb3, 0xb0, 0xd5, 0xe0, 0x0b, 0x34, 0xb6, 0x0a, 0xc5, 0xd1, 0x98, 0x1c, 0xd5, 0xe0, 0xc5, 0xd1, + 0x98, 0xb5, 0xa1, 0xf6, 0xc4, 0x55, 0xbe, 0x1b, 0x6a, 0xf2, 0x4c, 0x83, 0x27, 0x53, 0x76, 0x0d, + 0x1a, 0xa3, 0xf1, 0x13, 0xa1, 0x62, 0x5f, 0x86, 0xe4, 0x8f, 0x06, 0xcf, 0x08, 0x6c, 0x1d, 0x60, + 0x34, 0xbe, 0x27, 0x5c, 0x54, 0x1a, 0xb7, 0x2b, 0x9b, 0xa5, 0xad, 0x06, 0xcf, 0x51, 0x9c, 0x5f, + 0x41, 0x85, 0x62, 0xc4, 0xbe, 0x86, 0xea, 0xc4, 0x3f, 0x11, 0xb1, 0x36, 0xe6, 0x74, 0x77, 0xbf, + 0xfb, 0x71, 0x63, 0xe9, 0x6f, 0x3f, 0x6e, 0x6c, 0xe7, 0x92, 0x41, 0x46, 0x22, 0xf4, 0x64, 0xa8, + 0x5d, 0x3f, 0x14, 0x2a, 0xde, 0x39, 0x91, 0x77, 0x8c, 0x48, 0xa7, 0x4f, 0x1f, 0x6e, 0x35, 0xb0, + 0x9b, 0x50, 0xf1, 0xc3, 0x89, 0x38, 0x27, 0xfb, 0x4b, 0xdd, 0x0f, 0xac, 0xaa, 0xe6, 0x68, 0xa6, + 0xa3, 0x99, 0x1e, 0x22, 0x8b, 0x1b, 0x84, 0xf3, 0xbb, 0x02, 0x54, 0x4d, 0x0e, 0xb0, 0x6b, 0x50, + 0x9e, 0x0a, 0xed, 0xd2, 0xfa, 0xcd, 0xdd, 0x3a, 0xfa, 0xf6, 0xa1, 0xd0, 0x2e, 0x27, 0x2a, 0xa6, + 0xd7, 0x54, 0xce, 0xd0, 0xf7, 0xc5, 0x2c, 0xbd, 0x1e, 0x22, 0x85, 0x5b, 0x06, 0xfb, 0x29, 0xd4, + 0x42, 0xa1, 0x5f, 0x48, 0x75, 0x46, 0x3e, 0x5a, 0x35, 0x41, 0x3f, 0x10, 0xfa, 0xa1, 0x9c, 0x08, + 0x9e, 0xf0, 0xd8, 0x6d, 0xa8, 0xc7, 0xc2, 0x9b, 0x29, 0x5f, 0xcf, 0xc9, 0x5f, 0xab, 0xbb, 0x2d, + 0xca, 0x32, 0x4b, 0x23, 0x70, 0x8a, 0x70, 0xfe, 0x52, 0x80, 0x32, 0x9a, 0xc1, 0x18, 0x94, 0x5d, + 0x75, 0x62, 0xb2, 0xbb, 0xc1, 0x69, 0xcc, 0x5a, 0x50, 0x12, 0xe1, 0x73, 0xb2, 0xa8, 0xc1, 0x71, + 0x88, 0x14, 0xef, 0xc5, 0xc4, 0xc6, 0x08, 0x87, 0x28, 0x37, 0x8b, 0x85, 0xb2, 0xa1, 0xa1, 0x31, + 0xbb, 0x09, 0x8d, 0x48, 0xc9, 0xf3, 0xf9, 0x33, 0x94, 0xae, 0xe4, 0x12, 0x0f, 0x89, 0x83, 0xf0, + 0x39, 0xaf, 0x47, 0x76, 0xc4, 0xb6, 0x01, 0xc4, 0xb9, 0x56, 0xee, 0xbe, 0x8c, 0x75, 0xdc, 0xae, + 0xd2, 0xde, 0x29, 0xdf, 0x91, 0x30, 0x3c, 0xe4, 0x39, 0x2e, 0x5b, 0x83, 0xfa, 0xa9, 0x8c, 0x75, + 0xe8, 0x4e, 0x45, 0xbb, 0x46, 0xcb, 0xa5, 0x73, 0xe7, 0x9f, 0x45, 0xa8, 0x90, 0xbb, 0xd8, 0x16, + 0x46, 0x27, 0x9a, 0x99, 0x40, 0x97, 0xba, 0xcc, 0x46, 0x07, 0x28, 0x0f, 0xd2, 0xe0, 0x60, 0x4e, + 0xac, 0xa1, 0xa7, 0x02, 0xe1, 0x69, 0xa9, 0x6c, 0x2a, 0xa6, 0x73, 0xdc, 0xd6, 0x04, 0xb3, 0xc5, + 0xec, 0x94, 0xc6, 0xec, 0x16, 0x54, 0x25, 0x85, 0x98, 0x36, 0xfb, 0x86, 0xc0, 0x5b, 0x08, 0x2a, + 0x57, 0xc2, 0x9d, 0xc8, 0x30, 0x98, 0x93, 0x0b, 0xea, 0x3c, 0x9d, 0xb3, 0x5b, 0xd0, 0xa0, 0x98, + 0x3e, 0x9a, 0x47, 0xa2, 0x5d, 0xa5, 0x18, 0xad, 0xa4, 0xf1, 0x46, 0x22, 0xcf, 0xf8, 0x78, 0x88, + 0x3d, 0xd7, 0x3b, 0x15, 0xa3, 0x48, 0xb7, 0xaf, 0x66, 0xbe, 0xec, 0x59, 0x1a, 0x4f, 0xb9, 0xa8, + 0x36, 0x16, 0x9e, 0x12, 0x1a, 0xa1, 0x1f, 0x12, 0x74, 0xc5, 0x86, 0xde, 0x10, 0x79, 0xc6, 0x67, + 0x0e, 0x54, 0xc7, 0xe3, 0x7d, 0x44, 0x7e, 0x94, 0x15, 0x19, 0x43, 0xe1, 0x96, 0x63, 0xf6, 0x10, + 0xcf, 0x02, 0x3d, 0xec, 0xb7, 0x3f, 0x36, 0x0e, 0x4a, 0xe6, 0xce, 0x10, 0xea, 0x89, 0x09, 0x78, + 0x9a, 0x87, 0x7d, 0x7b, 0xce, 0x8b, 0xc3, 0x3e, 0xbb, 0x03, 0xb5, 0xf8, 0xd4, 0x55, 0x7e, 0x78, + 0x42, 0x7e, 0x5d, 0xdd, 0xfd, 0x20, 0xb5, 0x78, 0x6c, 0xe8, 0xb8, 0x4a, 0x82, 0x71, 0x24, 0x34, + 0x52, 0x13, 0x5f, 0xd3, 0xd5, 0x82, 0xd2, 0xcc, 0x9f, 0x90, 0x9e, 0x15, 0x8e, 0x43, 0xa4, 0x9c, + 0xf8, 0x26, 0x07, 0x57, 0x38, 0x0e, 0x31, 0x58, 0x53, 0x39, 0x31, 0xe5, 0x72, 0x85, 0xd3, 0x18, + 0x6d, 0x97, 0x91, 0xf6, 0x65, 0xe8, 0x06, 0x89, 0xff, 0x93, 0xb9, 0x13, 0x24, 0x7b, 0xff, 0x9f, + 0xac, 0xf6, 0xeb, 0x02, 0xd4, 0x93, 0x1a, 0x8f, 0x05, 0xcb, 0x9f, 0x88, 0x50, 0xfb, 0xc7, 0xbe, + 0x50, 0x76, 0xe1, 0x1c, 0x85, 0xdd, 0x81, 0x8a, 0xab, 0xb5, 0x4a, 0xca, 0xc0, 0xc7, 0xf9, 0x0b, + 0xa2, 0xb3, 0x87, 0x9c, 0x41, 0xa8, 0xd5, 0x9c, 0x1b, 0xd4, 0xda, 0x97, 0x00, 0x19, 0x11, 0x6d, + 0x3d, 0x13, 0x73, 0xab, 0x15, 0x87, 0xec, 0x2a, 0x54, 0x9e, 0xbb, 0xc1, 0x4c, 0xd8, 0xfc, 0x36, + 0x93, 0xaf, 0x8a, 0x5f, 0x16, 0x9c, 0x3f, 0x17, 0xa1, 0x66, 0x2f, 0x0c, 0x76, 0x1b, 0x6a, 0x74, + 0x61, 0x58, 0x8b, 0x2e, 0x3f, 0x34, 0x09, 0x84, 0xed, 0xa4, 0x37, 0x61, 0xce, 0x46, 0xab, 0xca, + 0xdc, 0x88, 0xd6, 0xc6, 0xec, 0x5e, 0x2c, 0x4d, 0xc4, 0xb1, 0xbd, 0xf2, 0x56, 0x11, 0xdd, 0x17, + 0xc7, 0x7e, 0xe8, 0xa3, 0x7f, 0x38, 0xb2, 0xd8, 0xed, 0x64, 0xd7, 0x65, 0xd2, 0xf8, 0x51, 0x5e, + 0xe3, 0xeb, 0x9b, 0x1e, 0x42, 0x33, 0xb7, 0xcc, 0x25, 0xbb, 0xbe, 0x91, 0xdf, 0xb5, 0x5d, 0x92, + 0xd4, 0x99, 0xfb, 0x3a, 0xf3, 0xc2, 0x7f, 0xe0, 0xbf, 0x2f, 0x00, 0x32, 0x95, 0xef, 0x5e, 0x74, + 0x9c, 0x6f, 0x4a, 0x00, 0xa3, 0x08, 0x4b, 0xee, 0xc4, 0xa5, 0xba, 0xbf, 0xec, 0x9f, 0x84, 0x52, + 0x89, 0x67, 0x74, 0x8c, 0x49, 0xbe, 0xce, 0x9b, 0x86, 0x46, 0x27, 0x86, 0xed, 0x41, 0x73, 0x22, + 0x62, 0x4f, 0xf9, 0x94, 0x50, 0xd6, 0xe9, 0x1b, 0xb8, 0xa7, 0x4c, 0x4f, 0xa7, 0x9f, 0x21, 0x8c, + 0xaf, 0xf2, 0x32, 0x6c, 0x17, 0x96, 0xc5, 0x79, 0x24, 0x95, 0xb6, 0xab, 0x98, 0xbe, 0xe2, 0x8a, + 0xe9, 0x50, 0x90, 0x4e, 0x2b, 0xf1, 0xa6, 0xc8, 0x26, 0xcc, 0x85, 0xb2, 0xe7, 0x46, 0xe6, 0x52, + 0x6d, 0xee, 0xb6, 0x2f, 0xac, 0xd7, 0x73, 0x23, 0xe3, 0xb4, 0xee, 0xe7, 0xb8, 0xd7, 0x6f, 0xfe, + 0xbe, 0x71, 0x2b, 0x77, 0x93, 0x4e, 0xe5, 0xd1, 0x7c, 0x87, 0xf2, 0xe5, 0xcc, 0xd7, 0x3b, 0x33, + 0xed, 0x07, 0x3b, 0x6e, 0xe4, 0xa3, 0x3a, 0x14, 0x1c, 0xf6, 0x39, 0xa9, 0x5e, 0xfb, 0x39, 0xb4, + 0x2e, 0xda, 0xfd, 0x3e, 0x31, 0x58, 0xbb, 0x0b, 0x8d, 0xd4, 0x8e, 0xb7, 0x09, 0xd6, 0xf3, 0xc1, + 0xfb, 0x53, 0x01, 0xaa, 0xe6, 0x54, 0xb1, 0xbb, 0xd0, 0x08, 0xa4, 0xe7, 0xa2, 0x01, 0x49, 0x6b, + 0xf7, 0x49, 0x76, 0xe8, 0x3a, 0x0f, 0x12, 0x9e, 0xf1, 0x6a, 0x86, 0xc5, 0x24, 0xf3, 0xc3, 0x63, + 0x99, 0x9c, 0x82, 0xd5, 0x4c, 0x68, 0x18, 0x1e, 0x4b, 0x6e, 0x98, 0x6b, 0xf7, 0x61, 0x75, 0x51, + 0xc5, 0x25, 0x76, 0x5e, 0x5f, 0x4c, 0x57, 0xaa, 0xd9, 0xa9, 0x50, 0xde, 0xec, 0xbb, 0xd0, 0x48, + 0xe9, 0x6c, 0xfb, 0x75, 0xc3, 0x97, 0xf3, 0x92, 0x39, 0x5b, 0x9d, 0x00, 0x20, 0x33, 0x0d, 0x8b, + 0x15, 0xf6, 0x90, 0x74, 0x8f, 0x1a, 0x33, 0xd2, 0x39, 0xdd, 0x7b, 0xae, 0x76, 0xc9, 0x94, 0x65, + 0x4e, 0x63, 0xd6, 0x01, 0x98, 0xa4, 0x07, 0xf6, 0x0d, 0xc7, 0x38, 0x87, 0x70, 0x46, 0x50, 0x4f, + 0x8c, 0x60, 0x9b, 0xd0, 0x8c, 0xed, 0xca, 0xd8, 0x31, 0xe1, 0x72, 0x15, 0x9e, 0x27, 0x61, 0xe7, + 0xa3, 0xdc, 0xf0, 0x44, 0x2c, 0x74, 0x3e, 0x1c, 0x29, 0xdc, 0x32, 0x9c, 0xa7, 0x50, 0x21, 0x02, + 0x1e, 0xb3, 0x58, 0xbb, 0x4a, 0xdb, 0x26, 0xca, 0x34, 0x15, 0x32, 0xa6, 0x65, 0xbb, 0x65, 0x4c, + 0x44, 0x6e, 0x00, 0xec, 0x06, 0xb6, 0x2e, 0x13, 0xeb, 0xd1, 0xcb, 0x70, 0xc8, 0x76, 0x7e, 0x06, + 0xf5, 0x84, 0x8c, 0x3b, 0x7f, 0xe0, 0x87, 0xc2, 0x9a, 0x48, 0x63, 0x6c, 0x3e, 0x7b, 0xa7, 0xae, + 0x72, 0x3d, 0x2d, 0x4c, 0x8b, 0x50, 0xe1, 0x19, 0xc1, 0xb9, 0x0e, 0xcd, 0xdc, 0xe9, 0xc1, 0x74, + 0x7b, 0x42, 0x61, 0x34, 0x67, 0xd8, 0x4c, 0x9c, 0xdf, 0x63, 0x6b, 0x9c, 0x74, 0x3b, 0x3f, 0x01, + 0x38, 0xd5, 0x3a, 0x7a, 0x46, 0xed, 0x8f, 0xf5, 0x7d, 0x03, 0x29, 0x84, 0x60, 0x1b, 0xd0, 0xc4, + 0x49, 0x6c, 0xf9, 0x26, 0xdf, 0x49, 0x22, 0x36, 0x80, 0xff, 0x87, 0xc6, 0x71, 0x2a, 0x5e, 0xb2, + 0xa1, 0x4b, 0xa4, 0x3f, 0x81, 0x7a, 0x28, 0x2d, 0xcf, 0x74, 0x63, 0xb5, 0x50, 0xa6, 0x72, 0x6e, + 0x10, 0x58, 0x5e, 0xc5, 0xc8, 0xb9, 0x41, 0x40, 0x4c, 0xe7, 0x16, 0xfc, 0xdf, 0x6b, 0x4d, 0x3e, + 0xfb, 0x08, 0xaa, 0xc7, 0x7e, 0xa0, 0xe9, 0x46, 0xc0, 0xee, 0xcf, 0xce, 0x9c, 0x7f, 0x15, 0x00, + 0xb2, 0xb0, 0x63, 0x32, 0x63, 0x69, 0x47, 0xcc, 0xb2, 0x29, 0xe5, 0x01, 0xd4, 0xa7, 0xb6, 0x48, + 0xd8, 0x80, 0x5e, 0x5b, 0x4c, 0x95, 0x4e, 0x52, 0x43, 0x4c, 0xf9, 0xd8, 0xb5, 0xe5, 0xe3, 0x7d, + 0x1a, 0xf1, 0x74, 0x05, 0xea, 0x62, 0xf2, 0x0f, 0x2a, 0xc8, 0x4e, 0x21, 0xb7, 0x9c, 0xb5, 0xfb, + 0xb0, 0xb2, 0xb0, 0xe4, 0x3b, 0x5e, 0x18, 0x59, 0xb1, 0xcb, 0x1f, 0xc1, 0xdb, 0x50, 0x35, 0x9d, + 0x29, 0xe6, 0x0b, 0x8e, 0xac, 0x1a, 0x1a, 0x53, 0x3b, 0x71, 0x98, 0x3c, 0x6b, 0x86, 0x87, 0xce, + 0x2e, 0x54, 0xcd, 0xbb, 0x8d, 0x6d, 0x41, 0xcd, 0xf5, 0xcc, 0x59, 0xcd, 0xd5, 0x0b, 0x64, 0xee, + 0x11, 0x99, 0x27, 0x6c, 0xe7, 0xaf, 0x45, 0x80, 0x8c, 0xfe, 0x1e, 0xed, 0xec, 0x57, 0xb0, 0x1a, + 0x0b, 0x4f, 0x86, 0x13, 0x57, 0xcd, 0x89, 0x6b, 0xdf, 0x27, 0x97, 0x89, 0x5c, 0x40, 0xe6, 0x5a, + 0xdb, 0xd2, 0xdb, 0x5b, 0xdb, 0x2d, 0x28, 0x7b, 0x32, 0x9a, 0xdb, 0x5b, 0x84, 0x2d, 0x6e, 0xa4, + 0x27, 0xa3, 0x39, 0xbe, 0x52, 0x11, 0xc1, 0x3a, 0x50, 0x9d, 0x9e, 0xd1, 0x4b, 0xd6, 0xbc, 0x02, + 0xae, 0x2e, 0x62, 0x1f, 0x9e, 0xe1, 0x18, 0xdf, 0xbd, 0x06, 0xc5, 0x6e, 0x41, 0x65, 0x7a, 0x36, + 0xf1, 0x15, 0x35, 0xc5, 0x4d, 0xd3, 0x36, 0xe6, 0xe1, 0x7d, 0x5f, 0xe1, 0xeb, 0x96, 0x30, 0xcc, + 0x81, 0xa2, 0x9a, 0xd2, 0x43, 0xa0, 0x69, 0x9e, 0x38, 0x39, 0x6f, 0x4e, 0xf7, 0x97, 0x78, 0x51, + 0x4d, 0xbb, 0x75, 0xa8, 0x1a, 0xbf, 0x3a, 0x7f, 0x2c, 0xc1, 0xea, 0xa2, 0x95, 0x98, 0x07, 0xb1, + 0xf2, 0x92, 0x3c, 0x88, 0x95, 0x97, 0x76, 0xfd, 0xc5, 0x5c, 0xd7, 0xef, 0x40, 0x45, 0xbe, 0x08, + 0x85, 0xca, 0x3f, 0xd9, 0x7b, 0xa7, 0xf2, 0x45, 0x88, 0x3d, 0xac, 0x61, 0x2d, 0xb4, 0x84, 0x15, + 0xdb, 0x12, 0xde, 0x80, 0x95, 0x63, 0x19, 0x04, 0xf2, 0xc5, 0x78, 0x3e, 0x0d, 0xfc, 0xf0, 0xcc, + 0xf6, 0x85, 0x8b, 0x44, 0xb6, 0x05, 0x57, 0x26, 0xbe, 0x42, 0x73, 0x7a, 0x32, 0xd4, 0x22, 0xa4, + 0x47, 0x10, 0xe2, 0x2e, 0x92, 0xd9, 0xd7, 0xb0, 0xe9, 0x6a, 0x2d, 0xa6, 0x91, 0x7e, 0x1c, 0x46, + 0xae, 0x77, 0xd6, 0x97, 0x1e, 0x9d, 0xd9, 0x69, 0xe4, 0x6a, 0xff, 0xc8, 0x0f, 0xf0, 0xbd, 0x57, + 0x23, 0xd1, 0xb7, 0xe2, 0xd8, 0x67, 0xb0, 0xea, 0x29, 0xe1, 0x6a, 0xd1, 0x17, 0xb1, 0x3e, 0x74, + 0xf5, 0x69, 0xbb, 0x4e, 0x92, 0x17, 0xa8, 0xb8, 0x07, 0x17, 0xad, 0x7d, 0xea, 0x07, 0x13, 0xcf, + 0x55, 0x93, 0x76, 0xc3, 0xec, 0x61, 0x81, 0xc8, 0x3a, 0xc0, 0x88, 0x30, 0x98, 0x46, 0x7a, 0x9e, + 0x42, 0x81, 0xa0, 0x97, 0x70, 0xb0, 0xaa, 0x6a, 0x7f, 0x2a, 0x62, 0xed, 0x4e, 0x23, 0xfa, 0xd5, + 0x50, 0xe2, 0x19, 0xc1, 0xf9, 0xb6, 0x00, 0xad, 0x8b, 0x29, 0x82, 0x0e, 0x8e, 0xd0, 0x4c, 0x7b, + 0xd8, 0x70, 0x9c, 0x3a, 0xbd, 0x98, 0x73, 0x7a, 0x72, 0x7d, 0x95, 0x72, 0xd7, 0x57, 0x1a, 0xc0, + 0xf2, 0x9b, 0x03, 0xb8, 0x60, 0x52, 0xe5, 0xa2, 0x49, 0xbf, 0x2d, 0xc0, 0x95, 0x0b, 0x69, 0xf8, + 0xce, 0x16, 0x6d, 0x42, 0x73, 0xea, 0x9e, 0x89, 0x43, 0x57, 0x51, 0x70, 0x4b, 0xa6, 0xbf, 0xcb, + 0x91, 0xfe, 0x0b, 0xf6, 0x85, 0xb0, 0x9c, 0xcf, 0xfd, 0x4b, 0x6d, 0x4b, 0x42, 0x79, 0x20, 0xf5, + 0x3d, 0x39, 0xb3, 0x57, 0x63, 0x12, 0xca, 0x84, 0xf8, 0x7a, 0xc0, 0x4b, 0x97, 0x04, 0xdc, 0x39, + 0x80, 0x7a, 0x62, 0x20, 0xdb, 0xb0, 0xef, 0xff, 0x42, 0xf6, 0x1f, 0xea, 0x71, 0x2c, 0x14, 0xda, + 0x6e, 0x7e, 0x06, 0x7c, 0x0a, 0x95, 0x13, 0x25, 0x67, 0x91, 0xad, 0xad, 0x0b, 0x08, 0xc3, 0x71, + 0xc6, 0x50, 0xb3, 0x14, 0xb6, 0x0d, 0xd5, 0xa3, 0xf9, 0x41, 0xd2, 0x99, 0xd8, 0x83, 0x8d, 0xf3, + 0x89, 0x45, 0x60, 0xb5, 0x30, 0x08, 0x76, 0x15, 0xca, 0x47, 0xf3, 0x61, 0xdf, 0xbc, 0xd6, 0xb0, + 0xe6, 0xe0, 0xac, 0x5b, 0x35, 0x06, 0x39, 0x0f, 0x60, 0x39, 0x2f, 0x87, 0x4e, 0xc9, 0x75, 0x3c, + 0x34, 0xce, 0x8a, 0x6b, 0xf1, 0x2d, 0xc5, 0x75, 0x7b, 0x0b, 0x6a, 0xf6, 0x4f, 0x0b, 0x6b, 0x40, + 0xe5, 0xf1, 0xc1, 0x78, 0xf0, 0xa8, 0xb5, 0xc4, 0xea, 0x50, 0xde, 0x1f, 0x8d, 0x1f, 0xb5, 0x0a, + 0x38, 0x3a, 0x18, 0x1d, 0x0c, 0x5a, 0xc5, 0xed, 0x9b, 0xb0, 0x9c, 0xff, 0xd7, 0xc2, 0x9a, 0x50, + 0x1b, 0xef, 0x1d, 0xf4, 0xbb, 0xa3, 0x5f, 0xb6, 0x96, 0xd8, 0x32, 0xd4, 0x87, 0x07, 0xe3, 0x41, + 0xef, 0x31, 0x1f, 0xb4, 0x0a, 0xdb, 0xbf, 0x80, 0x46, 0xfa, 0xe4, 0x47, 0x0d, 0xdd, 0xe1, 0x41, + 0xbf, 0xb5, 0xc4, 0x00, 0xaa, 0xe3, 0x41, 0x8f, 0x0f, 0x50, 0x6f, 0x0d, 0x4a, 0xe3, 0xf1, 0x7e, + 0xab, 0x88, 0xab, 0xf6, 0xf6, 0x7a, 0xfb, 0x83, 0x56, 0x09, 0x87, 0x8f, 0x1e, 0x1e, 0xde, 0x1b, + 0xb7, 0xca, 0xdb, 0x5f, 0xc0, 0x95, 0x0b, 0xcf, 0x6a, 0x92, 0xde, 0xdf, 0xe3, 0x03, 0xd4, 0xd4, + 0x84, 0xda, 0x21, 0x1f, 0x3e, 0xd9, 0x7b, 0x34, 0x68, 0x15, 0x90, 0xf1, 0x60, 0xd4, 0xbb, 0x3f, + 0xe8, 0xb7, 0x8a, 0xdd, 0x6b, 0xdf, 0xbd, 0x5c, 0x2f, 0x7c, 0xff, 0x72, 0xbd, 0xf0, 0xc3, 0xcb, + 0xf5, 0xc2, 0x3f, 0x5e, 0xae, 0x17, 0xbe, 0x7d, 0xb5, 0xbe, 0xf4, 0xfd, 0xab, 0xf5, 0xa5, 0x1f, + 0x5e, 0xad, 0x2f, 0x1d, 0x55, 0xe9, 0xcf, 0xe7, 0xe7, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x61, + 0x74, 0xf7, 0x6e, 0x39, 0x15, 0x00, 0x00, } func (m *Op) Marshal() (dAtA []byte, err error) { @@ -3726,6 +3735,13 @@ func (m *ProxyEnv) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.AllProxy) > 0 { + i -= len(m.AllProxy) + copy(dAtA[i:], m.AllProxy) + i = encodeVarintOps(dAtA, i, uint64(len(m.AllProxy))) + i-- + dAtA[i] = 0x2a + } if len(m.NoProxy) > 0 { i -= len(m.NoProxy) copy(dAtA[i:], m.NoProxy) @@ -5061,6 +5077,10 @@ func (m *ProxyEnv) Size() (n int) { if l > 0 { n += 1 + l + sovOps(uint64(l)) } + l = len(m.AllProxy) + if l > 0 { + n += 1 + l + sovOps(uint64(l)) + } return n } @@ -9162,6 +9182,38 @@ func (m *ProxyEnv) Unmarshal(dAtA []byte) error { } m.NoProxy = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AllProxy", 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.AllProxy = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOps(dAtA[iNdEx:]) diff --git a/solver/pb/ops.proto b/solver/pb/ops.proto index a975e915..132093cd 100644 --- a/solver/pb/ops.proto +++ b/solver/pb/ops.proto @@ -224,6 +224,7 @@ message ProxyEnv { string https_proxy = 2; string ftp_proxy = 3; string no_proxy = 4; + string all_proxy = 5; } // WorkerConstraints defines conditions for the worker