diff --git a/policy/v1beta1/cfg.pb.go b/policy/v1beta1/cfg.pb.go index 3fb12fb531..24dcf57cee 100644 --- a/policy/v1beta1/cfg.pb.go +++ b/policy/v1beta1/cfg.pb.go @@ -35,7 +35,7 @@ import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" import google_protobuf1 "github.com/gogo/protobuf/types" -import google_protobuf2 "github.com/gogo/protobuf/types" +import _ "github.com/gogo/protobuf/types" import time "time" @@ -609,7 +609,7 @@ type Connection struct { // The address of the backend. Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // Timeout for remote calls to the backend. - Timeout *google_protobuf2.Duration `protobuf:"bytes,3,opt,name=timeout" json:"timeout,omitempty"` + Timeout *time.Duration `protobuf:"bytes,3,opt,name=timeout,stdduration" json:"timeout,omitempty"` } func (m *Connection) Reset() { *m = Connection{} } @@ -623,7 +623,7 @@ func (m *Connection) GetAddress() string { return "" } -func (m *Connection) GetTimeout() *google_protobuf2.Duration { +func (m *Connection) GetTimeout() *time.Duration { if m != nil { return m.Timeout } @@ -1095,7 +1095,13 @@ func (this *Connection) Equal(that interface{}) bool { if this.Address != that1.Address { return false } - if !this.Timeout.Equal(that1.Timeout) { + if this.Timeout != nil && that1.Timeout != nil { + if *this.Timeout != *that1.Timeout { + return false + } + } else if this.Timeout != nil { + return false + } else if that1.Timeout != nil { return false } return true @@ -1348,9 +1354,7 @@ func (this *Connection) GoString() string { s := make([]string, 0, 6) s = append(s, "&v1beta1.Connection{") s = append(s, "Address: "+fmt.Sprintf("%#v", this.Address)+",\n") - if this.Timeout != nil { - s = append(s, "Timeout: "+fmt.Sprintf("%#v", this.Timeout)+",\n") - } + s = append(s, "Timeout: "+fmt.Sprintf("%#v", this.Timeout)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -1819,8 +1823,8 @@ func (m *Connection) MarshalTo(dAtA []byte) (int, error) { if m.Timeout != nil { dAtA[i] = 0x1a i++ - i = encodeVarintCfg(dAtA, i, uint64(m.Timeout.Size())) - n6, err := m.Timeout.MarshalTo(dAtA[i:]) + i = encodeVarintCfg(dAtA, i, uint64(types.SizeOfStdDuration(*m.Timeout))) + n6, err := types.StdDurationMarshalTo(*m.Timeout, dAtA[i:]) if err != nil { return 0, err } @@ -2159,7 +2163,7 @@ func (m *Connection) Size() (n int) { n += 1 + l + sovCfg(uint64(l)) } if m.Timeout != nil { - l = m.Timeout.Size() + l = types.SizeOfStdDuration(*m.Timeout) n += 1 + l + sovCfg(uint64(l)) } return n @@ -3783,9 +3787,9 @@ func (m *Connection) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Timeout == nil { - m.Timeout = &google_protobuf2.Duration{} + m.Timeout = new(time.Duration) } - if err := m.Timeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := types.StdDurationUnmarshal(m.Timeout, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4372,75 +4376,75 @@ var ( func init() { proto.RegisterFile("policy/v1beta1/cfg.proto", fileDescriptorCfg) } var fileDescriptorCfg = []byte{ - // 1118 bytes of a gzipped FileDescriptorProto + // 1120 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xc6, 0xa9, 0xff, 0x3c, 0x37, 0x89, 0x33, 0x0d, 0x8d, 0x6b, 0xa2, 0x4d, 0x64, 0x90, - 0xe8, 0x01, 0xad, 0x1b, 0x57, 0x50, 0x54, 0x45, 0x88, 0xa4, 0x76, 0x95, 0x88, 0x36, 0xb1, 0x26, - 0x49, 0x11, 0xe5, 0xb0, 0x9a, 0x78, 0x27, 0xce, 0x08, 0xef, 0xec, 0x76, 0x77, 0x36, 0x4a, 0x6e, - 0x5c, 0xb8, 0xf7, 0xc8, 0x47, 0x80, 0x2f, 0xc1, 0x95, 0x1c, 0x2b, 0xf5, 0xd2, 0x13, 0x10, 0x73, - 0xe1, 0x82, 0xd4, 0x03, 0x1f, 0x00, 0xed, 0xec, 0xcc, 0xae, 0xeb, 0xd8, 0x88, 0x70, 0xdb, 0x79, - 0xbf, 0xf7, 0xef, 0xf7, 0xde, 0x9b, 0xb7, 0x03, 0x35, 0xdf, 0x1b, 0xb0, 0xde, 0x79, 0xf3, 0x74, - 0xfd, 0x88, 0x0a, 0xb2, 0xde, 0xec, 0x1d, 0xf7, 0x2d, 0x3f, 0xf0, 0x84, 0x87, 0x96, 0x58, 0x28, - 0x98, 0x67, 0x25, 0xb8, 0xa5, 0xf0, 0xfa, 0x52, 0xdf, 0xeb, 0x7b, 0x52, 0xa1, 0x19, 0x7f, 0x25, - 0xba, 0xf5, 0x95, 0xbe, 0xe7, 0xf5, 0x07, 0xb4, 0x29, 0x4f, 0x47, 0xd1, 0x71, 0x33, 0x14, 0x41, - 0xd4, 0x13, 0x0a, 0x35, 0xc7, 0x51, 0x27, 0x0a, 0x88, 0x60, 0x1e, 0x57, 0xf8, 0xea, 0x58, 0x0e, - 0xa7, 0x64, 0x10, 0x51, 0x5b, 0x9c, 0xfb, 0x34, 0x51, 0x68, 0x7c, 0x9f, 0x87, 0xc5, 0x4d, 0x21, - 0x02, 0x76, 0x14, 0x09, 0xfa, 0x94, 0x70, 0x76, 0x4c, 0x43, 0x81, 0xea, 0x50, 0x0a, 0xe8, 0x29, - 0x0b, 0x99, 0xc7, 0x6b, 0xc6, 0x9a, 0x71, 0xb7, 0x8c, 0xd3, 0x33, 0x42, 0x30, 0xcb, 0x89, 0x4b, - 0x6b, 0x33, 0x52, 0x2e, 0xbf, 0xd1, 0x57, 0x00, 0x44, 0x3b, 0x09, 0x6b, 0xf9, 0xb5, 0xfc, 0xdd, - 0x4a, 0xeb, 0x81, 0x35, 0x89, 0xa5, 0x75, 0x25, 0x58, 0x26, 0x09, 0x3b, 0x5c, 0x04, 0xe7, 0x78, - 0xc4, 0x55, 0xfd, 0x05, 0xcc, 0xa5, 0xf0, 0x0e, 0x3f, 0xf6, 0xd0, 0x1a, 0x54, 0x1c, 0x1a, 0xf6, - 0x02, 0xe6, 0x8b, 0x2c, 0xb9, 0x51, 0x11, 0xfa, 0x1c, 0x20, 0x63, 0x29, 0xb3, 0x9c, 0x6f, 0xad, - 0x4e, 0xce, 0xe5, 0x59, 0xac, 0x77, 0x70, 0xee, 0x53, 0x5c, 0x3e, 0xd5, 0x9f, 0x75, 0x01, 0x0b, - 0x63, 0x19, 0xa1, 0x2a, 0xe4, 0xbf, 0xa5, 0xe7, 0x2a, 0x58, 0xfc, 0x89, 0xbe, 0x84, 0x1b, 0xd2, - 0x42, 0xfa, 0xaf, 0xb4, 0x3e, 0xb9, 0x36, 0xd7, 0x98, 0x0c, 0x4e, 0x7c, 0x3c, 0x9c, 0xf9, 0xcc, - 0x68, 0x5c, 0xcc, 0xc2, 0x2c, 0x8e, 0x06, 0x14, 0x2d, 0xc1, 0x0d, 0x97, 0x88, 0xde, 0x89, 0x8a, - 0x96, 0x1c, 0xd0, 0xa7, 0x50, 0x24, 0xbd, 0x98, 0x5e, 0x58, 0x9b, 0x91, 0xd5, 0x5d, 0x99, 0x12, - 0x51, 0x2a, 0x61, 0xad, 0x8c, 0x38, 0xdc, 0x09, 0xe8, 0x8b, 0x88, 0x86, 0xc2, 0x3e, 0xa1, 0xc4, - 0xa1, 0x81, 0xed, 0xf9, 0x34, 0x99, 0x10, 0xdd, 0xa7, 0xd6, 0x64, 0x4f, 0x71, 0x32, 0xd6, 0xb6, - 0xb4, 0xd9, 0xd3, 0x26, 0x07, 0xd4, 0xf5, 0x07, 0x44, 0x50, 0xbc, 0xac, 0x9c, 0x8e, 0xe1, 0x21, - 0xf2, 0xa1, 0x1e, 0xd0, 0xd0, 0xf7, 0x78, 0x48, 0x27, 0x04, 0x9c, 0xfd, 0xdf, 0x01, 0x6b, 0xda, - 0xeb, 0x95, 0x88, 0x0f, 0xa1, 0x14, 0x12, 0xd7, 0x1f, 0x30, 0xde, 0xaf, 0xdd, 0x90, 0xcd, 0x30, - 0x27, 0xfb, 0xdf, 0x57, 0x5a, 0x38, 0xd5, 0xaf, 0xbf, 0x36, 0x60, 0x79, 0x4a, 0xc4, 0x74, 0xcc, - 0x8d, 0x91, 0x31, 0xbf, 0x0d, 0x05, 0xd9, 0xb1, 0xa4, 0x09, 0x65, 0xac, 0x4e, 0xe8, 0x39, 0x94, - 0x53, 0x96, 0xb5, 0xbc, 0x9c, 0xb8, 0x8d, 0xeb, 0x93, 0xb4, 0x52, 0x09, 0xce, 0xdc, 0x35, 0xee, - 0x41, 0x39, 0x95, 0xa3, 0x0a, 0x14, 0x71, 0xa7, 0xfb, 0x64, 0xf3, 0x51, 0xa7, 0x9a, 0x43, 0x00, - 0x05, 0xdc, 0x79, 0xba, 0xf7, 0xac, 0x53, 0x35, 0xe2, 0xef, 0xcd, 0x6e, 0xb7, 0xb3, 0xdb, 0xae, - 0xce, 0x34, 0x0e, 0xa0, 0x90, 0x8c, 0x01, 0xaa, 0x41, 0xf1, 0x84, 0x70, 0x67, 0x40, 0x03, 0x75, - 0x5b, 0xf5, 0x11, 0xad, 0x40, 0x99, 0xf1, 0x50, 0x10, 0xde, 0x53, 0xf7, 0xb5, 0x8c, 0x33, 0x41, - 0xca, 0x7d, 0x36, 0xe3, 0xde, 0xf8, 0x65, 0x06, 0x4a, 0x3b, 0x4a, 0x63, 0x62, 0x71, 0xea, 0x50, - 0x12, 0x8a, 0x89, 0x8a, 0x96, 0x9e, 0x51, 0x13, 0x0a, 0x3e, 0x09, 0x88, 0x1b, 0xca, 0xea, 0x54, - 0x5a, 0xcb, 0x56, 0xb2, 0xb7, 0x2c, 0xbd, 0xb7, 0xac, 0x7d, 0xb9, 0xd5, 0xb0, 0x52, 0x43, 0x0e, - 0xa0, 0x74, 0x0b, 0xd8, 0x47, 0x8c, 0x3b, 0x8c, 0xf7, 0xf5, 0xfc, 0x4c, 0xb9, 0x6c, 0x3a, 0xb9, - 0xec, 0x8e, 0x6d, 0x29, 0xbb, 0x64, 0xad, 0x2c, 0x92, 0x71, 0x39, 0xb2, 0x60, 0xb1, 0xe7, 0xb9, - 0x3e, 0x1b, 0x50, 0xc7, 0x4e, 0x73, 0xff, 0xfb, 0xaf, 0x9f, 0xd6, 0x64, 0xfa, 0x55, 0x8d, 0xe9, - 0x06, 0xd5, 0xdb, 0x70, 0x7b, 0xb2, 0xf3, 0x09, 0x1b, 0x62, 0x69, 0x74, 0x43, 0x94, 0x47, 0xaf, - 0xfa, 0x1b, 0x03, 0x8a, 0xdb, 0xaa, 0x0f, 0x93, 0x0a, 0x59, 0x83, 0x22, 0x71, 0x88, 0x2f, 0xb2, - 0xae, 0xa9, 0xe3, 0xf5, 0xcb, 0xf8, 0x05, 0x40, 0xcf, 0xe3, 0x9c, 0xca, 0x71, 0x90, 0xed, 0xac, - 0xb4, 0xd6, 0x26, 0x97, 0xef, 0x51, 0xaa, 0x87, 0x47, 0x6c, 0xd0, 0xc7, 0x90, 0x96, 0xc1, 0xd6, - 0x59, 0xa5, 0x15, 0x5a, 0xd0, 0xd0, 0x66, 0x82, 0x34, 0xbe, 0x01, 0xc8, 0xfc, 0x24, 0x44, 0x9c, - 0x80, 0x86, 0x61, 0x46, 0x44, 0x1e, 0xd1, 0x7d, 0x28, 0x0a, 0xe6, 0x52, 0x2f, 0x12, 0x8a, 0xc9, - 0x9d, 0x2b, 0x4c, 0xda, 0xea, 0x47, 0x86, 0xb5, 0x66, 0xe3, 0xa5, 0x01, 0x25, 0x7d, 0x89, 0xd1, - 0x06, 0x14, 0x02, 0xc2, 0x1d, 0xcf, 0x95, 0xa5, 0xab, 0xb4, 0x3e, 0x9c, 0x72, 0xdf, 0xa4, 0x4e, - 0x7a, 0xf5, 0x95, 0x0d, 0x7a, 0x0c, 0x10, 0x10, 0x41, 0xed, 0x01, 0x73, 0x99, 0x50, 0x3b, 0xfc, - 0xa3, 0x69, 0x1e, 0x04, 0x7d, 0x12, 0xab, 0xa5, 0x4e, 0xca, 0x81, 0x16, 0x35, 0x5e, 0x1b, 0x30, - 0xff, 0x6e, 0x08, 0xb4, 0x0e, 0x4b, 0xd9, 0xe4, 0xd2, 0x33, 0x3f, 0xe6, 0x9b, 0xfd, 0xa9, 0x6e, - 0xa5, 0x58, 0x27, 0x85, 0x50, 0x17, 0x16, 0x7c, 0x1a, 0xf4, 0x28, 0x17, 0xb6, 0x5c, 0x4d, 0xd4, - 0xf9, 0xf7, 0x94, 0x1e, 0x07, 0xc9, 0x7a, 0x27, 0x83, 0x6e, 0x62, 0x86, 0xe7, 0x95, 0xfd, 0x7e, - 0x62, 0x8e, 0x36, 0xa0, 0x1e, 0x85, 0xd4, 0x66, 0xdc, 0xa1, 0x3e, 0xe5, 0x4e, 0xec, 0x39, 0x61, - 0xce, 0xe3, 0x66, 0xc4, 0x25, 0x2f, 0xe1, 0x5a, 0x14, 0xd2, 0x9d, 0x4c, 0x01, 0xa7, 0x78, 0xe3, - 0x67, 0x03, 0x16, 0xaf, 0xd0, 0x46, 0x5d, 0x58, 0xd4, 0x8b, 0xd3, 0xd6, 0xaf, 0x0c, 0x55, 0xfc, - 0xe9, 0xdd, 0xdb, 0x2a, 0x5d, 0xfc, 0xba, 0x9a, 0xfb, 0xe1, 0xb7, 0x55, 0x03, 0x57, 0xb5, 0xb5, - 0xc6, 0x50, 0x0b, 0xde, 0x73, 0xc9, 0x99, 0x1d, 0x71, 0xc5, 0xda, 0xa6, 0x5c, 0x04, 0x8c, 0x26, - 0xd3, 0x92, 0xc7, 0xb7, 0x5c, 0x72, 0x76, 0xa8, 0xb1, 0x4e, 0x02, 0xa1, 0x0f, 0x60, 0x2e, 0xcd, - 0x22, 0xee, 0x83, 0x24, 0x93, 0xc7, 0x37, 0xb5, 0x30, 0xce, 0x5b, 0x12, 0xb8, 0x52, 0xa4, 0x78, - 0xe7, 0xf1, 0xc8, 0x8d, 0x57, 0xa9, 0x17, 0xc8, 0xc4, 0xe7, 0x70, 0x26, 0x40, 0x5f, 0xc7, 0x0f, - 0x0b, 0xee, 0xb9, 0x8c, 0x4b, 0x3c, 0x79, 0x37, 0x3c, 0xf8, 0x8f, 0x0d, 0xb0, 0xda, 0x99, 0xa9, - 0x7c, 0x4f, 0x8c, 0xfa, 0x6a, 0xdc, 0x83, 0x85, 0x31, 0x3c, 0x5e, 0xe4, 0xdb, 0x87, 0xbb, 0x6d, - 0xdc, 0x69, 0x57, 0x73, 0xa8, 0x0a, 0x37, 0x0f, 0x3a, 0xbb, 0xf6, 0xc1, 0xf6, 0xde, 0xe1, 0xfe, - 0xe6, 0x6e, 0xbb, 0x6a, 0x6c, 0xed, 0xbc, 0xba, 0x34, 0x73, 0x6f, 0x2e, 0xcd, 0xdc, 0xdb, 0x4b, - 0xd3, 0xf8, 0x6e, 0x68, 0x1a, 0x3f, 0x0e, 0x4d, 0xe3, 0x62, 0x68, 0x1a, 0xaf, 0x86, 0xa6, 0xf1, - 0xfb, 0xd0, 0x34, 0xfe, 0x1c, 0x9a, 0xb9, 0xb7, 0x43, 0xd3, 0x78, 0xf9, 0x87, 0x99, 0x7b, 0xfe, - 0x7e, 0x92, 0x24, 0xf3, 0x9a, 0xc4, 0x67, 0xcd, 0x77, 0x5f, 0x7c, 0x47, 0x05, 0xd9, 0x93, 0xfb, - 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x81, 0xf1, 0xc8, 0x2d, 0x8e, 0x0a, 0x00, 0x00, + 0x14, 0xf7, 0xc6, 0xae, 0xff, 0x3c, 0x37, 0x89, 0x33, 0x0d, 0x8d, 0x6b, 0xa2, 0x4d, 0x64, 0x90, + 0xe8, 0x01, 0xad, 0x1b, 0x23, 0x28, 0x54, 0x11, 0x22, 0xa9, 0x5d, 0x25, 0xa2, 0x4d, 0xac, 0x49, + 0x52, 0x44, 0x2f, 0xab, 0x89, 0x77, 0xe2, 0x8c, 0xf0, 0xce, 0x6e, 0x77, 0x67, 0xa3, 0xe4, 0xc6, + 0x85, 0x7b, 0x8f, 0x7c, 0x04, 0xf8, 0x12, 0x5c, 0xc9, 0xb1, 0x52, 0x2f, 0x3d, 0x01, 0x31, 0x17, + 0x2e, 0x48, 0x3d, 0xf0, 0x01, 0xd0, 0xce, 0xce, 0xec, 0xba, 0x8e, 0x53, 0x11, 0x6e, 0x3b, 0xef, + 0xf7, 0xfe, 0xfd, 0xde, 0x7b, 0xf3, 0x76, 0xa0, 0xee, 0x7b, 0x43, 0xd6, 0x3f, 0x6b, 0x9d, 0xac, + 0x1d, 0x52, 0x41, 0xd6, 0x5a, 0xfd, 0xa3, 0x81, 0xe5, 0x07, 0x9e, 0xf0, 0xd0, 0x22, 0x0b, 0x05, + 0xf3, 0xac, 0x04, 0xb7, 0x14, 0xde, 0x58, 0x1c, 0x78, 0x03, 0x4f, 0x2a, 0xb4, 0xe2, 0xaf, 0x44, + 0xb7, 0xb1, 0x3c, 0xf0, 0xbc, 0xc1, 0x90, 0xb6, 0xe4, 0xe9, 0x30, 0x3a, 0x6a, 0x85, 0x22, 0x88, + 0xfa, 0x42, 0xa1, 0xe6, 0x24, 0xea, 0x44, 0x01, 0x11, 0xcc, 0xe3, 0x0a, 0x5f, 0x99, 0xc8, 0xe1, + 0x84, 0x0c, 0x23, 0x6a, 0x8b, 0x33, 0x9f, 0x26, 0x0a, 0xcd, 0x1f, 0xf2, 0xb0, 0xb0, 0x21, 0x44, + 0xc0, 0x0e, 0x23, 0x41, 0x9f, 0x10, 0xce, 0x8e, 0x68, 0x28, 0x50, 0x03, 0xca, 0x01, 0x3d, 0x61, + 0x21, 0xf3, 0x78, 0xdd, 0x58, 0x35, 0xee, 0x56, 0x70, 0x7a, 0x46, 0x08, 0x0a, 0x9c, 0xb8, 0xb4, + 0x3e, 0x23, 0xe5, 0xf2, 0x1b, 0x7d, 0x03, 0x40, 0xb4, 0x93, 0xb0, 0x9e, 0x5f, 0xcd, 0xdf, 0xad, + 0xb6, 0xef, 0x5b, 0xd3, 0x58, 0x5a, 0x97, 0x82, 0x65, 0x92, 0xb0, 0xcb, 0x45, 0x70, 0x86, 0xc7, + 0x5c, 0x35, 0x9e, 0xc3, 0x6c, 0x0a, 0x6f, 0xf3, 0x23, 0x0f, 0xad, 0x42, 0xd5, 0xa1, 0x61, 0x3f, + 0x60, 0xbe, 0xc8, 0x92, 0x1b, 0x17, 0xa1, 0x2f, 0x01, 0x32, 0x96, 0x32, 0xcb, 0xb9, 0xf6, 0xca, + 0xf4, 0x5c, 0x9e, 0xc6, 0x7a, 0xfb, 0x67, 0x3e, 0xc5, 0x95, 0x13, 0xfd, 0xd9, 0x10, 0x30, 0x3f, + 0x91, 0x11, 0xaa, 0x41, 0xfe, 0x3b, 0x7a, 0xa6, 0x82, 0xc5, 0x9f, 0xe8, 0x6b, 0xb8, 0x21, 0x2d, + 0xa4, 0xff, 0x6a, 0xfb, 0xd3, 0x6b, 0x73, 0x8d, 0xc9, 0xe0, 0xc4, 0xc7, 0x83, 0x99, 0xcf, 0x8d, + 0xe6, 0x79, 0x01, 0x0a, 0x38, 0x1a, 0x52, 0xb4, 0x08, 0x37, 0x5c, 0x22, 0xfa, 0xc7, 0x2a, 0x5a, + 0x72, 0x40, 0x9f, 0x41, 0x89, 0xf4, 0x63, 0x7a, 0x61, 0x7d, 0x46, 0x56, 0x77, 0xf9, 0x8a, 0x88, + 0x52, 0x09, 0x6b, 0x65, 0xc4, 0xe1, 0x4e, 0x40, 0x9f, 0x47, 0x34, 0x14, 0xf6, 0x31, 0x25, 0x0e, + 0x0d, 0x6c, 0xcf, 0xa7, 0xc9, 0x84, 0xe8, 0x3e, 0xb5, 0xa7, 0x7b, 0x8a, 0x93, 0xb1, 0xb6, 0xa4, + 0xcd, 0xae, 0x36, 0xd9, 0xa7, 0xae, 0x3f, 0x24, 0x82, 0xe2, 0x25, 0xe5, 0x74, 0x02, 0x0f, 0x91, + 0x0f, 0x8d, 0x80, 0x86, 0xbe, 0xc7, 0x43, 0x3a, 0x25, 0x60, 0xe1, 0x7f, 0x07, 0xac, 0x6b, 0xaf, + 0x97, 0x22, 0x3e, 0x80, 0x72, 0x48, 0x5c, 0x7f, 0xc8, 0xf8, 0xa0, 0x7e, 0x43, 0x36, 0xc3, 0x9c, + 0xee, 0x7f, 0x4f, 0x69, 0xe1, 0x54, 0xbf, 0xf1, 0xca, 0x80, 0xa5, 0x2b, 0x22, 0xa6, 0x63, 0x6e, + 0x8c, 0x8d, 0xf9, 0x6d, 0x28, 0xca, 0x8e, 0x25, 0x4d, 0xa8, 0x60, 0x75, 0x42, 0xcf, 0xa0, 0x92, + 0xb2, 0xac, 0xe7, 0xe5, 0xc4, 0xad, 0x5f, 0x9f, 0xa4, 0x95, 0x4a, 0x70, 0xe6, 0xae, 0x79, 0x0f, + 0x2a, 0xa9, 0x1c, 0x55, 0xa1, 0x84, 0xbb, 0xbd, 0xc7, 0x1b, 0x0f, 0xbb, 0xb5, 0x1c, 0x02, 0x28, + 0xe2, 0xee, 0x93, 0xdd, 0xa7, 0xdd, 0x9a, 0x11, 0x7f, 0x6f, 0xf4, 0x7a, 0xdd, 0x9d, 0x4e, 0x6d, + 0xa6, 0xb9, 0x0f, 0xc5, 0x64, 0x0c, 0x50, 0x1d, 0x4a, 0xc7, 0x84, 0x3b, 0x43, 0x1a, 0xa8, 0xdb, + 0xaa, 0x8f, 0x68, 0x19, 0x2a, 0x8c, 0x87, 0x82, 0xf0, 0xbe, 0xba, 0xaf, 0x15, 0x9c, 0x09, 0x52, + 0xee, 0x85, 0x8c, 0x7b, 0xf3, 0xd7, 0x19, 0x28, 0x6f, 0x2b, 0x8d, 0xa9, 0xc5, 0x69, 0x40, 0x59, + 0x28, 0x26, 0x2a, 0x5a, 0x7a, 0x46, 0x2d, 0x28, 0xfa, 0x24, 0x20, 0x6e, 0x28, 0xab, 0x53, 0x6d, + 0x2f, 0x59, 0xc9, 0xde, 0xb2, 0xf4, 0xde, 0xb2, 0xf6, 0xe4, 0x56, 0xc3, 0x4a, 0x0d, 0x39, 0x80, + 0xd2, 0x2d, 0x60, 0x1f, 0x32, 0xee, 0x30, 0x3e, 0xd0, 0xf3, 0x73, 0xc5, 0x65, 0xd3, 0xc9, 0x65, + 0x77, 0x6c, 0x53, 0xd9, 0x25, 0x6b, 0x65, 0x81, 0x4c, 0xca, 0x91, 0x05, 0x0b, 0x7d, 0xcf, 0xf5, + 0xd9, 0x90, 0x3a, 0x76, 0x9a, 0xfb, 0x3f, 0x7f, 0xff, 0xbc, 0x2a, 0xd3, 0xaf, 0x69, 0x4c, 0x37, + 0xa8, 0xd1, 0x81, 0xdb, 0xd3, 0x9d, 0x4f, 0xd9, 0x10, 0x8b, 0xe3, 0x1b, 0xa2, 0x32, 0x7e, 0xd5, + 0x5f, 0x1b, 0x50, 0xda, 0x52, 0x7d, 0x98, 0x56, 0xc8, 0x3a, 0x94, 0x88, 0x43, 0x7c, 0x91, 0x75, + 0x4d, 0x1d, 0xaf, 0x5f, 0xc6, 0xaf, 0x00, 0xfa, 0x1e, 0xe7, 0x54, 0x8e, 0x83, 0x6c, 0x67, 0xb5, + 0xbd, 0x3a, 0xbd, 0x7c, 0x0f, 0x53, 0x3d, 0x3c, 0x66, 0x83, 0x3e, 0x86, 0xb4, 0x0c, 0xb6, 0xce, + 0x2a, 0xad, 0xd0, 0xbc, 0x86, 0x36, 0x12, 0xa4, 0x49, 0x00, 0x32, 0x3f, 0x09, 0x11, 0x27, 0xa0, + 0x61, 0x98, 0x11, 0x91, 0x47, 0xf4, 0x05, 0x94, 0x04, 0x73, 0xa9, 0x17, 0x09, 0xc5, 0xe4, 0xce, + 0x25, 0x26, 0x1d, 0xf5, 0x23, 0xdb, 0x2c, 0xfc, 0xf8, 0xfb, 0x8a, 0x81, 0xb5, 0x7e, 0xf3, 0x85, + 0x01, 0x65, 0x7d, 0x95, 0xd1, 0x3a, 0x14, 0x03, 0xc2, 0x1d, 0xcf, 0x95, 0x05, 0xac, 0xb6, 0x3f, + 0xbc, 0xe2, 0xd6, 0x49, 0x9d, 0x74, 0x01, 0x28, 0x1b, 0xf4, 0x08, 0x20, 0x20, 0x82, 0xda, 0x43, + 0xe6, 0x32, 0xa1, 0x36, 0xf9, 0x47, 0x57, 0x79, 0x10, 0xf4, 0x71, 0xac, 0x96, 0x3a, 0xa9, 0x04, + 0x5a, 0xd4, 0x7c, 0x65, 0xc0, 0xdc, 0xdb, 0x21, 0xd0, 0x1a, 0x2c, 0x66, 0xf3, 0x4b, 0x4f, 0xfd, + 0x98, 0x75, 0xf6, 0xbf, 0xba, 0x95, 0x62, 0xdd, 0x14, 0x42, 0x3d, 0x98, 0xf7, 0x69, 0xd0, 0xa7, + 0x5c, 0xd8, 0x72, 0x41, 0x51, 0xe7, 0xdd, 0x29, 0x3d, 0x0a, 0x92, 0x25, 0x4f, 0x86, 0xbd, 0xc4, + 0x0c, 0xcf, 0x29, 0xfb, 0xbd, 0xc4, 0x1c, 0xad, 0x43, 0x23, 0x0a, 0xa9, 0xcd, 0xb8, 0x43, 0x7d, + 0xca, 0x9d, 0xd8, 0x73, 0xc2, 0x9c, 0xc7, 0x2d, 0x89, 0x0b, 0x5f, 0xc6, 0xf5, 0x28, 0xa4, 0xdb, + 0x99, 0x02, 0x4e, 0xf1, 0xe6, 0x2f, 0x06, 0x2c, 0x5c, 0xa2, 0x8d, 0x7a, 0xb0, 0xa0, 0xd7, 0xa7, + 0xad, 0xdf, 0x1a, 0xaa, 0xf8, 0xef, 0xe8, 0x61, 0xf9, 0xfc, 0xb7, 0x95, 0x9c, 0xec, 0x63, 0x4d, + 0x5b, 0x6b, 0x0c, 0xb5, 0xe1, 0x3d, 0x97, 0x9c, 0xda, 0x11, 0x57, 0xac, 0x6d, 0xca, 0x45, 0xc0, + 0x68, 0x32, 0x33, 0x79, 0x7c, 0xcb, 0x25, 0xa7, 0x07, 0x1a, 0xeb, 0x26, 0x10, 0xfa, 0x00, 0x66, + 0xd3, 0x2c, 0xe2, 0x3e, 0x48, 0x32, 0x79, 0x7c, 0x53, 0x0b, 0xe3, 0xbc, 0x25, 0x81, 0x4b, 0x45, + 0x8a, 0x37, 0x1f, 0x8f, 0xdc, 0x78, 0xa1, 0x7a, 0x81, 0x4c, 0x7c, 0x16, 0x67, 0x02, 0xf4, 0x6d, + 0xfc, 0xbc, 0xe0, 0x9e, 0xcb, 0xb8, 0xc4, 0x93, 0xd7, 0xc3, 0xfd, 0xff, 0xd8, 0x00, 0xab, 0x93, + 0x99, 0xca, 0x57, 0xc5, 0xb8, 0xaf, 0xe6, 0x3d, 0x98, 0x9f, 0xc0, 0xe3, 0x75, 0xbe, 0x75, 0xb0, + 0xd3, 0xc1, 0xdd, 0x4e, 0x2d, 0x87, 0x6a, 0x70, 0x73, 0xbf, 0xbb, 0x63, 0xef, 0x6f, 0xed, 0x1e, + 0xec, 0x6d, 0xec, 0x74, 0x6a, 0xc6, 0xe6, 0xf6, 0xcb, 0x0b, 0x33, 0xf7, 0xfa, 0xc2, 0xcc, 0xbd, + 0xb9, 0x30, 0x8d, 0xef, 0x47, 0xa6, 0xf1, 0xd3, 0xc8, 0x34, 0xce, 0x47, 0xa6, 0xf1, 0x72, 0x64, + 0x1a, 0x7f, 0x8c, 0x4c, 0xe3, 0xaf, 0x91, 0x99, 0x7b, 0x33, 0x32, 0x8d, 0x17, 0x7f, 0x9a, 0xb9, + 0x67, 0xef, 0x27, 0x49, 0x32, 0xaf, 0x45, 0x7c, 0xd6, 0x7a, 0xfb, 0xdd, 0x77, 0x58, 0x94, 0x3d, + 0xf9, 0xe4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, 0x43, 0xbf, 0xa9, 0x94, 0x0a, 0x00, 0x00, } diff --git a/policy/v1beta1/cfg.proto b/policy/v1beta1/cfg.proto index 08491be43d..5ac9013d36 100644 --- a/policy/v1beta1/cfg.proto +++ b/policy/v1beta1/cfg.proto @@ -332,7 +332,7 @@ message Connection { string address = 2; // Timeout for remote calls to the backend. - google.protobuf.Duration timeout = 3; + google.protobuf.Duration timeout = 3 [(gogoproto.stdduration) = true]; // TODO: Add auth related fields. } diff --git a/python/istio_api/policy/v1beta1/cfg_pb2.py b/python/istio_api/policy/v1beta1/cfg_pb2.py index ee38377654..10627fd188 100644 --- a/python/istio_api/policy/v1beta1/cfg_pb2.py +++ b/python/istio_api/policy/v1beta1/cfg_pb2.py @@ -23,7 +23,7 @@ name='policy/v1beta1/cfg.proto', package='istio.policy.v1beta1', syntax='proto3', - serialized_pb=_b('\n\x18policy/v1beta1/cfg.proto\x12\x14istio.policy.v1beta1\x1a\x14gogoproto/gogo.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fpolicy/v1beta1/value_type.proto\"\xc5\x02\n\x11\x41ttributeManifest\x12\x10\n\x08revision\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\nattributes\x18\x03 \x03(\x0b\x32\x37.istio.policy.v1beta1.AttributeManifest.AttributesEntry\x1aY\n\rAttributeInfo\x12\x13\n\x0b\x64\x65scription\x18\x01 \x01(\t\x12\x33\n\nvalue_type\x18\x02 \x01(\x0e\x32\x1f.istio.policy.v1beta1.ValueType\x1ah\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x44\n\x05value\x18\x02 \x01(\x0b\x32\x35.istio.policy.v1beta1.AttributeManifest.AttributeInfo:\x02\x38\x01\"\xe2\x03\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12-\n\x07\x61\x63tions\x18\x02 \x03(\x0b\x32\x1c.istio.policy.v1beta1.Action\x12U\n\x19request_header_operations\x18\x03 \x03(\x0b\x32\x32.istio.policy.v1beta1.Rule.HeaderOperationTemplate\x12V\n\x1aresponse_header_operations\x18\x04 \x03(\x0b\x32\x32.istio.policy.v1beta1.Rule.HeaderOperationTemplate\x12\x30\n\x08sampling\x18\x05 \x01(\x0b\x32\x1e.istio.policy.v1beta1.Sampling\x1a\xba\x01\n\x17HeaderOperationTemplate\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06values\x18\x02 \x03(\t\x12O\n\toperation\x18\x03 \x01(\x0e\x32<.istio.policy.v1beta1.Rule.HeaderOperationTemplate.Operation\"0\n\tOperation\x12\x0b\n\x07REPLACE\x10\x00\x12\n\n\x06REMOVE\x10\x01\x12\n\n\x06\x41PPEND\x10\x02\":\n\x06\x41\x63tion\x12\x0f\n\x07handler\x18\x02 \x01(\t\x12\x11\n\tinstances\x18\x03 \x03(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\"\xfe\x01\n\x08Instance\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1c\n\x11\x63ompiled_template\x18\xf4\xed\xa9 \x01(\t\x12\x10\n\x08template\x18\x02 \x01(\t\x12\'\n\x06params\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12Q\n\x12\x61ttribute_bindings\x18\x04 \x03(\x0b\x32\x35.istio.policy.v1beta1.Instance.AttributeBindingsEntry\x1a\x38\n\x16\x41ttributeBindingsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa4\x01\n\x07Handler\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1b\n\x10\x63ompiled_adapter\x18\xf4\xed\xa9 \x01(\t\x12\x0f\n\x07\x61\x64\x61pter\x18\x02 \x01(\t\x12\'\n\x06params\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x34\n\nconnection\x18\x04 \x01(\x0b\x32 .istio.policy.v1beta1.Connection\"I\n\nConnection\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12*\n\x07timeout\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\"}\n\x08Sampling\x12\x34\n\x06random\x18\x01 \x01(\x0b\x32$.istio.policy.v1beta1.RandomSampling\x12;\n\nrate_limit\x18\x02 \x01(\x0b\x32\'.istio.policy.v1beta1.RateLimitSampling\"\x94\x01\n\x0eRandomSampling\x12\x1c\n\x14\x61ttribute_expression\x18\x01 \x01(\t\x12@\n\x0fpercent_sampled\x18\x02 \x01(\x0b\x32\'.istio.policy.v1beta1.FractionalPercent\x12\"\n\x1ause_independent_randomness\x18\x03 \x01(\x08\"\x89\x01\n\x11RateLimitSampling\x12>\n\x11sampling_duration\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xc8\xde\x1f\x00\x98\xdf\x1f\x01\x12\x1d\n\x15max_unsampled_entries\x18\x02 \x01(\x03\x12\x15\n\rsampling_rate\x18\x03 \x01(\x03\"\xa6\x01\n\x11\x46ractionalPercent\x12\x11\n\tnumerator\x18\x01 \x01(\r\x12L\n\x0b\x64\x65nominator\x18\x02 \x01(\x0e\x32\x37.istio.policy.v1beta1.FractionalPercent.DenominatorType\"0\n\x0f\x44\x65nominatorType\x12\x0b\n\x07HUNDRED\x10\x00\x12\x10\n\x0cTEN_THOUSAND\x10\x01\x42\x1dZ\x1bistio.io/api/policy/v1beta1b\x06proto3') + serialized_pb=_b('\n\x18policy/v1beta1/cfg.proto\x12\x14istio.policy.v1beta1\x1a\x14gogoproto/gogo.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fpolicy/v1beta1/value_type.proto\"\xc5\x02\n\x11\x41ttributeManifest\x12\x10\n\x08revision\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\nattributes\x18\x03 \x03(\x0b\x32\x37.istio.policy.v1beta1.AttributeManifest.AttributesEntry\x1aY\n\rAttributeInfo\x12\x13\n\x0b\x64\x65scription\x18\x01 \x01(\t\x12\x33\n\nvalue_type\x18\x02 \x01(\x0e\x32\x1f.istio.policy.v1beta1.ValueType\x1ah\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x44\n\x05value\x18\x02 \x01(\x0b\x32\x35.istio.policy.v1beta1.AttributeManifest.AttributeInfo:\x02\x38\x01\"\xe2\x03\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12-\n\x07\x61\x63tions\x18\x02 \x03(\x0b\x32\x1c.istio.policy.v1beta1.Action\x12U\n\x19request_header_operations\x18\x03 \x03(\x0b\x32\x32.istio.policy.v1beta1.Rule.HeaderOperationTemplate\x12V\n\x1aresponse_header_operations\x18\x04 \x03(\x0b\x32\x32.istio.policy.v1beta1.Rule.HeaderOperationTemplate\x12\x30\n\x08sampling\x18\x05 \x01(\x0b\x32\x1e.istio.policy.v1beta1.Sampling\x1a\xba\x01\n\x17HeaderOperationTemplate\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06values\x18\x02 \x03(\t\x12O\n\toperation\x18\x03 \x01(\x0e\x32<.istio.policy.v1beta1.Rule.HeaderOperationTemplate.Operation\"0\n\tOperation\x12\x0b\n\x07REPLACE\x10\x00\x12\n\n\x06REMOVE\x10\x01\x12\n\n\x06\x41PPEND\x10\x02\":\n\x06\x41\x63tion\x12\x0f\n\x07handler\x18\x02 \x01(\t\x12\x11\n\tinstances\x18\x03 \x03(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\"\xfe\x01\n\x08Instance\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1c\n\x11\x63ompiled_template\x18\xf4\xed\xa9 \x01(\t\x12\x10\n\x08template\x18\x02 \x01(\t\x12\'\n\x06params\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12Q\n\x12\x61ttribute_bindings\x18\x04 \x03(\x0b\x32\x35.istio.policy.v1beta1.Instance.AttributeBindingsEntry\x1a\x38\n\x16\x41ttributeBindingsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa4\x01\n\x07Handler\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1b\n\x10\x63ompiled_adapter\x18\xf4\xed\xa9 \x01(\t\x12\x0f\n\x07\x61\x64\x61pter\x18\x02 \x01(\t\x12\'\n\x06params\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x34\n\nconnection\x18\x04 \x01(\x0b\x32 .istio.policy.v1beta1.Connection\"O\n\nConnection\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x30\n\x07timeout\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x04\x98\xdf\x1f\x01\"}\n\x08Sampling\x12\x34\n\x06random\x18\x01 \x01(\x0b\x32$.istio.policy.v1beta1.RandomSampling\x12;\n\nrate_limit\x18\x02 \x01(\x0b\x32\'.istio.policy.v1beta1.RateLimitSampling\"\x94\x01\n\x0eRandomSampling\x12\x1c\n\x14\x61ttribute_expression\x18\x01 \x01(\t\x12@\n\x0fpercent_sampled\x18\x02 \x01(\x0b\x32\'.istio.policy.v1beta1.FractionalPercent\x12\"\n\x1ause_independent_randomness\x18\x03 \x01(\x08\"\x89\x01\n\x11RateLimitSampling\x12>\n\x11sampling_duration\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xc8\xde\x1f\x00\x98\xdf\x1f\x01\x12\x1d\n\x15max_unsampled_entries\x18\x02 \x01(\x03\x12\x15\n\rsampling_rate\x18\x03 \x01(\x03\"\xa6\x01\n\x11\x46ractionalPercent\x12\x11\n\tnumerator\x18\x01 \x01(\r\x12L\n\x0b\x64\x65nominator\x18\x02 \x01(\x0e\x32\x37.istio.policy.v1beta1.FractionalPercent.DenominatorType\"0\n\x0f\x44\x65nominatorType\x12\x0b\n\x07HUNDRED\x10\x00\x12\x10\n\x0cTEN_THOUSAND\x10\x01\x42\x1dZ\x1bistio.io/api/policy/v1beta1b\x06proto3') , dependencies=[gogoproto_dot_gogo__pb2.DESCRIPTOR,google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,policy_dot_v1beta1_dot_value__type__pb2.DESCRIPTOR,]) @@ -72,8 +72,8 @@ ], containing_type=None, options=None, - serialized_start=2076, - serialized_end=2124, + serialized_start=2082, + serialized_end=2130, ) _sym_db.RegisterEnumDescriptor(_FRACTIONALPERCENT_DENOMINATORTYPE) @@ -521,7 +521,7 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\230\337\037\001')), file=DESCRIPTOR), ], extensions=[ ], @@ -535,7 +535,7 @@ oneofs=[ ], serialized_start=1464, - serialized_end=1537, + serialized_end=1543, ) @@ -572,8 +572,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1539, - serialized_end=1664, + serialized_start=1545, + serialized_end=1670, ) @@ -617,8 +617,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1667, - serialized_end=1815, + serialized_start=1673, + serialized_end=1821, ) @@ -662,8 +662,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1818, - serialized_end=1955, + serialized_start=1824, + serialized_end=1961, ) @@ -701,8 +701,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1958, - serialized_end=2124, + serialized_start=1964, + serialized_end=2130, ) _ATTRIBUTEMANIFEST_ATTRIBUTEINFO.fields_by_name['value_type'].enum_type = policy_dot_v1beta1_dot_value__type__pb2._VALUETYPE @@ -850,6 +850,8 @@ _ATTRIBUTEMANIFEST_ATTRIBUTESENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) _INSTANCE_ATTRIBUTEBINDINGSENTRY.has_options = True _INSTANCE_ATTRIBUTEBINDINGSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) +_CONNECTION.fields_by_name['timeout'].has_options = True +_CONNECTION.fields_by_name['timeout']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\230\337\037\001')) _RATELIMITSAMPLING.fields_by_name['sampling_duration'].has_options = True _RATELIMITSAMPLING.fields_by_name['sampling_duration']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\310\336\037\000\230\337\037\001')) # @@protoc_insertion_point(module_scope)