diff --git a/Gopkg.lock b/Gopkg.lock index 8a566157c092..576e4f12cdca 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -370,7 +370,7 @@ "pkg/util", ] pruneopts = "T" - revision = "a29483497d9342d4e6419dd99723cb40fae96670" + revision = "e79e039496d24ae95c3fa1da70209b680ea05a91" version = "v0.5.0" [[projects]] diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clusterfiltered.txt b/istioctl/pkg/writer/envoy/clusters/testdata/clusterfiltered.txt index cebf956876de..68f73c3243a3 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clusterfiltered.txt +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clusterfiltered.txt @@ -10,20 +10,34 @@ "portValue": 9093 } }, - "stats": { - "cx_active": { - "type": "GAUGE" + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" + { + "name": "cx_connect_fail" }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "UNHEALTHY" } diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json b/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json index de59b39460b2..3194ac4dfae7 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json @@ -11,20 +11,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -42,20 +56,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -73,20 +101,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -104,20 +146,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -135,20 +191,34 @@ "portValue": 9093 } }, - "stats": { - "cx_active": { - "type": "GAUGE" + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" + { + "name": "cx_connect_fail" }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "UNHEALTHY" } diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt b/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt index 5a34ae30cac3..d9f7d1768e71 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt @@ -10,20 +10,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -41,20 +55,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -72,20 +100,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -103,20 +145,34 @@ "portValue": 443 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -134,20 +190,34 @@ "portValue": 9093 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "UNHEALTHY" } diff --git a/pilot/pkg/networking/plugin/authz/rbac.go b/pilot/pkg/networking/plugin/authz/rbac.go index d96603c7a0f3..88a2947a71f4 100644 --- a/pilot/pkg/networking/plugin/authz/rbac.go +++ b/pilot/pkg/networking/plugin/authz/rbac.go @@ -200,7 +200,7 @@ func generateMetadataListMatcher(keys []string, v string) *metadata.MetadataMatc MatchPattern: &metadata.ListMatcher_OneOf{ OneOf: &metadata.ValueMatcher{ MatchPattern: &metadata.ValueMatcher_StringMatch{ - StringMatch: createStringMatcher(v, false), + StringMatch: createStringMatcher(v, false /* forceRegexPattern */, false /* forTCPFilter */), }, }, }, @@ -245,14 +245,18 @@ func generateMetaKeys(k string) ([]string, error) { return keys, nil } -func createStringMatcher(v string, forceRegexPattern bool) *metadata.StringMatcher { +func createStringMatcher(v string, forceRegexPattern, forTCPFilter bool) *metadata.StringMatcher { + extraPrefix := "" + if forTCPFilter { + extraPrefix = spiffePrefix + } var stringMatcher *metadata.StringMatcher // Check if v is "*" first to make sure we won't generate an empty prefix/suffix StringMatcher, // the Envoy StringMatcher doesn't allow empty prefix/suffix. if v == "*" || forceRegexPattern { stringMatcher = &metadata.StringMatcher{ MatchPattern: &metadata.StringMatcher_Regex{ - Regex: strings.Replace(v, "*", ".*", -1), + Regex: extraPrefix + strings.Replace(v, "*", ".*", -1), }, } } else if strings.HasPrefix(v, "*") { @@ -264,13 +268,13 @@ func createStringMatcher(v string, forceRegexPattern bool) *metadata.StringMatch } else if strings.HasSuffix(v, "*") { stringMatcher = &metadata.StringMatcher{ MatchPattern: &metadata.StringMatcher_Prefix{ - Prefix: v[:len(v)-1], + Prefix: extraPrefix + v[:len(v)-1], }, } } else { stringMatcher = &metadata.StringMatcher{ MatchPattern: &metadata.StringMatcher_Exact{ - Exact: v, + Exact: extraPrefix + v, }, } } @@ -298,7 +302,7 @@ func createDynamicMetadataMatcher(k, v string) *metadata.MetadataMatcher { return generateMetadataListMatcher(keys, v) } - stringMatcher := createStringMatcher(v, forceRegexPattern) + stringMatcher := createStringMatcher(v, forceRegexPattern, false /* forTCPFilter */) return generateMetadataStringMatcher(keys, stringMatcher) } @@ -640,7 +644,7 @@ func convertToPrincipal(subject *rbacproto.Subject, forTCPFilter bool) *policypr ids.AndIds.Ids = append(ids.AndIds.Ids, &policyproto.Principal{ Identifier: &policyproto.Principal_Authenticated_{ Authenticated: &policyproto.Principal_Authenticated{ - Name: spiffePrefix + subject.User, + PrincipalName: createStringMatcher(subject.User, false /* forceRegexPattern */, true /* forTCPFilter */), }, }, }) diff --git a/pilot/pkg/networking/plugin/authz/rbac_test.go b/pilot/pkg/networking/plugin/authz/rbac_test.go index 250693fa7278..9c586eaeebe1 100644 --- a/pilot/pkg/networking/plugin/authz/rbac_test.go +++ b/pilot/pkg/networking/plugin/authz/rbac_test.go @@ -656,7 +656,11 @@ func TestConvertRbacRulesToFilterConfig(t *testing.T) { { Identifier: &policy.Principal_Authenticated_{ Authenticated: &policy.Principal_Authenticated{ - Name: "spiffe://admin", + PrincipalName: &metadata.StringMatcher{ + MatchPattern: &metadata.StringMatcher_Exact{ + Exact: "spiffe://admin", + }, + }, }, }, }, diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go index 52d40f82a325..6a0e3beeb77e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go @@ -36,7 +36,7 @@ func (m *Clusters) Reset() { *m = Clusters{} } func (m *Clusters) String() string { return proto.CompactTextString(m) } func (*Clusters) ProtoMessage() {} func (*Clusters) Descriptor() ([]byte, []int) { - return fileDescriptor_clusters_61cf569d81990140, []int{0} + return fileDescriptor_clusters_6632897f14a2e563, []int{0} } func (m *Clusters) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -101,7 +101,7 @@ func (m *ClusterStatus) Reset() { *m = ClusterStatus{} } func (m *ClusterStatus) String() string { return proto.CompactTextString(m) } func (*ClusterStatus) ProtoMessage() {} func (*ClusterStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_clusters_61cf569d81990140, []int{1} + return fileDescriptor_clusters_6632897f14a2e563, []int{1} } func (m *ClusterStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,8 +162,8 @@ func (m *ClusterStatus) GetHostStatuses() []*HostStatus { type HostStatus struct { // Address of this host. Address *core.Address `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` - // Mapping from the name of the statistic to the current value. - Stats map[string]*SimpleMetric `protobuf:"bytes,2,rep,name=stats" json:"stats,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + // List of stats specific to this host. + Stats []*SimpleMetric `protobuf:"bytes,2,rep,name=stats" json:"stats,omitempty"` // The host's current health status. HealthStatus *HostHealthStatus `protobuf:"bytes,3,opt,name=health_status,json=healthStatus" json:"health_status,omitempty"` // Request success rate for this host over the last calculated interval. @@ -181,7 +181,7 @@ func (m *HostStatus) Reset() { *m = HostStatus{} } func (m *HostStatus) String() string { return proto.CompactTextString(m) } func (*HostStatus) ProtoMessage() {} func (*HostStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_clusters_61cf569d81990140, []int{2} + return fileDescriptor_clusters_6632897f14a2e563, []int{2} } func (m *HostStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -217,7 +217,7 @@ func (m *HostStatus) GetAddress() *core.Address { return nil } -func (m *HostStatus) GetStats() map[string]*SimpleMetric { +func (m *HostStatus) GetStats() []*SimpleMetric { if m != nil { return m.Stats } @@ -257,7 +257,7 @@ func (m *HostHealthStatus) Reset() { *m = HostHealthStatus{} } func (m *HostHealthStatus) String() string { return proto.CompactTextString(m) } func (*HostHealthStatus) ProtoMessage() {} func (*HostHealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_clusters_61cf569d81990140, []int{3} + return fileDescriptor_clusters_6632897f14a2e563, []int{3} } func (m *HostHealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -311,7 +311,6 @@ func init() { proto.RegisterType((*Clusters)(nil), "envoy.admin.v2alpha.Clusters") proto.RegisterType((*ClusterStatus)(nil), "envoy.admin.v2alpha.ClusterStatus") proto.RegisterType((*HostStatus)(nil), "envoy.admin.v2alpha.HostStatus") - proto.RegisterMapType((map[string]*SimpleMetric)(nil), "envoy.admin.v2alpha.HostStatus.StatsEntry") proto.RegisterType((*HostHealthStatus)(nil), "envoy.admin.v2alpha.HostHealthStatus") } func (m *Clusters) Marshal() (dAtA []byte, err error) { @@ -432,52 +431,36 @@ func (m *HostStatus) MarshalTo(dAtA []byte) (int, error) { i += n2 } if len(m.Stats) > 0 { - for k, _ := range m.Stats { + for _, msg := range m.Stats { dAtA[i] = 0x12 i++ - v := m.Stats[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovClusters(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovClusters(uint64(len(k))) + msgSize - i = encodeVarintClusters(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintClusters(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintClusters(dAtA, i, uint64(v.Size())) - n3, err := v.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 + i = encodeVarintClusters(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } + i += n } } if m.HealthStatus != nil { dAtA[i] = 0x1a i++ i = encodeVarintClusters(dAtA, i, uint64(m.HealthStatus.Size())) - n4, err := m.HealthStatus.MarshalTo(dAtA[i:]) + n3, err := m.HealthStatus.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n4 + i += n3 } if m.SuccessRate != nil { dAtA[i] = 0x22 i++ i = encodeVarintClusters(dAtA, i, uint64(m.SuccessRate.Size())) - n5, err := m.SuccessRate.MarshalTo(dAtA[i:]) + n4, err := m.SuccessRate.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n5 + i += n4 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -589,16 +572,9 @@ func (m *HostStatus) Size() (n int) { n += 1 + l + sovClusters(uint64(l)) } if len(m.Stats) > 0 { - for k, v := range m.Stats { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovClusters(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovClusters(uint64(len(k))) + l - n += mapEntrySize + 1 + sovClusters(uint64(mapEntrySize)) + for _, e := range m.Stats { + l = e.Size() + n += 1 + l + sovClusters(uint64(l)) } } if m.HealthStatus != nil { @@ -980,102 +956,10 @@ func (m *HostStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Stats == nil { - m.Stats = make(map[string]*SimpleMetric) - } - var mapkey string - var mapvalue *SimpleMetric - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowClusters - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowClusters - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthClusters - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowClusters - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthClusters - } - postmsgIndex := iNdEx + mapmsglen - if mapmsglen < 0 { - return ErrInvalidLengthClusters - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &SimpleMetric{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipClusters(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthClusters - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } + m.Stats = append(m.Stats, &SimpleMetric{}) + if err := m.Stats[len(m.Stats)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.Stats[mapkey] = mapvalue iNdEx = postIndex case 3: if wireType != 2 { @@ -1381,44 +1265,41 @@ var ( ) func init() { - proto.RegisterFile("envoy/admin/v2alpha/clusters.proto", fileDescriptor_clusters_61cf569d81990140) + proto.RegisterFile("envoy/admin/v2alpha/clusters.proto", fileDescriptor_clusters_6632897f14a2e563) } -var fileDescriptor_clusters_61cf569d81990140 = []byte{ - // 549 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x8a, 0xd3, 0x40, - 0x14, 0x86, 0x49, 0xdb, 0xd5, 0x7a, 0xd2, 0xba, 0x75, 0x56, 0x30, 0x14, 0x69, 0xbb, 0x41, 0xa1, - 0x78, 0x91, 0x48, 0x14, 0x15, 0xbd, 0xb1, 0xae, 0x0b, 0x8b, 0xb2, 0x28, 0x59, 0x11, 0xd4, 0x8b, - 0x30, 0x4e, 0x8e, 0x64, 0xdc, 0x34, 0x09, 0x99, 0x69, 0xa0, 0x6f, 0xe8, 0x95, 0xf8, 0x08, 0x52, - 0xf0, 0xc2, 0xb7, 0x90, 0xcc, 0x4c, 0xb7, 0x59, 0xb7, 0xcb, 0x5e, 0x75, 0x32, 0xe7, 0xfb, 0xa7, - 0xff, 0x7f, 0xce, 0x0c, 0xb8, 0x98, 0x55, 0xf9, 0xd2, 0xa7, 0xf1, 0x9c, 0x67, 0x7e, 0x15, 0xd0, - 0xb4, 0x48, 0xa8, 0xcf, 0xd2, 0x85, 0x90, 0x58, 0x0a, 0xaf, 0x28, 0x73, 0x99, 0x93, 0x3d, 0xc5, - 0x78, 0x8a, 0xf1, 0x0c, 0x33, 0xdc, 0xdf, 0x26, 0x9c, 0xa3, 0x2c, 0x39, 0x33, 0xba, 0xe1, 0xd8, - 0x20, 0x05, 0xf7, 0xab, 0xc0, 0x67, 0x79, 0x89, 0x3e, 0x8d, 0xe3, 0x12, 0xc5, 0x1a, 0xb8, 0x77, - 0x11, 0x48, 0x90, 0xa6, 0x32, 0x89, 0x58, 0x82, 0xec, 0xd4, 0x50, 0x8e, 0xa6, 0xe4, 0xb2, 0x40, - 0xbf, 0xc0, 0x92, 0x61, 0x26, 0x75, 0xc5, 0xfd, 0x04, 0xdd, 0x03, 0x63, 0x95, 0x1c, 0xc3, 0xc0, - 0xd8, 0x8e, 0x84, 0xa4, 0x72, 0x21, 0x50, 0x38, 0xd6, 0xa4, 0x3d, 0xb5, 0x03, 0xd7, 0xdb, 0xe2, - 0xdf, 0x33, 0xc2, 0x13, 0xc5, 0x86, 0xbb, 0xac, 0xf9, 0x89, 0xc2, 0xfd, 0x6b, 0x41, 0xff, 0x1c, - 0x42, 0x08, 0x74, 0x32, 0x3a, 0x47, 0xc7, 0x9a, 0x58, 0xd3, 0x1b, 0xa1, 0x5a, 0x13, 0x17, 0xfa, - 0x34, 0x8e, 0x31, 0x8e, 0x2a, 0x4e, 0x23, 0x5a, 0x70, 0xa7, 0x35, 0xb1, 0xa6, 0xdd, 0xd0, 0x56, - 0x9b, 0x1f, 0x39, 0x9d, 0x15, 0x9c, 0x7c, 0x86, 0xb1, 0x58, 0x30, 0x86, 0x42, 0x44, 0x25, 0x95, - 0x18, 0xe1, 0x77, 0x64, 0x92, 0xe7, 0x59, 0x24, 0x93, 0x12, 0x45, 0x92, 0xa7, 0xb1, 0xd3, 0x9e, - 0x58, 0x53, 0x3b, 0xd8, 0x33, 0x3e, 0xeb, 0xa0, 0xde, 0x7b, 0x1d, 0x34, 0xbc, 0x6b, 0xb4, 0x21, - 0x95, 0x78, 0x68, 0x94, 0x1f, 0xd6, 0x42, 0xf2, 0x1a, 0xfa, 0x49, 0x2e, 0xe4, 0x26, 0x71, 0x47, - 0x25, 0x1e, 0x6f, 0x4d, 0x7c, 0x94, 0x0b, 0x69, 0xe2, 0xf6, 0x92, 0xb3, 0x35, 0x0a, 0xf7, 0x4f, - 0x0b, 0x60, 0x53, 0x24, 0x8f, 0xe1, 0xba, 0x19, 0x93, 0xca, 0x6a, 0x07, 0xc3, 0xf5, 0x71, 0x05, - 0xf7, 0xaa, 0xc0, 0xab, 0xe7, 0xe4, 0xcd, 0x34, 0x11, 0xae, 0x51, 0xf2, 0x12, 0x76, 0x6a, 0x17, - 0xc2, 0x69, 0x29, 0x0b, 0x0f, 0xae, 0xb0, 0xe0, 0xd5, 0x3f, 0xe2, 0x30, 0x93, 0xe5, 0x32, 0xd4, - 0x42, 0xf2, 0x06, 0xfa, 0x66, 0xfa, 0x3a, 0x8e, 0x69, 0xcb, 0xfd, 0x4b, 0x4f, 0x3a, 0x52, 0xf4, - 0x59, 0xa4, 0xc6, 0x17, 0x79, 0x02, 0xbd, 0x66, 0xd3, 0x9d, 0xce, 0xe5, 0x1d, 0xb6, 0x1b, 0x1d, - 0x1e, 0x7e, 0x01, 0xd8, 0x18, 0x23, 0x03, 0x68, 0x9f, 0xe2, 0xd2, 0x4c, 0xbc, 0x5e, 0x92, 0xa7, - 0xb0, 0x53, 0xd1, 0x74, 0x81, 0x6a, 0xd0, 0x76, 0xb0, 0xbf, 0xd5, 0xdb, 0x09, 0x9f, 0x17, 0x29, - 0x1e, 0xab, 0xb7, 0x10, 0x6a, 0xfe, 0x79, 0xeb, 0x99, 0xe5, 0xfe, 0xb4, 0x60, 0xf0, 0xbf, 0x6f, - 0xf2, 0x02, 0x86, 0xdf, 0x28, 0x4f, 0x31, 0x8e, 0x28, 0x93, 0xbc, 0xc2, 0xa8, 0xf9, 0x02, 0xd4, - 0x5f, 0x77, 0xc3, 0x3b, 0x9a, 0x98, 0x29, 0x40, 0xab, 0x0f, 0xea, 0x32, 0x79, 0x08, 0xb7, 0x8d, - 0x38, 0x5f, 0xc8, 0x94, 0x63, 0x69, 0x64, 0xfa, 0x1a, 0x12, 0x5d, 0x7b, 0xa7, 0x4b, 0x5a, 0xf1, - 0x16, 0x6e, 0x61, 0x2c, 0xa2, 0x8b, 0x8d, 0xbe, 0xb9, 0xb9, 0x35, 0x8d, 0x31, 0x9f, 0x6b, 0xf1, - 0x2e, 0xc6, 0xa2, 0xb9, 0xf1, 0xaa, 0xf7, 0x63, 0x35, 0xb2, 0x7e, 0xad, 0x46, 0xd6, 0xef, 0xd5, - 0xc8, 0xfa, 0x7a, 0x4d, 0x3d, 0xca, 0x47, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x70, 0x94, 0xfb, - 0x8a, 0x53, 0x04, 0x00, 0x00, +var fileDescriptor_clusters_6632897f14a2e563 = []byte{ + // 503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x51, 0x6f, 0xd3, 0x30, + 0x14, 0x85, 0xe5, 0x6d, 0x40, 0xb9, 0x69, 0xd9, 0xf0, 0x90, 0x88, 0x2a, 0xd4, 0x76, 0x11, 0x48, + 0x7d, 0x4a, 0x50, 0x40, 0xf0, 0xc0, 0x53, 0x19, 0x48, 0x13, 0x68, 0x02, 0x65, 0x08, 0x09, 0x5e, + 0x2c, 0x63, 0x5f, 0x14, 0x43, 0x9a, 0x44, 0xb1, 0x1b, 0x69, 0xff, 0x90, 0x27, 0xc4, 0x4f, 0x40, + 0x7d, 0xe3, 0x57, 0x80, 0x6a, 0xbb, 0x6b, 0xc6, 0xba, 0xb7, 0x24, 0xf7, 0x3b, 0xd6, 0x39, 0xe7, + 0x3a, 0x10, 0x61, 0xd9, 0x56, 0xe7, 0x09, 0x97, 0x73, 0x55, 0x26, 0x6d, 0xca, 0x8b, 0x3a, 0xe7, + 0x89, 0x28, 0x16, 0xda, 0x60, 0xa3, 0xe3, 0xba, 0xa9, 0x4c, 0x45, 0x0f, 0x2d, 0x13, 0x5b, 0x26, + 0xf6, 0xcc, 0xf0, 0x68, 0x9b, 0x70, 0x8e, 0xa6, 0x51, 0xc2, 0xeb, 0x86, 0x63, 0x8f, 0xd4, 0x2a, + 0x69, 0xd3, 0x44, 0x54, 0x0d, 0x26, 0x5c, 0xca, 0x06, 0xf5, 0x1a, 0x78, 0x78, 0x15, 0xc8, 0x91, + 0x17, 0x26, 0x67, 0x22, 0x47, 0xf1, 0xdd, 0x53, 0xa1, 0xa3, 0xcc, 0x79, 0x8d, 0x49, 0x8d, 0x8d, + 0xc0, 0xd2, 0xb8, 0x49, 0xf4, 0x09, 0x7a, 0xc7, 0xde, 0x2a, 0x3d, 0x85, 0x03, 0x6f, 0x9b, 0x69, + 0xc3, 0xcd, 0x42, 0xa3, 0x0e, 0xc9, 0x64, 0x77, 0x1a, 0xa4, 0x51, 0xbc, 0xc5, 0x7f, 0xec, 0x85, + 0x67, 0x96, 0xcd, 0xf6, 0x45, 0xf7, 0x15, 0x75, 0xf4, 0x87, 0xc0, 0xe0, 0x12, 0x42, 0x29, 0xec, + 0x95, 0x7c, 0x8e, 0x21, 0x99, 0x90, 0xe9, 0xed, 0xcc, 0x3e, 0xd3, 0x08, 0x06, 0x5c, 0x4a, 0x94, + 0xac, 0x55, 0x9c, 0xf1, 0x5a, 0x85, 0x3b, 0x13, 0x32, 0xed, 0x65, 0x81, 0xfd, 0xf8, 0x51, 0xf1, + 0x59, 0xad, 0xe8, 0x67, 0x18, 0xeb, 0x85, 0x10, 0xa8, 0x35, 0x6b, 0xb8, 0x41, 0x86, 0xdf, 0x50, + 0x18, 0x55, 0x95, 0xcc, 0xe4, 0x0d, 0xea, 0xbc, 0x2a, 0x64, 0xb8, 0x3b, 0x21, 0xd3, 0x20, 0x3d, + 0xf4, 0x3e, 0x57, 0x41, 0xe3, 0xf7, 0x2e, 0x68, 0xf6, 0xc0, 0x6b, 0x33, 0x6e, 0xf0, 0xb5, 0x57, + 0x7e, 0x58, 0x0b, 0xe9, 0x2b, 0x18, 0xe4, 0x95, 0x36, 0x9b, 0xc4, 0x7b, 0x36, 0xf1, 0x78, 0x6b, + 0xe2, 0x93, 0x4a, 0x1b, 0x1f, 0xb7, 0x9f, 0x5f, 0x3c, 0xa3, 0x8e, 0xfe, 0x12, 0x80, 0xcd, 0x90, + 0x3e, 0x85, 0x5b, 0x7e, 0x4d, 0x36, 0x6b, 0x90, 0x0e, 0xd7, 0xc7, 0xd5, 0x2a, 0x6e, 0xd3, 0x78, + 0xb5, 0xa7, 0x78, 0xe6, 0x88, 0x6c, 0x8d, 0xd2, 0xe7, 0x70, 0x63, 0xe5, 0x42, 0x87, 0x3b, 0xd6, + 0xc2, 0xd1, 0x56, 0x0b, 0x67, 0x6a, 0x5e, 0x17, 0x78, 0x6a, 0x6f, 0x49, 0xe6, 0x78, 0xfa, 0x06, + 0x06, 0x7e, 0xe9, 0x2e, 0x85, 0x6f, 0xe3, 0xd1, 0xb5, 0x19, 0x4e, 0x2c, 0x7d, 0x91, 0xa4, 0xf3, + 0x46, 0x9f, 0x41, 0xbf, 0xdb, 0x75, 0xb8, 0x77, 0x7d, 0xb1, 0x41, 0xa7, 0xd8, 0xe8, 0x27, 0x81, + 0x83, 0xff, 0x8f, 0xa6, 0x2f, 0x60, 0xf8, 0x95, 0xab, 0x02, 0x25, 0xe3, 0xc2, 0xa8, 0x16, 0x59, + 0xf7, 0x6e, 0xda, 0x6a, 0x7a, 0xd9, 0x7d, 0x47, 0xcc, 0x2c, 0xe0, 0xd4, 0xc7, 0xab, 0x31, 0x7d, + 0x0c, 0xf7, 0xbc, 0xb8, 0x5a, 0x98, 0x42, 0x61, 0xe3, 0x65, 0xee, 0x82, 0x50, 0x37, 0x7b, 0xe7, + 0x46, 0x4e, 0xf1, 0x16, 0xee, 0xa2, 0xd4, 0xec, 0x6a, 0x17, 0x77, 0x36, 0xfb, 0xec, 0x2c, 0xe0, + 0x52, 0x0b, 0xfb, 0x28, 0x75, 0xf7, 0xc3, 0xcb, 0xfe, 0x8f, 0xe5, 0x88, 0xfc, 0x5a, 0x8e, 0xc8, + 0xef, 0xe5, 0x88, 0x7c, 0xb9, 0x69, 0x7f, 0x97, 0x27, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3f, + 0x3e, 0xe5, 0xa4, 0xed, 0x03, 0x00, 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go index b39420dd2643..eb38b83cca37 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go @@ -44,9 +44,7 @@ func (m *Clusters) Validate() error { for idx, item := range m.GetClusterStatuses() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersValidationError{ Field: fmt.Sprintf("ClusterStatuses[%v]", idx), @@ -104,9 +102,7 @@ func (m *ClusterStatus) Validate() error { // no validation rules for AddedViaApi - if v, ok := interface{}(m.GetSuccessRateEjectionThreshold()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuccessRateEjectionThreshold()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterStatusValidationError{ Field: "SuccessRateEjectionThreshold", @@ -119,9 +115,7 @@ func (m *ClusterStatus) Validate() error { for idx, item := range m.GetHostStatuses() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterStatusValidationError{ Field: fmt.Sprintf("HostStatuses[%v]", idx), @@ -174,9 +168,7 @@ func (m *HostStatus) Validate() error { return nil } - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HostStatusValidationError{ Field: "Address", @@ -186,11 +178,22 @@ func (m *HostStatus) Validate() error { } } - // no validation rules for Stats + for idx, item := range m.GetStats() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HostStatusValidationError{ + Field: fmt.Sprintf("Stats[%v]", idx), + Reason: "embedded message failed validation", + Cause: err, + } + } + } + + } - if v, ok := interface{}(m.GetHealthStatus()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthStatus()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HostStatusValidationError{ Field: "HealthStatus", @@ -200,9 +203,7 @@ func (m *HostStatus) Validate() error { } } - if v, ok := interface{}(m.GetSuccessRate()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuccessRate()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HostStatusValidationError{ Field: "SuccessRate", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go index 7fc7302ce6c7..b8fc057aecbf 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go @@ -44,9 +44,7 @@ func (m *ConfigDump) Validate() error { for idx, item := range m.GetConfigs() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConfigDumpValidationError{ Field: fmt.Sprintf("Configs[%v]", idx), @@ -100,9 +98,7 @@ func (m *BootstrapConfigDump) Validate() error { return nil } - if v, ok := interface{}(m.GetBootstrap()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetBootstrap()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapConfigDumpValidationError{ Field: "Bootstrap", @@ -112,9 +108,7 @@ func (m *BootstrapConfigDump) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapConfigDumpValidationError{ Field: "LastUpdated", @@ -171,9 +165,7 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetStaticListeners() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDumpValidationError{ Field: fmt.Sprintf("StaticListeners[%v]", idx), @@ -188,9 +180,7 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicActiveListeners() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDumpValidationError{ Field: fmt.Sprintf("DynamicActiveListeners[%v]", idx), @@ -205,9 +195,7 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicWarmingListeners() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDumpValidationError{ Field: fmt.Sprintf("DynamicWarmingListeners[%v]", idx), @@ -222,9 +210,7 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicDrainingListeners() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDumpValidationError{ Field: fmt.Sprintf("DynamicDrainingListeners[%v]", idx), @@ -283,9 +269,7 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetStaticClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDumpValidationError{ Field: fmt.Sprintf("StaticClusters[%v]", idx), @@ -300,9 +284,7 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetDynamicActiveClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDumpValidationError{ Field: fmt.Sprintf("DynamicActiveClusters[%v]", idx), @@ -317,9 +299,7 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetDynamicWarmingClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDumpValidationError{ Field: fmt.Sprintf("DynamicWarmingClusters[%v]", idx), @@ -376,9 +356,7 @@ func (m *RoutesConfigDump) Validate() error { for idx, item := range m.GetStaticRouteConfigs() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDumpValidationError{ Field: fmt.Sprintf("StaticRouteConfigs[%v]", idx), @@ -393,9 +371,7 @@ func (m *RoutesConfigDump) Validate() error { for idx, item := range m.GetDynamicRouteConfigs() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDumpValidationError{ Field: fmt.Sprintf("DynamicRouteConfigs[%v]", idx), @@ -449,9 +425,7 @@ func (m *ListenersConfigDump_StaticListener) Validate() error { return nil } - if v, ok := interface{}(m.GetListener()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetListener()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDump_StaticListenerValidationError{ Field: "Listener", @@ -461,9 +435,7 @@ func (m *ListenersConfigDump_StaticListener) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDump_StaticListenerValidationError{ Field: "LastUpdated", @@ -518,9 +490,7 @@ func (m *ListenersConfigDump_DynamicListener) Validate() error { // no validation rules for VersionInfo - if v, ok := interface{}(m.GetListener()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetListener()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDump_DynamicListenerValidationError{ Field: "Listener", @@ -530,9 +500,7 @@ func (m *ListenersConfigDump_DynamicListener) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenersConfigDump_DynamicListenerValidationError{ Field: "LastUpdated", @@ -585,9 +553,7 @@ func (m *ClustersConfigDump_StaticCluster) Validate() error { return nil } - if v, ok := interface{}(m.GetCluster()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCluster()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDump_StaticClusterValidationError{ Field: "Cluster", @@ -597,9 +563,7 @@ func (m *ClustersConfigDump_StaticCluster) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDump_StaticClusterValidationError{ Field: "LastUpdated", @@ -654,9 +618,7 @@ func (m *ClustersConfigDump_DynamicCluster) Validate() error { // no validation rules for VersionInfo - if v, ok := interface{}(m.GetCluster()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCluster()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDump_DynamicClusterValidationError{ Field: "Cluster", @@ -666,9 +628,7 @@ func (m *ClustersConfigDump_DynamicCluster) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClustersConfigDump_DynamicClusterValidationError{ Field: "LastUpdated", @@ -721,9 +681,7 @@ func (m *RoutesConfigDump_StaticRouteConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetRouteConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDump_StaticRouteConfigValidationError{ Field: "RouteConfig", @@ -733,9 +691,7 @@ func (m *RoutesConfigDump_StaticRouteConfig) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDump_StaticRouteConfigValidationError{ Field: "LastUpdated", @@ -790,9 +746,7 @@ func (m *RoutesConfigDump_DynamicRouteConfig) Validate() error { // no validation rules for VersionInfo - if v, ok := interface{}(m.GetRouteConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDump_DynamicRouteConfigValidationError{ Field: "RouteConfig", @@ -802,9 +756,7 @@ func (m *RoutesConfigDump_DynamicRouteConfig) Validate() error { } } - if v, ok := interface{}(m.GetLastUpdated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RoutesConfigDump_DynamicRouteConfigValidationError{ Field: "LastUpdated", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go index 455e6f538fc6..64878e200dbf 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go @@ -40,15 +40,17 @@ func (x SimpleMetric_Type) String() string { return proto.EnumName(SimpleMetric_Type_name, int32(x)) } func (SimpleMetric_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_metrics_2b931fcb483d27b4, []int{0, 0} + return fileDescriptor_metrics_b4514e82c04dd3c8, []int{0, 0} } // Proto representation of an Envoy Counter or Gauge value. type SimpleMetric struct { - // Type of metric represented. + // Type of the metric represented. Type SimpleMetric_Type `protobuf:"varint,1,opt,name=type,proto3,enum=envoy.admin.v2alpha.SimpleMetric_Type" json:"type,omitempty"` // Current metric value. - Value uint64 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` + Value uint64 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` + // Name of the metric. + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -58,7 +60,7 @@ func (m *SimpleMetric) Reset() { *m = SimpleMetric{} } func (m *SimpleMetric) String() string { return proto.CompactTextString(m) } func (*SimpleMetric) ProtoMessage() {} func (*SimpleMetric) Descriptor() ([]byte, []int) { - return fileDescriptor_metrics_2b931fcb483d27b4, []int{0} + return fileDescriptor_metrics_b4514e82c04dd3c8, []int{0} } func (m *SimpleMetric) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -101,6 +103,13 @@ func (m *SimpleMetric) GetValue() uint64 { return 0 } +func (m *SimpleMetric) GetName() string { + if m != nil { + return m.Name + } + return "" +} + func init() { proto.RegisterType((*SimpleMetric)(nil), "envoy.admin.v2alpha.SimpleMetric") proto.RegisterEnum("envoy.admin.v2alpha.SimpleMetric_Type", SimpleMetric_Type_name, SimpleMetric_Type_value) @@ -130,6 +139,12 @@ func (m *SimpleMetric) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintMetrics(dAtA, i, uint64(m.Value)) } + if len(m.Name) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintMetrics(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -154,6 +169,10 @@ func (m *SimpleMetric) Size() (n int) { if m.Value != 0 { n += 1 + sovMetrics(uint64(m.Value)) } + l = len(m.Name) + if l > 0 { + n += 1 + l + sovMetrics(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -240,6 +259,35 @@ func (m *SimpleMetric) Unmarshal(dAtA []byte) error { break } } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMetrics + } + 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 ErrInvalidLengthMetrics + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipMetrics(dAtA[iNdEx:]) @@ -368,21 +416,22 @@ var ( ) func init() { - proto.RegisterFile("envoy/admin/v2alpha/metrics.proto", fileDescriptor_metrics_2b931fcb483d27b4) + proto.RegisterFile("envoy/admin/v2alpha/metrics.proto", fileDescriptor_metrics_b4514e82c04dd3c8) } -var fileDescriptor_metrics_2b931fcb483d27b4 = []byte{ - // 181 bytes of a gzipped FileDescriptorProto +var fileDescriptor_metrics_b4514e82c04dd3c8 = []byte{ + // 198 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xcd, 0x2b, 0xcb, 0xaf, 0xd4, 0x4f, 0x4c, 0xc9, 0xcd, 0xcc, 0xd3, 0x2f, 0x33, 0x4a, 0xcc, 0x29, 0xc8, 0x48, 0xd4, 0xcf, 0x4d, 0x2d, 0x29, 0xca, 0x4c, 0x2e, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x06, - 0x2b, 0xd1, 0x03, 0x2b, 0xd1, 0x83, 0x2a, 0x51, 0x6a, 0x60, 0xe4, 0xe2, 0x09, 0xce, 0xcc, 0x2d, - 0xc8, 0x49, 0xf5, 0x05, 0x2b, 0x16, 0xb2, 0xe2, 0x62, 0x29, 0xa9, 0x2c, 0x48, 0x95, 0x60, 0x54, - 0x60, 0xd4, 0xe0, 0x33, 0x52, 0xd3, 0xc3, 0xa2, 0x49, 0x0f, 0x59, 0x83, 0x5e, 0x48, 0x65, 0x41, - 0x6a, 0x10, 0x58, 0x8f, 0x90, 0x08, 0x17, 0x6b, 0x59, 0x62, 0x4e, 0x69, 0xaa, 0x04, 0x93, 0x02, - 0xa3, 0x06, 0x4b, 0x10, 0x84, 0xa3, 0x24, 0xc7, 0xc5, 0x02, 0x52, 0x23, 0xc4, 0xcd, 0xc5, 0xee, - 0xec, 0x1f, 0xea, 0x17, 0xe2, 0x1a, 0x24, 0xc0, 0x20, 0xc4, 0xc9, 0xc5, 0xea, 0xee, 0x18, 0xea, - 0xee, 0x2a, 0xc0, 0xe8, 0xc4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, - 0xc9, 0x31, 0x26, 0xb1, 0x81, 0x1d, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x15, 0x4c, 0x7f, - 0x90, 0xd1, 0x00, 0x00, 0x00, + 0x2b, 0xd1, 0x03, 0x2b, 0xd1, 0x83, 0x2a, 0x51, 0x9a, 0xc2, 0xc8, 0xc5, 0x13, 0x9c, 0x99, 0x5b, + 0x90, 0x93, 0xea, 0x0b, 0x56, 0x2c, 0x64, 0xc5, 0xc5, 0x52, 0x52, 0x59, 0x90, 0x2a, 0xc1, 0xa8, + 0xc0, 0xa8, 0xc1, 0x67, 0xa4, 0xa6, 0x87, 0x45, 0x93, 0x1e, 0xb2, 0x06, 0xbd, 0x90, 0xca, 0x82, + 0xd4, 0x20, 0xb0, 0x1e, 0x21, 0x11, 0x2e, 0xd6, 0xb2, 0xc4, 0x9c, 0xd2, 0x54, 0x09, 0x26, 0x05, + 0x46, 0x0d, 0x96, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0x25, 0x2f, 0x31, 0x37, 0x55, 0x82, 0x59, + 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x56, 0x92, 0xe3, 0x62, 0x01, 0xe9, 0x13, 0xe2, 0xe6, 0x62, + 0x77, 0xf6, 0x0f, 0xf5, 0x0b, 0x71, 0x0d, 0x12, 0x60, 0x10, 0xe2, 0xe4, 0x62, 0x75, 0x77, 0x0c, + 0x75, 0x77, 0x15, 0x60, 0x74, 0xe2, 0x39, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, + 0x8f, 0xe4, 0x18, 0x93, 0xd8, 0xc0, 0x1e, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x33, + 0xbe, 0x98, 0xe5, 0x00, 0x00, 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.validate.go index 0072bdb47a55..9f88ec157899 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.validate.go @@ -46,6 +46,8 @@ func (m *SimpleMetric) Validate() error { // no validation rules for Value + // no validation rules for Name + return nil } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go index 2ff8680753c1..46d97775e905 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go @@ -98,9 +98,7 @@ func (m *TlsCertificate) Validate() error { return nil } - if v, ok := interface{}(m.GetCertificateChain()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCertificateChain()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsCertificateValidationError{ Field: "CertificateChain", @@ -110,9 +108,7 @@ func (m *TlsCertificate) Validate() error { } } - if v, ok := interface{}(m.GetPrivateKey()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPrivateKey()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsCertificateValidationError{ Field: "PrivateKey", @@ -122,9 +118,7 @@ func (m *TlsCertificate) Validate() error { } } - if v, ok := interface{}(m.GetPassword()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPassword()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsCertificateValidationError{ Field: "Password", @@ -134,9 +128,7 @@ func (m *TlsCertificate) Validate() error { } } - if v, ok := interface{}(m.GetOcspStaple()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOcspStaple()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsCertificateValidationError{ Field: "OcspStaple", @@ -149,9 +141,7 @@ func (m *TlsCertificate) Validate() error { for idx, item := range m.GetSignedCertificateTimestamp() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsCertificateValidationError{ Field: fmt.Sprintf("SignedCertificateTimestamp[%v]", idx), @@ -215,9 +205,7 @@ func (m *TlsSessionTicketKeys) Validate() error { for idx, item := range m.GetKeys() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TlsSessionTicketKeysValidationError{ Field: fmt.Sprintf("Keys[%v]", idx), @@ -271,9 +259,7 @@ func (m *CertificateValidationContext) Validate() error { return nil } - if v, ok := interface{}(m.GetTrustedCa()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTrustedCa()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CertificateValidationContextValidationError{ Field: "TrustedCa", @@ -307,9 +293,7 @@ func (m *CertificateValidationContext) Validate() error { } - if v, ok := interface{}(m.GetRequireOcspStaple()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequireOcspStaple()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CertificateValidationContextValidationError{ Field: "RequireOcspStaple", @@ -319,9 +303,7 @@ func (m *CertificateValidationContext) Validate() error { } } - if v, ok := interface{}(m.GetRequireSignedCertificateTimestamp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequireSignedCertificateTimestamp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CertificateValidationContextValidationError{ Field: "RequireSignedCertificateTimestamp", @@ -331,9 +313,7 @@ func (m *CertificateValidationContext) Validate() error { } } - if v, ok := interface{}(m.GetCrl()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCrl()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CertificateValidationContextValidationError{ Field: "Crl", @@ -388,9 +368,7 @@ func (m *CommonTlsContext) Validate() error { return nil } - if v, ok := interface{}(m.GetTlsParams()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsParams()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: "TlsParams", @@ -410,9 +388,7 @@ func (m *CommonTlsContext) Validate() error { for idx, item := range m.GetTlsCertificates() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: fmt.Sprintf("TlsCertificates[%v]", idx), @@ -427,9 +403,7 @@ func (m *CommonTlsContext) Validate() error { for idx, item := range m.GetTlsCertificateSdsSecretConfigs() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: fmt.Sprintf("TlsCertificateSdsSecretConfigs[%v]", idx), @@ -441,9 +415,7 @@ func (m *CommonTlsContext) Validate() error { } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: "DeprecatedV1", @@ -457,9 +429,7 @@ func (m *CommonTlsContext) Validate() error { case *CommonTlsContext_ValidationContext: - if v, ok := interface{}(m.GetValidationContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValidationContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: "ValidationContext", @@ -471,9 +441,7 @@ func (m *CommonTlsContext) Validate() error { case *CommonTlsContext_ValidationContextSdsSecretConfig: - if v, ok := interface{}(m.GetValidationContextSdsSecretConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValidationContextSdsSecretConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonTlsContextValidationError{ Field: "ValidationContextSdsSecretConfig", @@ -527,9 +495,7 @@ func (m *UpstreamTlsContext) Validate() error { return nil } - if v, ok := interface{}(m.GetCommonTlsContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonTlsContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamTlsContextValidationError{ Field: "CommonTlsContext", @@ -590,9 +556,7 @@ func (m *DownstreamTlsContext) Validate() error { return nil } - if v, ok := interface{}(m.GetCommonTlsContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonTlsContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DownstreamTlsContextValidationError{ Field: "CommonTlsContext", @@ -602,9 +566,7 @@ func (m *DownstreamTlsContext) Validate() error { } } - if v, ok := interface{}(m.GetRequireClientCertificate()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequireClientCertificate()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DownstreamTlsContextValidationError{ Field: "RequireClientCertificate", @@ -614,9 +576,7 @@ func (m *DownstreamTlsContext) Validate() error { } } - if v, ok := interface{}(m.GetRequireSni()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequireSni()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DownstreamTlsContextValidationError{ Field: "RequireSni", @@ -630,9 +590,7 @@ func (m *DownstreamTlsContext) Validate() error { case *DownstreamTlsContext_SessionTicketKeys: - if v, ok := interface{}(m.GetSessionTicketKeys()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSessionTicketKeys()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DownstreamTlsContextValidationError{ Field: "SessionTicketKeys", @@ -644,9 +602,7 @@ func (m *DownstreamTlsContext) Validate() error { case *DownstreamTlsContext_SessionTicketKeysSdsSecretConfig: - if v, ok := interface{}(m.GetSessionTicketKeysSdsSecretConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSessionTicketKeysSdsSecretConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DownstreamTlsContextValidationError{ Field: "SessionTicketKeysSdsSecretConfig", @@ -702,9 +658,7 @@ func (m *SdsSecretConfig) Validate() error { // no validation rules for Name - if v, ok := interface{}(m.GetSdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SdsSecretConfigValidationError{ Field: "SdsConfig", @@ -761,9 +715,7 @@ func (m *Secret) Validate() error { case *Secret_TlsCertificate: - if v, ok := interface{}(m.GetTlsCertificate()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsCertificate()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SecretValidationError{ Field: "TlsCertificate", @@ -775,9 +727,7 @@ func (m *Secret) Validate() error { case *Secret_SessionTicketKeys: - if v, ok := interface{}(m.GetSessionTicketKeys()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSessionTicketKeys()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SecretValidationError{ Field: "SessionTicketKeys", @@ -789,9 +739,7 @@ func (m *Secret) Validate() error { case *Secret_ValidationContext: - if v, ok := interface{}(m.GetValidationContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValidationContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SecretValidationError{ Field: "ValidationContext", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go index 85644313dcd4..46688895ed62 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go @@ -57,9 +57,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetEdsClusterConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEdsClusterConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "EdsClusterConfig", @@ -83,9 +81,7 @@ func (m *Cluster) Validate() error { } - if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "PerConnectionBufferLimitBytes", @@ -105,9 +101,7 @@ func (m *Cluster) Validate() error { for idx, item := range m.GetHosts() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: fmt.Sprintf("Hosts[%v]", idx), @@ -119,9 +113,7 @@ func (m *Cluster) Validate() error { } - if v, ok := interface{}(m.GetLoadAssignment()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLoadAssignment()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "LoadAssignment", @@ -134,9 +126,7 @@ func (m *Cluster) Validate() error { for idx, item := range m.GetHealthChecks() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: fmt.Sprintf("HealthChecks[%v]", idx), @@ -148,9 +138,7 @@ func (m *Cluster) Validate() error { } - if v, ok := interface{}(m.GetMaxRequestsPerConnection()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxRequestsPerConnection()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "MaxRequestsPerConnection", @@ -160,9 +148,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetCircuitBreakers()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCircuitBreakers()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "CircuitBreakers", @@ -172,9 +158,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetTlsContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "TlsContext", @@ -184,9 +168,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetCommonHttpProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonHttpProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "CommonHttpProtocolOptions", @@ -196,9 +178,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "HttpProtocolOptions", @@ -208,9 +188,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "Http2ProtocolOptions", @@ -246,9 +224,7 @@ func (m *Cluster) Validate() error { for idx, item := range m.GetDnsResolvers() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: fmt.Sprintf("DnsResolvers[%v]", idx), @@ -260,9 +236,7 @@ func (m *Cluster) Validate() error { } - if v, ok := interface{}(m.GetOutlierDetection()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOutlierDetection()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "OutlierDetection", @@ -286,9 +260,7 @@ func (m *Cluster) Validate() error { } - if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "UpstreamBindConfig", @@ -298,9 +270,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetLbSubsetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLbSubsetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "LbSubsetConfig", @@ -310,9 +280,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetCommonLbConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonLbConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "CommonLbConfig", @@ -322,9 +290,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetTransportSocket()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTransportSocket()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "TransportSocket", @@ -334,9 +300,7 @@ func (m *Cluster) Validate() error { } } - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "Metadata", @@ -348,9 +312,7 @@ func (m *Cluster) Validate() error { // no validation rules for ProtocolSelection - if v, ok := interface{}(m.GetUpstreamConnectionOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamConnectionOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "UpstreamConnectionOptions", @@ -368,9 +330,7 @@ func (m *Cluster) Validate() error { case *Cluster_RingHashLbConfig_: - if v, ok := interface{}(m.GetRingHashLbConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRingHashLbConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "RingHashLbConfig", @@ -382,9 +342,7 @@ func (m *Cluster) Validate() error { case *Cluster_OriginalDstLbConfig_: - if v, ok := interface{}(m.GetOriginalDstLbConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOriginalDstLbConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ Field: "OriginalDstLbConfig", @@ -438,9 +396,7 @@ func (m *UpstreamBindConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetSourceAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSourceAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamBindConfigValidationError{ Field: "SourceAddress", @@ -492,9 +448,7 @@ func (m *UpstreamConnectionOptions) Validate() error { return nil } - if v, ok := interface{}(m.GetTcpKeepalive()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTcpKeepalive()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamConnectionOptionsValidationError{ Field: "TcpKeepalive", @@ -546,9 +500,7 @@ func (m *Cluster_EdsClusterConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetEdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_EdsClusterConfigValidationError{ Field: "EdsConfig", @@ -609,9 +561,7 @@ func (m *Cluster_LbSubsetConfig) Validate() error { } } - if v, ok := interface{}(m.GetDefaultSubset()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDefaultSubset()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_LbSubsetConfigValidationError{ Field: "DefaultSubset", @@ -624,9 +574,7 @@ func (m *Cluster_LbSubsetConfig) Validate() error { for idx, item := range m.GetSubsetSelectors() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_LbSubsetConfigValidationError{ Field: fmt.Sprintf("SubsetSelectors[%v]", idx), @@ -693,9 +641,7 @@ func (m *Cluster_RingHashLbConfig) Validate() error { } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_RingHashLbConfigValidationError{ Field: "DeprecatedV1", @@ -792,9 +738,7 @@ func (m *Cluster_CommonLbConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetHealthyPanicThreshold()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthyPanicThreshold()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfigValidationError{ Field: "HealthyPanicThreshold", @@ -804,9 +748,7 @@ func (m *Cluster_CommonLbConfig) Validate() error { } } - if v, ok := interface{}(m.GetUpdateMergeWindow()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpdateMergeWindow()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfigValidationError{ Field: "UpdateMergeWindow", @@ -820,9 +762,7 @@ func (m *Cluster_CommonLbConfig) Validate() error { case *Cluster_CommonLbConfig_ZoneAwareLbConfig_: - if v, ok := interface{}(m.GetZoneAwareLbConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetZoneAwareLbConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfigValidationError{ Field: "ZoneAwareLbConfig", @@ -834,9 +774,7 @@ func (m *Cluster_CommonLbConfig) Validate() error { case *Cluster_CommonLbConfig_LocalityWeightedLbConfig_: - if v, ok := interface{}(m.GetLocalityWeightedLbConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocalityWeightedLbConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfigValidationError{ Field: "LocalityWeightedLbConfig", @@ -933,9 +871,7 @@ func (m *Cluster_RingHashLbConfig_DeprecatedV1) Validate() error { return nil } - if v, ok := interface{}(m.GetUseStdHash()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseStdHash()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_RingHashLbConfig_DeprecatedV1ValidationError{ Field: "UseStdHash", @@ -988,9 +924,7 @@ func (m *Cluster_CommonLbConfig_ZoneAwareLbConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetRoutingEnabled()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRoutingEnabled()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ Field: "RoutingEnabled", @@ -1000,9 +934,7 @@ func (m *Cluster_CommonLbConfig_ZoneAwareLbConfig) Validate() error { } } - if v, ok := interface{}(m.GetMinClusterSize()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMinClusterSize()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ Field: "MinClusterSize", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go index 446ae0b43133..20b3ac1394e8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go @@ -45,9 +45,7 @@ func (m *CircuitBreakers) Validate() error { for idx, item := range m.GetThresholds() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CircuitBreakersValidationError{ Field: fmt.Sprintf("Thresholds[%v]", idx), @@ -103,9 +101,7 @@ func (m *CircuitBreakers_Thresholds) Validate() error { // no validation rules for Priority - if v, ok := interface{}(m.GetMaxConnections()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxConnections()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CircuitBreakers_ThresholdsValidationError{ Field: "MaxConnections", @@ -115,9 +111,7 @@ func (m *CircuitBreakers_Thresholds) Validate() error { } } - if v, ok := interface{}(m.GetMaxPendingRequests()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxPendingRequests()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CircuitBreakers_ThresholdsValidationError{ Field: "MaxPendingRequests", @@ -127,9 +121,7 @@ func (m *CircuitBreakers_Thresholds) Validate() error { } } - if v, ok := interface{}(m.GetMaxRequests()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxRequests()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CircuitBreakers_ThresholdsValidationError{ Field: "MaxRequests", @@ -139,9 +131,7 @@ func (m *CircuitBreakers_Thresholds) Validate() error { } } - if v, ok := interface{}(m.GetMaxRetries()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxRetries()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CircuitBreakers_ThresholdsValidationError{ Field: "MaxRetries", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go index 30110dd86244..5e9c820eb2ba 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go @@ -42,9 +42,7 @@ func (m *OutlierDetection) Validate() error { return nil } - if v, ok := interface{}(m.GetConsecutive_5Xx()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConsecutive_5Xx()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutlierDetectionValidationError{ Field: "Consecutive_5Xx", @@ -129,9 +127,7 @@ func (m *OutlierDetection) Validate() error { } - if v, ok := interface{}(m.GetSuccessRateMinimumHosts()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuccessRateMinimumHosts()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutlierDetectionValidationError{ Field: "SuccessRateMinimumHosts", @@ -141,9 +137,7 @@ func (m *OutlierDetection) Validate() error { } } - if v, ok := interface{}(m.GetSuccessRateRequestVolume()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuccessRateRequestVolume()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutlierDetectionValidationError{ Field: "SuccessRateRequestVolume", @@ -153,9 +147,7 @@ func (m *OutlierDetection) Validate() error { } } - if v, ok := interface{}(m.GetSuccessRateStdevFactor()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuccessRateStdevFactor()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutlierDetectionValidationError{ Field: "SuccessRateStdevFactor", @@ -165,9 +157,7 @@ func (m *OutlierDetection) Validate() error { } } - if v, ok := interface{}(m.GetConsecutiveGatewayFailure()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConsecutiveGatewayFailure()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutlierDetectionValidationError{ Field: "ConsecutiveGatewayFailure", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go index fc6e8905be0c..975d15bbf302 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go @@ -172,9 +172,7 @@ func (m *TcpKeepalive) Validate() error { return nil } - if v, ok := interface{}(m.GetKeepaliveProbes()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetKeepaliveProbes()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpKeepaliveValidationError{ Field: "KeepaliveProbes", @@ -184,9 +182,7 @@ func (m *TcpKeepalive) Validate() error { } } - if v, ok := interface{}(m.GetKeepaliveTime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetKeepaliveTime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpKeepaliveValidationError{ Field: "KeepaliveTime", @@ -196,9 +192,7 @@ func (m *TcpKeepalive) Validate() error { } } - if v, ok := interface{}(m.GetKeepaliveInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetKeepaliveInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpKeepaliveValidationError{ Field: "KeepaliveInterval", @@ -249,9 +243,7 @@ func (m *BindConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetSourceAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSourceAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BindConfigValidationError{ Field: "SourceAddress", @@ -261,9 +253,7 @@ func (m *BindConfig) Validate() error { } } - if v, ok := interface{}(m.GetFreebind()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFreebind()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BindConfigValidationError{ Field: "Freebind", @@ -276,9 +266,7 @@ func (m *BindConfig) Validate() error { for idx, item := range m.GetSocketOptions() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BindConfigValidationError{ Field: fmt.Sprintf("SocketOptions[%v]", idx), @@ -335,9 +323,7 @@ func (m *Address) Validate() error { case *Address_SocketAddress: - if v, ok := interface{}(m.GetSocketAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSocketAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AddressValidationError{ Field: "SocketAddress", @@ -349,9 +335,7 @@ func (m *Address) Validate() error { case *Address_Pipe: - if v, ok := interface{}(m.GetPipe()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPipe()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AddressValidationError{ Field: "Pipe", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go index a4a0d45ca368..c3fadcc6ba45 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go @@ -52,7 +52,7 @@ func (x RoutingPriority) String() string { return proto.EnumName(RoutingPriority_name, int32(x)) } func (RoutingPriority) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{0} + return fileDescriptor_base_0126f5109e43fb63, []int{0} } // HTTP request method. @@ -97,7 +97,7 @@ func (x RequestMethod) String() string { return proto.EnumName(RequestMethod_name, int32(x)) } func (RequestMethod) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{1} + return fileDescriptor_base_0126f5109e43fb63, []int{1} } type SocketOption_SocketState int32 @@ -126,7 +126,7 @@ func (x SocketOption_SocketState) String() string { return proto.EnumName(SocketOption_SocketState_name, int32(x)) } func (SocketOption_SocketState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{8, 0} + return fileDescriptor_base_0126f5109e43fb63, []int{8, 0} } // Identifies location of where either Envoy runs or where upstream hosts run. @@ -155,7 +155,7 @@ func (m *Locality) Reset() { *m = Locality{} } func (m *Locality) String() string { return proto.CompactTextString(m) } func (*Locality) ProtoMessage() {} func (*Locality) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{0} + return fileDescriptor_base_0126f5109e43fb63, []int{0} } func (m *Locality) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -245,7 +245,7 @@ func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{1} + return fileDescriptor_base_0126f5109e43fb63, []int{1} } func (m *Node) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -340,7 +340,7 @@ func (m *Metadata) Reset() { *m = Metadata{} } func (m *Metadata) String() string { return proto.CompactTextString(m) } func (*Metadata) ProtoMessage() {} func (*Metadata) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{2} + return fileDescriptor_base_0126f5109e43fb63, []int{2} } func (m *Metadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -391,7 +391,7 @@ func (m *RuntimeUInt32) Reset() { *m = RuntimeUInt32{} } func (m *RuntimeUInt32) String() string { return proto.CompactTextString(m) } func (*RuntimeUInt32) ProtoMessage() {} func (*RuntimeUInt32) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{3} + return fileDescriptor_base_0126f5109e43fb63, []int{3} } func (m *RuntimeUInt32) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -453,7 +453,7 @@ func (m *HeaderValue) Reset() { *m = HeaderValue{} } func (m *HeaderValue) String() string { return proto.CompactTextString(m) } func (*HeaderValue) ProtoMessage() {} func (*HeaderValue) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{4} + return fileDescriptor_base_0126f5109e43fb63, []int{4} } func (m *HeaderValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -512,7 +512,7 @@ func (m *HeaderValueOption) Reset() { *m = HeaderValueOption{} } func (m *HeaderValueOption) String() string { return proto.CompactTextString(m) } func (*HeaderValueOption) ProtoMessage() {} func (*HeaderValueOption) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{5} + return fileDescriptor_base_0126f5109e43fb63, []int{5} } func (m *HeaderValueOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -571,7 +571,7 @@ func (m *DataSource) Reset() { *m = DataSource{} } func (m *DataSource) String() string { return proto.CompactTextString(m) } func (*DataSource) ProtoMessage() {} func (*DataSource) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{6} + return fileDescriptor_base_0126f5109e43fb63, []int{6} } func (m *DataSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -750,7 +750,7 @@ func (m *TransportSocket) Reset() { *m = TransportSocket{} } func (m *TransportSocket) String() string { return proto.CompactTextString(m) } func (*TransportSocket) ProtoMessage() {} func (*TransportSocket) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{7} + return fileDescriptor_base_0126f5109e43fb63, []int{7} } func (m *TransportSocket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -819,7 +819,7 @@ func (m *SocketOption) Reset() { *m = SocketOption{} } func (m *SocketOption) String() string { return proto.CompactTextString(m) } func (*SocketOption) ProtoMessage() {} func (*SocketOption) Descriptor() ([]byte, []int) { - return fileDescriptor_base_56e1a3946b1570d0, []int{8} + return fileDescriptor_base_0126f5109e43fb63, []int{8} } func (m *SocketOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3448,69 +3448,69 @@ var ( ErrIntOverflowBase = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("envoy/api/v2/core/base.proto", fileDescriptor_base_56e1a3946b1570d0) } - -var fileDescriptor_base_56e1a3946b1570d0 = []byte{ - // 970 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcf, 0x6e, 0xeb, 0xc4, - 0x17, 0xee, 0xe4, 0x5f, 0x93, 0x93, 0xa4, 0x75, 0xe7, 0x56, 0xbd, 0xfd, 0xf5, 0xde, 0x46, 0x95, - 0x7f, 0x0b, 0xaa, 0x22, 0x6c, 0x94, 0x4a, 0x80, 0x58, 0xd1, 0x34, 0x6e, 0x13, 0xd1, 0x26, 0xc1, - 0x76, 0x2f, 0xa8, 0x9b, 0xe0, 0xc4, 0x93, 0xdc, 0xd1, 0x75, 0x3d, 0x61, 0x3c, 0x0e, 0xca, 0xdd, - 0x20, 0x21, 0x16, 0x88, 0xd7, 0x60, 0x83, 0xc4, 0x0b, 0x20, 0x56, 0x95, 0xd8, 0xb0, 0x83, 0x47, - 0x40, 0xdd, 0xdd, 0xb7, 0x40, 0x33, 0x9e, 0x94, 0x40, 0x2b, 0xd8, 0x9d, 0xf3, 0x7d, 0xdf, 0x39, - 0x73, 0xfe, 0xd9, 0xf0, 0x9c, 0xc4, 0x73, 0xb6, 0xb0, 0x83, 0x19, 0xb5, 0xe7, 0x4d, 0x7b, 0xcc, - 0x38, 0xb1, 0x47, 0x41, 0x42, 0xac, 0x19, 0x67, 0x82, 0xe1, 0x2d, 0xc5, 0x5a, 0xc1, 0x8c, 0x5a, - 0xf3, 0xa6, 0x25, 0xd9, 0xbd, 0xe7, 0x53, 0xc6, 0xa6, 0x11, 0xb1, 0x95, 0x60, 0x94, 0x4e, 0xec, - 0x44, 0xf0, 0x74, 0x2c, 0xb2, 0x80, 0xbd, 0xc6, 0x3f, 0xd9, 0x2f, 0x79, 0x30, 0x9b, 0x11, 0x9e, - 0x68, 0xfe, 0xe9, 0x3c, 0x88, 0x68, 0x18, 0x08, 0x62, 0x2f, 0x0d, 0x4d, 0x6c, 0x4f, 0xd9, 0x94, - 0x29, 0xd3, 0x96, 0x56, 0x86, 0x9a, 0x9f, 0x40, 0xf9, 0x82, 0x8d, 0x83, 0x88, 0x8a, 0x05, 0xde, - 0x81, 0x12, 0x27, 0x53, 0xca, 0xe2, 0x5d, 0x74, 0x80, 0x0e, 0x2b, 0xae, 0xf6, 0x30, 0x86, 0xc2, - 0x6b, 0x16, 0x93, 0xdd, 0x9c, 0x42, 0x95, 0x8d, 0xff, 0x07, 0xe5, 0x24, 0x1d, 0x0d, 0x15, 0x9e, - 0x57, 0xf8, 0x7a, 0x92, 0x8e, 0xae, 0x59, 0x4c, 0xcc, 0x5f, 0x10, 0x14, 0x7a, 0x2c, 0x24, 0x78, - 0x03, 0x72, 0x34, 0xd4, 0xb9, 0x72, 0x34, 0xc4, 0xbb, 0xb0, 0x3e, 0x8e, 0xd2, 0x44, 0x10, 0xae, - 0x53, 0x2d, 0x5d, 0x7c, 0x0c, 0xe5, 0x1b, 0x22, 0x82, 0x30, 0x10, 0x81, 0xca, 0x56, 0x6d, 0x3e, - 0xb5, 0xb2, 0x3e, 0xad, 0x65, 0x9f, 0x96, 0xa7, 0xa6, 0xe0, 0xde, 0x0b, 0xf1, 0xfb, 0x50, 0x8e, - 0x74, 0xe9, 0xbb, 0x05, 0x15, 0xf4, 0xcc, 0x7a, 0x30, 0x4d, 0x6b, 0xd9, 0x9d, 0x7b, 0x2f, 0xc6, - 0xff, 0x87, 0xfa, 0x28, 0xa5, 0x51, 0x38, 0x9c, 0x13, 0x9e, 0xc8, 0x76, 0x8b, 0xaa, 0x9a, 0x9a, - 0x02, 0x5f, 0x64, 0x98, 0x79, 0x8b, 0xa0, 0x7c, 0xb9, 0x7c, 0xea, 0x33, 0xd8, 0x9c, 0xd0, 0x48, - 0x10, 0x3e, 0xbc, 0x2f, 0x13, 0x1d, 0xe4, 0x0f, 0xab, 0x4d, 0xfb, 0x91, 0x17, 0x97, 0x51, 0xd6, - 0x99, 0x0a, 0x59, 0xba, 0x4e, 0x2c, 0xf8, 0xc2, 0xdd, 0x98, 0xfc, 0x0d, 0xdc, 0xbb, 0x86, 0x27, - 0x8f, 0xc8, 0xb0, 0x01, 0xf9, 0x57, 0x64, 0xa1, 0x67, 0x27, 0x4d, 0xfc, 0x0e, 0x14, 0xe7, 0x41, - 0x94, 0x66, 0x5b, 0xf8, 0x97, 0xf9, 0x64, 0xaa, 0x0f, 0x73, 0x1f, 0x20, 0xf3, 0x73, 0xa8, 0xbb, - 0x69, 0x2c, 0xe8, 0x0d, 0xb9, 0xea, 0xc6, 0xe2, 0xb8, 0x29, 0x1b, 0x0f, 0xc9, 0x24, 0x48, 0x23, - 0x31, 0xfc, 0x2b, 0x57, 0xdd, 0xad, 0x69, 0xf0, 0x85, 0xc4, 0xf0, 0x11, 0x54, 0x79, 0x16, 0x35, - 0x94, 0x25, 0xa8, 0xe5, 0xb6, 0x2a, 0x3f, 0xbf, 0xb9, 0xcd, 0x17, 0x78, 0xee, 0x00, 0xb9, 0xa0, - 0xd9, 0x8f, 0xc9, 0xc2, 0xfc, 0x08, 0xaa, 0x1d, 0x12, 0x84, 0x84, 0x67, 0xa1, 0xcf, 0x56, 0xaa, - 0x5e, 0x0d, 0x51, 0x0d, 0x6c, 0xaf, 0x36, 0x50, 0xd1, 0x75, 0x9a, 0x5f, 0xc1, 0xd6, 0x4a, 0x86, - 0xfe, 0x4c, 0xc8, 0x83, 0x7b, 0x0f, 0x4a, 0x2f, 0x15, 0xa8, 0x52, 0x55, 0x9b, 0x8d, 0x47, 0xa6, - 0xbc, 0x12, 0xe5, 0x6a, 0x35, 0x6e, 0x42, 0x49, 0x7e, 0x0b, 0x71, 0xa8, 0x87, 0xb4, 0xf7, 0x60, - 0x48, 0x2d, 0xc6, 0x22, 0x1d, 0x93, 0x29, 0xcd, 0x1f, 0x11, 0x40, 0x3b, 0x10, 0x81, 0xc7, 0x52, - 0x3e, 0x26, 0xf8, 0x2d, 0x28, 0x4f, 0x68, 0x44, 0xe2, 0xe0, 0x86, 0x3c, 0xe8, 0xa3, 0xb3, 0xe6, - 0xde, 0x93, 0xd8, 0x82, 0x1a, 0x8d, 0x23, 0x1a, 0x93, 0xe1, 0x68, 0x21, 0x48, 0xa2, 0x5e, 0xac, - 0x69, 0xf1, 0xeb, 0x9c, 0x21, 0xc5, 0xd5, 0x4c, 0xd0, 0x92, 0x3c, 0x7e, 0x17, 0xea, 0x5a, 0x9f, - 0x08, 0x4e, 0xe3, 0xe9, 0x83, 0xc1, 0x76, 0xd6, 0x5c, 0x9d, 0xd1, 0x53, 0x82, 0x16, 0x86, 0x4a, - 0x32, 0x23, 0x63, 0x3a, 0xa1, 0x84, 0xe3, 0xe2, 0x4f, 0x6f, 0x6e, 0xf3, 0xc8, 0x0c, 0x60, 0xd3, - 0xe7, 0x41, 0x9c, 0xcc, 0x18, 0x17, 0x1e, 0x1b, 0xbf, 0x22, 0x02, 0xef, 0x43, 0xe1, 0xd1, 0x6a, - 0x5d, 0x05, 0x63, 0x1b, 0x4a, 0x63, 0x16, 0x4f, 0xe8, 0xf4, 0xbf, 0x0e, 0x47, 0xcb, 0xcc, 0xdf, - 0x72, 0x50, 0xcb, 0x52, 0xeb, 0x6d, 0x1c, 0x40, 0x35, 0x24, 0xc9, 0x98, 0x53, 0xe5, 0xea, 0x9b, - 0x5c, 0x85, 0xe4, 0x6a, 0x23, 0x32, 0x27, 0x91, 0x7a, 0x22, 0xef, 0x66, 0x8e, 0xfc, 0x6d, 0xa8, - 0xc2, 0xf2, 0x0a, 0xcc, 0xaa, 0xd9, 0x87, 0x0a, 0x8d, 0x97, 0xd7, 0x27, 0x3f, 0xda, 0xbc, 0x1c, - 0x2a, 0x8d, 0xf5, 0xed, 0xed, 0x43, 0x65, 0x94, 0x4e, 0x34, 0x2d, 0xbf, 0xca, 0x9a, 0xa4, 0x47, - 0xe9, 0x24, 0xa3, 0x3f, 0x85, 0x62, 0x22, 0x02, 0x41, 0x76, 0x4b, 0x07, 0xe8, 0x70, 0xa3, 0xf9, - 0xf6, 0x23, 0x67, 0xb1, 0x5a, 0xb9, 0x76, 0x3c, 0x19, 0xd2, 0xda, 0x96, 0x83, 0x29, 0x7e, 0x87, - 0x72, 0x06, 0x52, 0xd6, 0xd7, 0xd2, 0x72, 0xb3, 0x7c, 0xe6, 0x05, 0x54, 0x57, 0xb4, 0x78, 0x0b, - 0xea, 0x9e, 0x7f, 0xe2, 0x3b, 0xc3, 0x81, 0xeb, 0xb4, 0xba, 0xbd, 0xb6, 0xb1, 0x86, 0x37, 0xa1, - 0x9a, 0x41, 0xad, 0xfe, 0x55, 0xaf, 0x6d, 0x20, 0xfc, 0x04, 0x36, 0x33, 0xe0, 0xa2, 0xeb, 0xf9, - 0x4e, 0xaf, 0xdb, 0x3b, 0x37, 0x72, 0x7b, 0x85, 0x6f, 0xbf, 0x6f, 0xac, 0xb5, 0x36, 0xf4, 0xa5, - 0xeb, 0xa5, 0x1d, 0x1d, 0xc2, 0xa6, 0xcb, 0x52, 0x41, 0xe3, 0xe9, 0x80, 0x53, 0xc6, 0xe5, 0x2f, - 0xa8, 0x0a, 0xeb, 0x6d, 0xe7, 0xec, 0xe4, 0xea, 0xc2, 0x37, 0xd6, 0x70, 0x19, 0x0a, 0x9d, 0xee, - 0x79, 0xc7, 0x40, 0x47, 0xdf, 0x20, 0xa8, 0xbb, 0xe4, 0x8b, 0x94, 0x24, 0xe2, 0x92, 0x88, 0x97, - 0x2c, 0xc4, 0x3b, 0x80, 0x2f, 0x1d, 0xbf, 0xd3, 0x6f, 0x0f, 0xaf, 0x7a, 0xde, 0xc0, 0x39, 0xed, - 0x9e, 0x75, 0x1d, 0x59, 0xcf, 0x3a, 0xe4, 0xcf, 0x1d, 0xdf, 0x40, 0x2a, 0xd8, 0x39, 0x69, 0x1b, - 0x39, 0x69, 0x0d, 0xfa, 0x9e, 0x6f, 0xe4, 0x25, 0x39, 0xb8, 0xf2, 0x8d, 0x02, 0x06, 0x28, 0xb5, - 0x9d, 0x0b, 0xc7, 0x77, 0x8c, 0xa2, 0x7c, 0xf2, 0xb4, 0xdf, 0xeb, 0x39, 0xa7, 0xbe, 0x51, 0x92, - 0x4e, 0x7f, 0xe0, 0x77, 0xfb, 0x3d, 0xcf, 0x58, 0xc7, 0x15, 0x28, 0xfa, 0xee, 0xc9, 0xa9, 0x63, - 0x94, 0x75, 0x03, 0x3b, 0x3f, 0xdc, 0x35, 0xd0, 0xaf, 0x77, 0x0d, 0xf4, 0xfb, 0x5d, 0x03, 0xfd, - 0x71, 0xd7, 0x40, 0xd7, 0x05, 0x39, 0xdc, 0x51, 0x49, 0xdd, 0xcc, 0xf1, 0x9f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xc7, 0xc6, 0x38, 0xff, 0xd3, 0x06, 0x00, 0x00, +func init() { proto.RegisterFile("envoy/api/v2/core/base.proto", fileDescriptor_base_0126f5109e43fb63) } + +var fileDescriptor_base_0126f5109e43fb63 = []byte{ + // 974 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4f, 0x6f, 0xe3, 0xc4, + 0x1b, 0xee, 0xe4, 0x5f, 0x93, 0x37, 0x49, 0xeb, 0xce, 0x56, 0xdd, 0xfe, 0xba, 0xdb, 0xa8, 0xca, + 0xef, 0x40, 0x55, 0x84, 0x8d, 0xd2, 0x03, 0x88, 0x13, 0x75, 0xe3, 0x36, 0x11, 0x6d, 0x12, 0x6c, + 0x77, 0x41, 0xbd, 0x04, 0x27, 0x9e, 0x64, 0x47, 0xeb, 0x7a, 0xc2, 0x78, 0x1c, 0x94, 0x3d, 0x22, + 0x0e, 0x08, 0x3e, 0x06, 0x17, 0x24, 0xbe, 0x00, 0xe2, 0x54, 0x89, 0x0b, 0x37, 0xf8, 0x08, 0xa8, + 0xb7, 0xfd, 0x16, 0x68, 0xc6, 0x93, 0x6e, 0xa0, 0x15, 0xdc, 0xde, 0xf7, 0x79, 0x9f, 0xe7, 0xfd, + 0x37, 0xaf, 0x0d, 0xcf, 0x49, 0x3c, 0x67, 0x0b, 0x2b, 0x98, 0x51, 0x6b, 0xde, 0xb2, 0xc6, 0x8c, + 0x13, 0x6b, 0x14, 0x24, 0xc4, 0x9c, 0x71, 0x26, 0x18, 0xde, 0x52, 0x51, 0x33, 0x98, 0x51, 0x73, + 0xde, 0x32, 0x65, 0x74, 0xef, 0xf9, 0x94, 0xb1, 0x69, 0x44, 0x2c, 0x45, 0x18, 0xa5, 0x13, 0x2b, + 0x11, 0x3c, 0x1d, 0x8b, 0x4c, 0xb0, 0xd7, 0xf8, 0x67, 0xf4, 0x2b, 0x1e, 0xcc, 0x66, 0x84, 0x27, + 0x3a, 0xfe, 0x74, 0x1e, 0x44, 0x34, 0x0c, 0x04, 0xb1, 0x96, 0x86, 0x0e, 0x6c, 0x4f, 0xd9, 0x94, + 0x29, 0xd3, 0x92, 0x56, 0x86, 0x36, 0x3f, 0x85, 0xf2, 0x05, 0x1b, 0x07, 0x11, 0x15, 0x0b, 0xbc, + 0x03, 0x25, 0x4e, 0xa6, 0x94, 0xc5, 0xbb, 0xe8, 0x00, 0x1d, 0x56, 0x5c, 0xed, 0x61, 0x0c, 0x85, + 0xd7, 0x2c, 0x26, 0xbb, 0x39, 0x85, 0x2a, 0x1b, 0xff, 0x0f, 0xca, 0x49, 0x3a, 0x1a, 0x2a, 0x3c, + 0xaf, 0xf0, 0xf5, 0x24, 0x1d, 0x5d, 0xb3, 0x98, 0x34, 0x7f, 0x45, 0x50, 0xe8, 0xb1, 0x90, 0xe0, + 0x0d, 0xc8, 0xd1, 0x50, 0xe7, 0xca, 0xd1, 0x10, 0xef, 0xc2, 0xfa, 0x38, 0x4a, 0x13, 0x41, 0xb8, + 0x4e, 0xb5, 0x74, 0xf1, 0x31, 0x94, 0x6f, 0x88, 0x08, 0xc2, 0x40, 0x04, 0x2a, 0x5b, 0xb5, 0xf5, + 0xd4, 0xcc, 0xe6, 0x34, 0x97, 0x73, 0x9a, 0x9e, 0xda, 0x82, 0x7b, 0x4f, 0xc4, 0x1f, 0x40, 0x39, + 0xd2, 0xad, 0xef, 0x16, 0x94, 0xe8, 0x99, 0xf9, 0x60, 0x9b, 0xe6, 0x72, 0x3a, 0xf7, 0x9e, 0x8c, + 0xff, 0x0f, 0xf5, 0x51, 0x4a, 0xa3, 0x70, 0x38, 0x27, 0x3c, 0x91, 0xe3, 0x16, 0x55, 0x37, 0x35, + 0x05, 0xbe, 0xc8, 0xb0, 0xe6, 0x2d, 0x82, 0xf2, 0xe5, 0xb2, 0xd4, 0xe7, 0xb0, 0x39, 0xa1, 0x91, + 0x20, 0x7c, 0x78, 0xdf, 0x26, 0x3a, 0xc8, 0x1f, 0x56, 0x5b, 0xd6, 0x23, 0x15, 0x97, 0x2a, 0xf3, + 0x4c, 0x49, 0x96, 0xae, 0x13, 0x0b, 0xbe, 0x70, 0x37, 0x26, 0x7f, 0x03, 0xf7, 0xae, 0xe1, 0xc9, + 0x23, 0x34, 0x6c, 0x40, 0xfe, 0x15, 0x59, 0xe8, 0xdd, 0x49, 0x13, 0xbf, 0x07, 0xc5, 0x79, 0x10, + 0xa5, 0xd9, 0x2b, 0xfc, 0xcb, 0x7e, 0x32, 0xd6, 0x47, 0xb9, 0x0f, 0x51, 0xf3, 0x0b, 0xa8, 0xbb, + 0x69, 0x2c, 0xe8, 0x0d, 0xb9, 0xea, 0xc6, 0xe2, 0xb8, 0x25, 0x07, 0x0f, 0xc9, 0x24, 0x48, 0x23, + 0x31, 0x7c, 0x9b, 0xab, 0xee, 0xd6, 0x34, 0xf8, 0x42, 0x62, 0xf8, 0x08, 0xaa, 0x3c, 0x53, 0x0d, + 0x65, 0x0b, 0xea, 0x71, 0xed, 0xca, 0x2f, 0x6f, 0x6e, 0xf3, 0x05, 0x9e, 0x3b, 0x40, 0x2e, 0xe8, + 0xe8, 0x27, 0x64, 0xd1, 0xfc, 0x18, 0xaa, 0x1d, 0x12, 0x84, 0x84, 0x67, 0xd2, 0x67, 0x2b, 0x5d, + 0xaf, 0x4a, 0xd4, 0x00, 0xdb, 0xab, 0x03, 0x54, 0x74, 0x9f, 0xcd, 0xef, 0x11, 0x6c, 0xad, 0xa4, + 0xe8, 0xcf, 0x84, 0xbc, 0x38, 0x1b, 0x4a, 0x2f, 0x15, 0xa8, 0x72, 0x55, 0x5b, 0x8d, 0x47, 0xd6, + 0xbc, 0xa2, 0xb2, 0x41, 0xd6, 0x2a, 0x7e, 0x87, 0x72, 0x06, 0x72, 0xb5, 0x12, 0xb7, 0xa0, 0x24, + 0x3f, 0x8c, 0x38, 0xd4, 0x1b, 0xdb, 0x7b, 0xb0, 0x31, 0x9b, 0xb1, 0x48, 0xe9, 0x5d, 0xcd, 0x6c, + 0xfe, 0x84, 0x00, 0xda, 0x81, 0x08, 0x3c, 0x96, 0xf2, 0x31, 0xc1, 0xef, 0x40, 0x79, 0x42, 0x23, + 0x12, 0x07, 0x37, 0xe4, 0xc1, 0x50, 0x9d, 0x35, 0xf7, 0x3e, 0x88, 0x4d, 0xa8, 0xd1, 0x38, 0xa2, + 0x31, 0x19, 0x8e, 0x16, 0x82, 0x24, 0xaa, 0x62, 0x4d, 0x93, 0x5f, 0xe7, 0x0c, 0x49, 0xae, 0x66, + 0x04, 0x5b, 0xc6, 0xf1, 0xfb, 0x50, 0xd7, 0xfc, 0x44, 0x70, 0x1a, 0x4f, 0x1f, 0x6c, 0xb9, 0xb3, + 0xe6, 0xea, 0x8c, 0x9e, 0x22, 0xd8, 0x18, 0x2a, 0xc9, 0x8c, 0x8c, 0xe9, 0x84, 0x12, 0x8e, 0x8b, + 0x3f, 0xbf, 0xb9, 0xcd, 0xa3, 0x66, 0x00, 0x9b, 0x3e, 0x0f, 0xe2, 0x64, 0xc6, 0xb8, 0xf0, 0xd8, + 0xf8, 0x15, 0x11, 0x78, 0x1f, 0x0a, 0x8f, 0x76, 0xeb, 0x2a, 0x18, 0x5b, 0x50, 0x1a, 0xb3, 0x78, + 0x42, 0xa7, 0xff, 0x75, 0x45, 0x9a, 0xd6, 0xfc, 0x3d, 0x07, 0xb5, 0x2c, 0xb5, 0x7e, 0x99, 0x03, + 0xa8, 0x86, 0x24, 0x19, 0x73, 0xaa, 0x5c, 0x7d, 0xa0, 0xab, 0x90, 0x7c, 0xe7, 0x88, 0xcc, 0x49, + 0xa4, 0x4a, 0xe4, 0xdd, 0xcc, 0x91, 0xff, 0x10, 0xd5, 0x58, 0x5e, 0x81, 0x59, 0x37, 0xfb, 0x50, + 0xa1, 0xf1, 0xf2, 0x14, 0xe5, 0x17, 0x9c, 0x97, 0x4b, 0xa5, 0xb1, 0x3e, 0xc4, 0x7d, 0xa8, 0x8c, + 0xd2, 0x89, 0x0e, 0xcb, 0x4f, 0xb4, 0x26, 0xc3, 0xa3, 0x74, 0x92, 0x85, 0x3f, 0x83, 0x62, 0x22, + 0x02, 0x41, 0x76, 0x4b, 0x07, 0xe8, 0x70, 0xa3, 0xf5, 0xee, 0x23, 0x27, 0xb2, 0xda, 0xb9, 0x76, + 0x3c, 0x29, 0xb1, 0xb7, 0xdf, 0xde, 0x8b, 0xb2, 0xbe, 0x56, 0x97, 0x93, 0xe5, 0x6b, 0x5e, 0x40, + 0x75, 0x85, 0x8b, 0xb7, 0xa0, 0xee, 0xf9, 0x27, 0xbe, 0x33, 0x1c, 0xb8, 0x8e, 0xdd, 0xed, 0xb5, + 0x8d, 0x35, 0xbc, 0x09, 0xd5, 0x0c, 0xb2, 0xfb, 0x57, 0xbd, 0xb6, 0x81, 0xf0, 0x13, 0xd8, 0xcc, + 0x80, 0x8b, 0xae, 0xe7, 0x3b, 0xbd, 0x6e, 0xef, 0xdc, 0xc8, 0xed, 0x15, 0xbe, 0xfd, 0xa1, 0xb1, + 0x66, 0x6f, 0xe8, 0xb3, 0xd7, 0x8f, 0x76, 0x74, 0x08, 0x9b, 0x2e, 0x4b, 0x05, 0x8d, 0xa7, 0x03, + 0x4e, 0x19, 0x97, 0xff, 0xa3, 0x2a, 0xac, 0xb7, 0x9d, 0xb3, 0x93, 0xab, 0x0b, 0xdf, 0x58, 0xc3, + 0x65, 0x28, 0x74, 0xba, 0xe7, 0x1d, 0x03, 0x1d, 0x7d, 0x83, 0xa0, 0xee, 0x92, 0x2f, 0x53, 0x92, + 0x88, 0x4b, 0x22, 0x5e, 0xb2, 0x10, 0xef, 0x00, 0xbe, 0x74, 0xfc, 0x4e, 0xbf, 0x3d, 0xbc, 0xea, + 0x79, 0x03, 0xe7, 0xb4, 0x7b, 0xd6, 0x75, 0x64, 0x3f, 0xeb, 0x90, 0x3f, 0x77, 0x7c, 0x03, 0x29, + 0xb1, 0x73, 0xd2, 0x36, 0x72, 0xd2, 0x1a, 0xf4, 0x3d, 0xdf, 0xc8, 0xcb, 0xe0, 0xe0, 0xca, 0x37, + 0x0a, 0x18, 0xa0, 0xd4, 0x76, 0x2e, 0x1c, 0xdf, 0x31, 0x8a, 0xb2, 0xe4, 0x69, 0xbf, 0xd7, 0x73, + 0x4e, 0x7d, 0xa3, 0x24, 0x9d, 0xfe, 0xc0, 0xef, 0xf6, 0x7b, 0x9e, 0xb1, 0x8e, 0x2b, 0x50, 0xf4, + 0xdd, 0x93, 0x53, 0xc7, 0x28, 0xeb, 0x01, 0x76, 0x7e, 0xbc, 0x6b, 0xa0, 0xdf, 0xee, 0x1a, 0xe8, + 0x8f, 0xbb, 0x06, 0xfa, 0xf3, 0xae, 0x81, 0xae, 0x0b, 0x72, 0xb9, 0xa3, 0x92, 0xba, 0x99, 0xe3, + 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x2e, 0x4d, 0x11, 0xe0, 0x06, 0x00, 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go index ebcd0d0bbfc1..62f583ec43d3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go @@ -92,9 +92,7 @@ func (m *Node) Validate() error { // no validation rules for Cluster - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return NodeValidationError{ Field: "Metadata", @@ -104,9 +102,7 @@ func (m *Node) Validate() error { } } - if v, ok := interface{}(m.GetLocality()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return NodeValidationError{ Field: "Locality", @@ -305,9 +301,14 @@ func (m *HeaderValueOption) Validate() error { return nil } - if v, ok := interface{}(m.GetHeader()).(interface { - Validate() error - }); ok { + if m.GetHeader() == nil { + return HeaderValueOptionValidationError{ + Field: "Header", + Reason: "value is required", + } + } + + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HeaderValueOptionValidationError{ Field: "Header", @@ -317,9 +318,7 @@ func (m *HeaderValueOption) Validate() error { } } - if v, ok := interface{}(m.GetAppend()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAppend()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HeaderValueOptionValidationError{ Field: "Append", @@ -456,9 +455,7 @@ func (m *TransportSocket) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TransportSocketValidationError{ Field: "Config", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go index 2761f54f046e..8d11fa326fc2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go @@ -52,9 +52,7 @@ func (m *ApiConfigSource) Validate() error { for idx, item := range m.GetGrpcServices() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ApiConfigSourceValidationError{ Field: fmt.Sprintf("GrpcServices[%v]", idx), @@ -66,9 +64,7 @@ func (m *ApiConfigSource) Validate() error { } - if v, ok := interface{}(m.GetRefreshDelay()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRefreshDelay()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ApiConfigSourceValidationError{ Field: "RefreshDelay", @@ -183,9 +179,7 @@ func (m *ConfigSource) Validate() error { case *ConfigSource_ApiConfigSource: - if v, ok := interface{}(m.GetApiConfigSource()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetApiConfigSource()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConfigSourceValidationError{ Field: "ApiConfigSource", @@ -197,9 +191,7 @@ func (m *ConfigSource) Validate() error { case *ConfigSource_Ads: - if v, ok := interface{}(m.GetAds()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAds()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConfigSourceValidationError{ Field: "Ads", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go index 86f4165e0465..6f3c8cd6ca84 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go @@ -42,9 +42,7 @@ func (m *GrpcService) Validate() error { return nil } - if v, ok := interface{}(m.GetTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcServiceValidationError{ Field: "Timeout", @@ -57,9 +55,7 @@ func (m *GrpcService) Validate() error { for idx, item := range m.GetInitialMetadata() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcServiceValidationError{ Field: fmt.Sprintf("InitialMetadata[%v]", idx), @@ -75,9 +71,7 @@ func (m *GrpcService) Validate() error { case *GrpcService_EnvoyGrpc_: - if v, ok := interface{}(m.GetEnvoyGrpc()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEnvoyGrpc()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcServiceValidationError{ Field: "EnvoyGrpc", @@ -89,9 +83,7 @@ func (m *GrpcService) Validate() error { case *GrpcService_GoogleGrpc_: - if v, ok := interface{}(m.GetGoogleGrpc()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGoogleGrpc()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcServiceValidationError{ Field: "GoogleGrpc", @@ -207,9 +199,7 @@ func (m *GrpcService_GoogleGrpc) Validate() error { } } - if v, ok := interface{}(m.GetChannelCredentials()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetChannelCredentials()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpcValidationError{ Field: "ChannelCredentials", @@ -222,9 +212,7 @@ func (m *GrpcService_GoogleGrpc) Validate() error { for idx, item := range m.GetCallCredentials() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpcValidationError{ Field: fmt.Sprintf("CallCredentials[%v]", idx), @@ -245,9 +233,7 @@ func (m *GrpcService_GoogleGrpc) Validate() error { // no validation rules for CredentialsFactoryName - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpcValidationError{ Field: "Config", @@ -299,9 +285,7 @@ func (m *GrpcService_GoogleGrpc_SslCredentials) Validate() error { return nil } - if v, ok := interface{}(m.GetRootCerts()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRootCerts()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_SslCredentialsValidationError{ Field: "RootCerts", @@ -311,9 +295,7 @@ func (m *GrpcService_GoogleGrpc_SslCredentials) Validate() error { } } - if v, ok := interface{}(m.GetPrivateKey()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPrivateKey()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_SslCredentialsValidationError{ Field: "PrivateKey", @@ -323,9 +305,7 @@ func (m *GrpcService_GoogleGrpc_SslCredentials) Validate() error { } } - if v, ok := interface{}(m.GetCertChain()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCertChain()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_SslCredentialsValidationError{ Field: "CertChain", @@ -382,9 +362,7 @@ func (m *GrpcService_GoogleGrpc_ChannelCredentials) Validate() error { case *GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials: - if v, ok := interface{}(m.GetSslCredentials()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSslCredentials()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ Field: "SslCredentials", @@ -396,9 +374,7 @@ func (m *GrpcService_GoogleGrpc_ChannelCredentials) Validate() error { case *GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault: - if v, ok := interface{}(m.GetGoogleDefault()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGoogleDefault()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ Field: "GoogleDefault", @@ -466,9 +442,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine: - if v, ok := interface{}(m.GetGoogleComputeEngine()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGoogleComputeEngine()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_CallCredentialsValidationError{ Field: "GoogleComputeEngine", @@ -483,9 +457,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJwtAccess: - if v, ok := interface{}(m.GetServiceAccountJwtAccess()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetServiceAccountJwtAccess()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_CallCredentialsValidationError{ Field: "ServiceAccountJwtAccess", @@ -497,9 +469,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_GoogleIam: - if v, ok := interface{}(m.GetGoogleIam()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGoogleIam()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_CallCredentialsValidationError{ Field: "GoogleIam", @@ -511,9 +481,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_FromPlugin: - if v, ok := interface{}(m.GetFromPlugin()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFromPlugin()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_CallCredentialsValidationError{ Field: "FromPlugin", @@ -675,9 +643,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) V // no validation rules for Name - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPluginValidationError{ Field: "Config", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go index 0bff9de8079f..da31fa042324 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go @@ -84,9 +84,7 @@ func (m *HealthCheck) Validate() error { } - if v, ok := interface{}(m.GetIntervalJitter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIntervalJitter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "IntervalJitter", @@ -98,9 +96,7 @@ func (m *HealthCheck) Validate() error { // no validation rules for IntervalJitterPercent - if v, ok := interface{}(m.GetUnhealthyThreshold()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUnhealthyThreshold()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "UnhealthyThreshold", @@ -110,9 +106,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetHealthyThreshold()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthyThreshold()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "HealthyThreshold", @@ -122,9 +116,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetAltPort()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAltPort()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "AltPort", @@ -134,9 +126,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetReuseConnection()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetReuseConnection()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "ReuseConnection", @@ -146,9 +136,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetNoTrafficInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNoTrafficInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "NoTrafficInterval", @@ -158,9 +146,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetUnhealthyInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUnhealthyInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "UnhealthyInterval", @@ -170,9 +156,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetUnhealthyEdgeInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUnhealthyEdgeInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "UnhealthyEdgeInterval", @@ -182,9 +166,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetHealthyEdgeInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthyEdgeInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "HealthyEdgeInterval", @@ -200,9 +182,7 @@ func (m *HealthCheck) Validate() error { case *HealthCheck_HttpHealthCheck_: - if v, ok := interface{}(m.GetHttpHealthCheck()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpHealthCheck()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "HttpHealthCheck", @@ -214,9 +194,7 @@ func (m *HealthCheck) Validate() error { case *HealthCheck_TcpHealthCheck_: - if v, ok := interface{}(m.GetTcpHealthCheck()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTcpHealthCheck()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "TcpHealthCheck", @@ -228,9 +206,7 @@ func (m *HealthCheck) Validate() error { case *HealthCheck_GrpcHealthCheck_: - if v, ok := interface{}(m.GetGrpcHealthCheck()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcHealthCheck()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "GrpcHealthCheck", @@ -242,9 +218,7 @@ func (m *HealthCheck) Validate() error { case *HealthCheck_CustomHealthCheck_: - if v, ok := interface{}(m.GetCustomHealthCheck()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCustomHealthCheck()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "CustomHealthCheck", @@ -377,9 +351,7 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetSend()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSend()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_HttpHealthCheckValidationError{ Field: "Send", @@ -389,9 +361,7 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetReceive()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetReceive()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_HttpHealthCheckValidationError{ Field: "Receive", @@ -406,9 +376,7 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_HttpHealthCheckValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -465,9 +433,7 @@ func (m *HealthCheck_TcpHealthCheck) Validate() error { return nil } - if v, ok := interface{}(m.GetSend()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSend()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_TcpHealthCheckValidationError{ Field: "Send", @@ -480,9 +446,7 @@ func (m *HealthCheck_TcpHealthCheck) Validate() error { for idx, item := range m.GetReceive() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_TcpHealthCheckValidationError{ Field: fmt.Sprintf("Receive[%v]", idx), @@ -633,9 +597,7 @@ func (m *HealthCheck_CustomHealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheck_CustomHealthCheckValidationError{ Field: "Config", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go index c4bac68f55e8..8b2d0eef6cec 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go @@ -41,7 +41,7 @@ func (m *TcpProtocolOptions) Reset() { *m = TcpProtocolOptions{} } func (m *TcpProtocolOptions) String() string { return proto.CompactTextString(m) } func (*TcpProtocolOptions) ProtoMessage() {} func (*TcpProtocolOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_protocol_421b79c49b67d717, []int{0} + return fileDescriptor_protocol_4320d5a758919a50, []int{0} } func (m *TcpProtocolOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,7 +85,7 @@ func (m *HttpProtocolOptions) Reset() { *m = HttpProtocolOptions{} } func (m *HttpProtocolOptions) String() string { return proto.CompactTextString(m) } func (*HttpProtocolOptions) ProtoMessage() {} func (*HttpProtocolOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_protocol_421b79c49b67d717, []int{1} + return fileDescriptor_protocol_4320d5a758919a50, []int{1} } func (m *HttpProtocolOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -145,7 +145,7 @@ func (m *Http1ProtocolOptions) Reset() { *m = Http1ProtocolOptions{} } func (m *Http1ProtocolOptions) String() string { return proto.CompactTextString(m) } func (*Http1ProtocolOptions) ProtoMessage() {} func (*Http1ProtocolOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_protocol_421b79c49b67d717, []int{2} + return fileDescriptor_protocol_4320d5a758919a50, []int{2} } func (m *Http1ProtocolOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -212,16 +212,29 @@ type Http2ProtocolOptions struct { // Similar to *initial_stream_window_size*, but for connection-level flow-control // window. Currently, this has the same minimum/maximum/default as *initial_stream_window_size*. InitialConnectionWindowSize *types.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize" json:"initial_connection_window_size,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // [#not-implemented-hide:] Hiding until nghttp2 has native support. + // + // Allows proxying Websocket and other upgrades over H2 connect. + // + // THIS IS NOT SAFE TO USE IN PRODUCTION + // + // This currently works via disabling all HTTP sanity checks for H2 traffic + // which is a much larger hammer than we'd like to use. Eventually when + // https://github.com/nghttp2/nghttp2/issues/1181 is resolved, this will work + // with simply enabling CONNECT for H2. This may require some tweaks to the + // headers making pre-CONNECT-support proxying not backwards compatible with + // post-CONNECT-support proxying. + AllowConnect bool `protobuf:"varint,5,opt,name=allow_connect,json=allowConnect,proto3" json:"allow_connect,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Http2ProtocolOptions) Reset() { *m = Http2ProtocolOptions{} } func (m *Http2ProtocolOptions) String() string { return proto.CompactTextString(m) } func (*Http2ProtocolOptions) ProtoMessage() {} func (*Http2ProtocolOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_protocol_421b79c49b67d717, []int{3} + return fileDescriptor_protocol_4320d5a758919a50, []int{3} } func (m *Http2ProtocolOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -278,6 +291,13 @@ func (m *Http2ProtocolOptions) GetInitialConnectionWindowSize() *types.UInt32Val return nil } +func (m *Http2ProtocolOptions) GetAllowConnect() bool { + if m != nil { + return m.AllowConnect + } + return false +} + // [#not-implemented-hide:] type GrpcProtocolOptions struct { Http2ProtocolOptions *Http2ProtocolOptions `protobuf:"bytes,1,opt,name=http2_protocol_options,json=http2ProtocolOptions" json:"http2_protocol_options,omitempty"` @@ -290,7 +310,7 @@ func (m *GrpcProtocolOptions) Reset() { *m = GrpcProtocolOptions{} } func (m *GrpcProtocolOptions) String() string { return proto.CompactTextString(m) } func (*GrpcProtocolOptions) ProtoMessage() {} func (*GrpcProtocolOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_protocol_421b79c49b67d717, []int{4} + return fileDescriptor_protocol_4320d5a758919a50, []int{4} } func (m *GrpcProtocolOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -454,6 +474,9 @@ func (this *Http2ProtocolOptions) Equal(that interface{}) bool { if !this.InitialConnectionWindowSize.Equal(that1.InitialConnectionWindowSize) { return false } + if this.AllowConnect != that1.AllowConnect { + return false + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -640,6 +663,16 @@ func (m *Http2ProtocolOptions) MarshalTo(dAtA []byte) (int, error) { } i += n6 } + if m.AllowConnect { + dAtA[i] = 0x28 + i++ + if m.AllowConnect { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -747,6 +780,9 @@ func (m *Http2ProtocolOptions) Size() (n int) { l = m.InitialConnectionWindowSize.Size() n += 1 + l + sovProtocol(uint64(l)) } + if m.AllowConnect { + n += 2 + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1208,6 +1244,26 @@ func (m *Http2ProtocolOptions) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowConnect", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtocol + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.AllowConnect = bool(v != 0) default: iNdEx = preIndex skippy, err := skipProtocol(dAtA[iNdEx:]) @@ -1420,43 +1476,44 @@ var ( ) func init() { - proto.RegisterFile("envoy/api/v2/core/protocol.proto", fileDescriptor_protocol_421b79c49b67d717) + proto.RegisterFile("envoy/api/v2/core/protocol.proto", fileDescriptor_protocol_4320d5a758919a50) } -var fileDescriptor_protocol_421b79c49b67d717 = []byte{ - // 540 bytes of a gzipped FileDescriptorProto +var fileDescriptor_protocol_4320d5a758919a50 = []byte{ + // 556 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x86, 0x65, 0x52, 0x41, 0xd9, 0x46, 0x25, 0x75, 0xad, 0x36, 0x04, 0x64, 0xa2, 0x08, 0x89, - 0xa8, 0x07, 0xbb, 0x75, 0x25, 0xee, 0xa4, 0xa8, 0x84, 0x13, 0xc8, 0x4d, 0x41, 0x1c, 0xd0, 0x6a, - 0xb3, 0xd9, 0x24, 0x2b, 0x36, 0x9e, 0xd5, 0x7a, 0x9d, 0x94, 0x3e, 0x09, 0x6f, 0x00, 0xcf, 0xc0, - 0x01, 0x71, 0xe4, 0xc8, 0x1b, 0x80, 0x72, 0xe3, 0x29, 0x8c, 0xec, 0xdd, 0x04, 0x91, 0x54, 0x02, - 0xf5, 0xb6, 0x9a, 0x99, 0xff, 0xff, 0xfe, 0xf1, 0xc8, 0xa8, 0xc9, 0x92, 0x29, 0xbc, 0x0f, 0x89, - 0xe4, 0xe1, 0x34, 0x0a, 0x29, 0x28, 0x16, 0x4a, 0x05, 0x1a, 0x28, 0x88, 0xa0, 0x7c, 0xb8, 0x3b, - 0xe5, 0x44, 0x40, 0x24, 0x0f, 0xa6, 0x51, 0x50, 0x4c, 0x34, 0xfc, 0x11, 0xc0, 0x48, 0xd8, 0xc9, - 0x7e, 0x36, 0x0c, 0x07, 0x99, 0x22, 0x9a, 0x43, 0x62, 0x24, 0xeb, 0xfd, 0x99, 0x22, 0x52, 0x32, - 0x95, 0xda, 0xfe, 0xfe, 0x94, 0x08, 0x3e, 0x20, 0x9a, 0x85, 0x8b, 0x87, 0x6d, 0x78, 0x23, 0x18, - 0x41, 0xf9, 0x0c, 0x8b, 0x97, 0xa9, 0xb6, 0x3c, 0xe4, 0xf6, 0xa8, 0x7c, 0x69, 0x63, 0xbd, 0x90, - 0x05, 0x29, 0x6d, 0xbd, 0x41, 0xbb, 0x5d, 0xad, 0x57, 0xcb, 0x6e, 0x07, 0x55, 0xf9, 0x40, 0x30, - 0xac, 0xf9, 0x84, 0x41, 0xa6, 0xeb, 0x4e, 0xd3, 0x69, 0x6f, 0x45, 0x77, 0x03, 0x13, 0x29, 0x58, - 0x44, 0x0a, 0x9e, 0xda, 0xc8, 0x9d, 0x8d, 0x0f, 0x3f, 0x1e, 0x38, 0xf1, 0x56, 0x21, 0xea, 0x19, - 0x4d, 0xeb, 0x8b, 0x83, 0xbc, 0xc2, 0xfb, 0x68, 0xd5, 0xbc, 0x8b, 0x5c, 0x22, 0x04, 0xcc, 0x30, - 0xe9, 0xa7, 0x20, 0x32, 0xcd, 0x70, 0xa6, 0x84, 0x45, 0x34, 0xd6, 0x10, 0x1d, 0x00, 0xf1, 0x8a, - 0x88, 0x8c, 0xc5, 0xb5, 0x52, 0xf5, 0xc4, 0x8a, 0xce, 0x95, 0x70, 0x1f, 0xa2, 0x6d, 0x42, 0x29, - 0x93, 0x1a, 0x8f, 0xb5, 0x96, 0xf8, 0xe8, 0xb0, 0x7e, 0xa3, 0xe9, 0xb4, 0x37, 0xe3, 0xaa, 0xa9, - 0x96, 0xf4, 0x43, 0xf7, 0x31, 0xaa, 0x0f, 0xd8, 0x90, 0x64, 0x42, 0xe3, 0x31, 0xa4, 0x1a, 0x0f, - 0x41, 0x2d, 0xe7, 0x2b, 0x4d, 0xa7, 0x7d, 0x3b, 0xf6, 0x6c, 0xbf, 0x0b, 0xa9, 0x3e, 0x05, 0x65, - 0x74, 0xad, 0x8f, 0x15, 0xb3, 0x40, 0xb4, 0xba, 0xc0, 0x29, 0xaa, 0x8d, 0x25, 0xa1, 0xef, 0xb0, - 0x26, 0x7d, 0xc1, 0x70, 0xca, 0x2f, 0x99, 0x8d, 0x7f, 0x7f, 0x2d, 0xfe, 0xf9, 0xf3, 0x44, 0x1f, - 0x47, 0x66, 0x81, 0xed, 0x52, 0xd5, 0x2b, 0x44, 0x67, 0xfc, 0x92, 0xb9, 0x14, 0xed, 0x4d, 0xc8, - 0x05, 0xa6, 0x90, 0xd0, 0x4c, 0x29, 0x96, 0x68, 0x9c, 0x6a, 0xc5, 0xc8, 0x24, 0x2d, 0xd7, 0xf8, - 0x87, 0x5b, 0xe7, 0xce, 0xe7, 0x5f, 0x5f, 0x2b, 0xe8, 0x60, 0xb3, 0x9e, 0xe7, 0x79, 0x7e, 0xab, - 0xed, 0xc4, 0xde, 0x84, 0x5c, 0x9c, 0x2c, 0xbd, 0xce, 0x8c, 0x95, 0x2b, 0x50, 0x83, 0x27, 0x5c, - 0x73, 0x22, 0xac, 0x3b, 0x9e, 0xf1, 0x64, 0x00, 0x33, 0x13, 0xbb, 0xf2, 0x1f, 0xa0, 0x9d, 0x02, - 0x54, 0x3d, 0x40, 0x16, 0x94, 0xe7, 0x95, 0x78, 0xdf, 0x5a, 0x1a, 0xc8, 0xeb, 0xd2, 0xb0, 0x5c, - 0x49, 0x23, 0x7f, 0x41, 0xa3, 0x90, 0x24, 0x8c, 0x16, 0x5f, 0xec, 0x2f, 0xe2, 0xc6, 0xf5, 0x88, - 0xf7, 0xac, 0xed, 0xc9, 0xd2, 0xf5, 0x0f, 0xb5, 0xa5, 0xd1, 0xee, 0x33, 0x25, 0xe9, 0xea, 0x9d, - 0xde, 0xa2, 0xbd, 0xe2, 0xce, 0x11, 0x5e, 0xfc, 0x8c, 0x18, 0x4c, 0xc7, 0x5e, 0xeb, 0x51, 0xb0, - 0xf6, 0x57, 0x06, 0x57, 0x1d, 0x3c, 0xf6, 0xc6, 0x57, 0x54, 0x3b, 0xb5, 0x4f, 0x73, 0xdf, 0xf9, - 0x36, 0xf7, 0x9d, 0xef, 0x73, 0xdf, 0xf9, 0x39, 0xf7, 0x9d, 0xfe, 0xcd, 0x12, 0x74, 0xfc, 0x3b, - 0x00, 0x00, 0xff, 0xff, 0xd0, 0x8c, 0x8d, 0xbc, 0x10, 0x04, 0x00, 0x00, + 0x10, 0x86, 0x65, 0x52, 0xa0, 0x6c, 0x4b, 0x49, 0x5d, 0xab, 0x0d, 0x01, 0x99, 0x28, 0x20, 0x11, + 0xf5, 0x60, 0xb7, 0xae, 0xc4, 0x9d, 0x14, 0x95, 0x70, 0x02, 0xb9, 0x29, 0x88, 0x03, 0x5a, 0x6d, + 0x36, 0x9b, 0x64, 0xc5, 0xc6, 0xb3, 0x5a, 0xaf, 0x93, 0xd2, 0x27, 0xe1, 0x11, 0x78, 0x06, 0x0e, + 0x88, 0x23, 0x07, 0x0e, 0xbc, 0x01, 0x28, 0x37, 0x9e, 0xc2, 0xc8, 0xde, 0x4d, 0x04, 0x49, 0x25, + 0x10, 0xb7, 0xd1, 0xcc, 0xfc, 0xff, 0x37, 0x63, 0xcf, 0xa2, 0x06, 0x4b, 0x26, 0xf0, 0x2e, 0x24, + 0x92, 0x87, 0x93, 0x28, 0xa4, 0xa0, 0x58, 0x28, 0x15, 0x68, 0xa0, 0x20, 0x82, 0x32, 0x70, 0xb7, + 0xcb, 0x8e, 0x80, 0x48, 0x1e, 0x4c, 0xa2, 0xa0, 0xe8, 0xa8, 0xfb, 0x43, 0x80, 0xa1, 0xb0, 0x9d, + 0xbd, 0x6c, 0x10, 0xf6, 0x33, 0x45, 0x34, 0x87, 0xc4, 0x48, 0x56, 0xeb, 0x53, 0x45, 0xa4, 0x64, + 0x2a, 0xb5, 0xf5, 0xbd, 0x09, 0x11, 0xbc, 0x4f, 0x34, 0x0b, 0xe7, 0x81, 0x2d, 0x78, 0x43, 0x18, + 0x42, 0x19, 0x86, 0x45, 0x64, 0xb2, 0x4d, 0x0f, 0xb9, 0x5d, 0x2a, 0x5f, 0xd8, 0xb1, 0x9e, 0xcb, + 0x82, 0x94, 0x36, 0x5f, 0xa3, 0x9d, 0x8e, 0xd6, 0xcb, 0x69, 0xb7, 0x8d, 0x36, 0x79, 0x5f, 0x30, + 0xac, 0xf9, 0x98, 0x41, 0xa6, 0x6b, 0x4e, 0xc3, 0x69, 0x6d, 0x44, 0xb7, 0x03, 0x33, 0x52, 0x30, + 0x1f, 0x29, 0x78, 0x62, 0x47, 0x6e, 0xaf, 0xbd, 0xff, 0x7e, 0xcf, 0x89, 0x37, 0x0a, 0x51, 0xd7, + 0x68, 0x9a, 0x9f, 0x1c, 0xe4, 0x15, 0xde, 0x87, 0xcb, 0xe6, 0x1d, 0xe4, 0x12, 0x21, 0x60, 0x8a, + 0x49, 0x2f, 0x05, 0x91, 0x69, 0x86, 0x33, 0x25, 0x2c, 0xa2, 0xbe, 0x82, 0x68, 0x03, 0x88, 0x97, + 0x44, 0x64, 0x2c, 0xae, 0x96, 0xaa, 0xc7, 0x56, 0x74, 0xa6, 0x84, 0xfb, 0x00, 0x6d, 0x11, 0x4a, + 0x99, 0xd4, 0x78, 0xa4, 0xb5, 0xc4, 0x87, 0x07, 0xb5, 0x2b, 0x0d, 0xa7, 0xb5, 0x1e, 0x6f, 0x9a, + 0x6c, 0x49, 0x3f, 0x70, 0x1f, 0xa1, 0x5a, 0x9f, 0x0d, 0x48, 0x26, 0x34, 0x1e, 0x41, 0xaa, 0xf1, + 0x00, 0xd4, 0xa2, 0xbf, 0xd2, 0x70, 0x5a, 0x37, 0x62, 0xcf, 0xd6, 0x3b, 0x90, 0xea, 0x13, 0x50, + 0x46, 0xd7, 0xfc, 0x5a, 0x31, 0x0b, 0x44, 0xcb, 0x0b, 0x9c, 0xa0, 0xea, 0x48, 0x12, 0xfa, 0x16, + 0x6b, 0xd2, 0x13, 0x0c, 0xa7, 0xfc, 0x82, 0xd9, 0xf1, 0xef, 0xae, 0x8c, 0x7f, 0xf6, 0x2c, 0xd1, + 0x47, 0x91, 0x59, 0x60, 0xab, 0x54, 0x75, 0x0b, 0xd1, 0x29, 0xbf, 0x60, 0x2e, 0x45, 0xbb, 0x63, + 0x72, 0x8e, 0x29, 0x24, 0x34, 0x53, 0x8a, 0x25, 0x1a, 0xa7, 0x5a, 0x31, 0x32, 0x4e, 0xcb, 0x35, + 0xfe, 0xe2, 0xd6, 0xbe, 0xf5, 0xf1, 0xe7, 0xe7, 0x0a, 0xda, 0x5f, 0xaf, 0xe5, 0x79, 0x9e, 0x5f, + 0x6f, 0x39, 0xb1, 0x37, 0x26, 0xe7, 0xc7, 0x0b, 0xaf, 0x53, 0x63, 0xe5, 0x0a, 0x54, 0xe7, 0x09, + 0xd7, 0x9c, 0x08, 0xeb, 0x8e, 0xa7, 0x3c, 0xe9, 0xc3, 0xd4, 0x8c, 0x5d, 0xf9, 0x07, 0xd0, 0x76, + 0x01, 0xda, 0xdc, 0x47, 0x16, 0x94, 0xe7, 0x95, 0x78, 0xcf, 0x5a, 0x1a, 0xc8, 0xab, 0xd2, 0xb0, + 0x5c, 0x49, 0x23, 0x7f, 0x4e, 0xa3, 0x90, 0x24, 0x8c, 0x16, 0x5f, 0xec, 0x0f, 0xe2, 0xda, 0xff, + 0x11, 0xef, 0x58, 0xdb, 0xe3, 0x85, 0xeb, 0x6f, 0xd4, 0xfb, 0xe8, 0xa6, 0xb9, 0x28, 0xcb, 0xac, + 0x5d, 0xb5, 0x67, 0x50, 0x24, 0xad, 0xa2, 0xa9, 0xd1, 0xce, 0x53, 0x25, 0xe9, 0xf2, 0xcf, 0x7c, + 0x83, 0x76, 0x8b, 0x63, 0x88, 0xf0, 0xfc, 0xc5, 0x62, 0x30, 0x15, 0xfb, 0x4b, 0x1f, 0x06, 0x2b, + 0x4f, 0x37, 0xb8, 0xec, 0x2a, 0x62, 0x6f, 0x74, 0x49, 0xb6, 0x5d, 0xfd, 0x30, 0xf3, 0x9d, 0x2f, + 0x33, 0xdf, 0xf9, 0x36, 0xf3, 0x9d, 0x1f, 0x33, 0xdf, 0xe9, 0x5d, 0x2b, 0x41, 0x47, 0xbf, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x01, 0x63, 0xb4, 0x84, 0x35, 0x04, 0x00, 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go index 7e507569fa21..66294c882c04 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go @@ -84,9 +84,7 @@ func (m *HttpProtocolOptions) Validate() error { return nil } - if v, ok := interface{}(m.GetIdleTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIdleTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpProtocolOptionsValidationError{ Field: "IdleTimeout", @@ -138,9 +136,7 @@ func (m *Http1ProtocolOptions) Validate() error { return nil } - if v, ok := interface{}(m.GetAllowAbsoluteUrl()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAllowAbsoluteUrl()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Http1ProtocolOptionsValidationError{ Field: "AllowAbsoluteUrl", @@ -196,9 +192,7 @@ func (m *Http2ProtocolOptions) Validate() error { return nil } - if v, ok := interface{}(m.GetHpackTableSize()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHpackTableSize()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Http2ProtocolOptionsValidationError{ Field: "HpackTableSize", @@ -241,6 +235,8 @@ func (m *Http2ProtocolOptions) Validate() error { } + // no validation rules for AllowConnect + return nil } @@ -283,9 +279,7 @@ func (m *GrpcProtocolOptions) Validate() error { return nil } - if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcProtocolOptionsValidationError{ Field: "Http2ProtocolOptions", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go index 33926f6c99da..e1d501a58b7a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go @@ -44,9 +44,7 @@ func (m *DiscoveryRequest) Validate() error { // no validation rules for VersionInfo - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DiscoveryRequestValidationError{ Field: "Node", @@ -60,9 +58,7 @@ func (m *DiscoveryRequest) Validate() error { // no validation rules for ResponseNonce - if v, ok := interface{}(m.GetErrorDetail()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetErrorDetail()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DiscoveryRequestValidationError{ Field: "ErrorDetail", @@ -119,9 +115,7 @@ func (m *DiscoveryResponse) Validate() error { for idx, item := range m.GetResources() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DiscoveryResponseValidationError{ Field: fmt.Sprintf("Resources[%v]", idx), @@ -181,9 +175,7 @@ func (m *IncrementalDiscoveryRequest) Validate() error { return nil } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return IncrementalDiscoveryRequestValidationError{ Field: "Node", @@ -199,9 +191,7 @@ func (m *IncrementalDiscoveryRequest) Validate() error { // no validation rules for ResponseNonce - if v, ok := interface{}(m.GetErrorDetail()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetErrorDetail()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return IncrementalDiscoveryRequestValidationError{ Field: "ErrorDetail", @@ -259,9 +249,7 @@ func (m *IncrementalDiscoveryResponse) Validate() error { for idx, item := range m.GetResources() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return IncrementalDiscoveryResponseValidationError{ Field: fmt.Sprintf("Resources[%v]", idx), @@ -319,9 +307,7 @@ func (m *Resource) Validate() error { // no validation rules for Version - if v, ok := interface{}(m.GetResource()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetResource()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ResourceValidationError{ Field: "Resource", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go index 5efce07c8d8b..4d89c90d182e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go @@ -52,9 +52,7 @@ func (m *ClusterLoadAssignment) Validate() error { for idx, item := range m.GetEndpoints() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterLoadAssignmentValidationError{ Field: fmt.Sprintf("Endpoints[%v]", idx), @@ -66,9 +64,7 @@ func (m *ClusterLoadAssignment) Validate() error { } - if v, ok := interface{}(m.GetPolicy()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPolicy()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterLoadAssignmentValidationError{ Field: "Policy", @@ -123,9 +119,7 @@ func (m *ClusterLoadAssignment_Policy) Validate() error { for idx, item := range m.GetDropOverloads() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterLoadAssignment_PolicyValidationError{ Field: fmt.Sprintf("DropOverloads[%v]", idx), @@ -198,9 +192,7 @@ func (m *ClusterLoadAssignment_Policy_DropOverload) Validate() error { } } - if v, ok := interface{}(m.GetDropPercentage()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDropPercentage()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterLoadAssignment_Policy_DropOverloadValidationError{ Field: "DropPercentage", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go index fdfcee378bd1..c52d2f80d9f9 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go @@ -41,9 +41,7 @@ func (m *Endpoint) Validate() error { return nil } - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EndpointValidationError{ Field: "Address", @@ -53,9 +51,7 @@ func (m *Endpoint) Validate() error { } } - if v, ok := interface{}(m.GetHealthCheckConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthCheckConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EndpointValidationError{ Field: "HealthCheckConfig", @@ -106,9 +102,7 @@ func (m *LbEndpoint) Validate() error { return nil } - if v, ok := interface{}(m.GetEndpoint()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEndpoint()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LbEndpointValidationError{ Field: "Endpoint", @@ -120,9 +114,7 @@ func (m *LbEndpoint) Validate() error { // no validation rules for HealthStatus - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LbEndpointValidationError{ Field: "Metadata", @@ -185,9 +177,7 @@ func (m *LocalityLbEndpoints) Validate() error { return nil } - if v, ok := interface{}(m.GetLocality()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LocalityLbEndpointsValidationError{ Field: "Locality", @@ -200,9 +190,7 @@ func (m *LocalityLbEndpoints) Validate() error { for idx, item := range m.GetLbEndpoints() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LocalityLbEndpointsValidationError{ Field: fmt.Sprintf("LbEndpoints[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go index b262e53a33c0..13d292f22d96 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go @@ -42,9 +42,7 @@ func (m *UpstreamLocalityStats) Validate() error { return nil } - if v, ok := interface{}(m.GetLocality()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamLocalityStatsValidationError{ Field: "Locality", @@ -63,9 +61,7 @@ func (m *UpstreamLocalityStats) Validate() error { for idx, item := range m.GetLoadMetricStats() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamLocalityStatsValidationError{ Field: fmt.Sprintf("LoadMetricStats[%v]", idx), @@ -80,9 +76,7 @@ func (m *UpstreamLocalityStats) Validate() error { for idx, item := range m.GetUpstreamEndpointStats() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamLocalityStatsValidationError{ Field: fmt.Sprintf("UpstreamEndpointStats[%v]", idx), @@ -138,9 +132,7 @@ func (m *UpstreamEndpointStats) Validate() error { return nil } - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamEndpointStatsValidationError{ Field: "Address", @@ -159,9 +151,7 @@ func (m *UpstreamEndpointStats) Validate() error { for idx, item := range m.GetLoadMetricStats() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return UpstreamEndpointStatsValidationError{ Field: fmt.Sprintf("LoadMetricStats[%v]", idx), @@ -280,9 +270,7 @@ func (m *ClusterStats) Validate() error { for idx, item := range m.GetUpstreamLocalityStats() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterStatsValidationError{ Field: fmt.Sprintf("UpstreamLocalityStats[%v]", idx), @@ -299,9 +287,7 @@ func (m *ClusterStats) Validate() error { for idx, item := range m.GetDroppedRequests() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterStatsValidationError{ Field: fmt.Sprintf("DroppedRequests[%v]", idx), @@ -313,9 +299,7 @@ func (m *ClusterStats) Validate() error { } - if v, ok := interface{}(m.GetLoadReportInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLoadReportInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterStatsValidationError{ Field: "LoadReportInterval", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go index db7f3c29012e..1e9300fe5e6d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go @@ -43,9 +43,7 @@ func (m *Listener) Validate() error { // no validation rules for Name - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "Address", @@ -65,9 +63,7 @@ func (m *Listener) Validate() error { for idx, item := range m.GetFilterChains() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: fmt.Sprintf("FilterChains[%v]", idx), @@ -79,9 +75,7 @@ func (m *Listener) Validate() error { } - if v, ok := interface{}(m.GetUseOriginalDst()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseOriginalDst()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "UseOriginalDst", @@ -91,9 +85,7 @@ func (m *Listener) Validate() error { } } - if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "PerConnectionBufferLimitBytes", @@ -103,9 +95,7 @@ func (m *Listener) Validate() error { } } - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "Metadata", @@ -115,9 +105,7 @@ func (m *Listener) Validate() error { } } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "DeprecatedV1", @@ -132,9 +120,7 @@ func (m *Listener) Validate() error { for idx, item := range m.GetListenerFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: fmt.Sprintf("ListenerFilters[%v]", idx), @@ -146,9 +132,7 @@ func (m *Listener) Validate() error { } - if v, ok := interface{}(m.GetTransparent()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTransparent()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "Transparent", @@ -158,9 +142,7 @@ func (m *Listener) Validate() error { } } - if v, ok := interface{}(m.GetFreebind()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFreebind()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "Freebind", @@ -173,9 +155,7 @@ func (m *Listener) Validate() error { for idx, item := range m.GetSocketOptions() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: fmt.Sprintf("SocketOptions[%v]", idx), @@ -187,9 +167,7 @@ func (m *Listener) Validate() error { } - if v, ok := interface{}(m.GetTcpFastOpenQueueLength()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTcpFastOpenQueueLength()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ Field: "TcpFastOpenQueueLength", @@ -241,9 +219,7 @@ func (m *Listener_DeprecatedV1) Validate() error { return nil } - if v, ok := interface{}(m.GetBindToPort()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetBindToPort()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Listener_DeprecatedV1ValidationError{ Field: "BindToPort", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go index 45251b7b49d3..ceec95ab7732 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go @@ -48,9 +48,7 @@ func (m *Filter) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterValidationError{ Field: "Config", @@ -60,9 +58,7 @@ func (m *Filter) Validate() error { } } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterValidationError{ Field: "DeprecatedV1", @@ -128,9 +124,7 @@ func (m *FilterChainMatch) Validate() error { for idx, item := range m.GetPrefixRanges() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainMatchValidationError{ Field: fmt.Sprintf("PrefixRanges[%v]", idx), @@ -144,9 +138,7 @@ func (m *FilterChainMatch) Validate() error { // no validation rules for AddressSuffix - if v, ok := interface{}(m.GetSuffixLen()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSuffixLen()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainMatchValidationError{ Field: "SuffixLen", @@ -159,9 +151,7 @@ func (m *FilterChainMatch) Validate() error { for idx, item := range m.GetSourcePrefixRanges() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainMatchValidationError{ Field: fmt.Sprintf("SourcePrefixRanges[%v]", idx), @@ -176,9 +166,7 @@ func (m *FilterChainMatch) Validate() error { for idx, item := range m.GetSourcePorts() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainMatchValidationError{ Field: fmt.Sprintf("SourcePorts[%v]", idx), @@ -234,9 +222,7 @@ func (m *FilterChain) Validate() error { return nil } - if v, ok := interface{}(m.GetFilterChainMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFilterChainMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: "FilterChainMatch", @@ -246,9 +232,7 @@ func (m *FilterChain) Validate() error { } } - if v, ok := interface{}(m.GetTlsContext()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsContext()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: "TlsContext", @@ -261,9 +245,7 @@ func (m *FilterChain) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: fmt.Sprintf("Filters[%v]", idx), @@ -275,9 +257,7 @@ func (m *FilterChain) Validate() error { } - if v, ok := interface{}(m.GetUseProxyProto()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseProxyProto()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: "UseProxyProto", @@ -287,9 +267,7 @@ func (m *FilterChain) Validate() error { } } - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: "Metadata", @@ -299,9 +277,7 @@ func (m *FilterChain) Validate() error { } } - if v, ok := interface{}(m.GetTransportSocket()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTransportSocket()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ Field: "TransportSocket", @@ -360,9 +336,7 @@ func (m *ListenerFilter) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerFilterValidationError{ Field: "Config", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit/ratelimit.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit/ratelimit.pb.validate.go index 626d9a877369..34480f7b6ffa 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit/ratelimit.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit/ratelimit.pb.validate.go @@ -52,9 +52,7 @@ func (m *RateLimitDescriptor) Validate() error { for idx, item := range m.GetEntries() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitDescriptorValidationError{ Field: fmt.Sprintf("Entries[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go index ac1b115bdab8..a7a52165c661 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go @@ -47,9 +47,7 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetVirtualHosts() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteConfigurationValidationError{ Field: fmt.Sprintf("VirtualHosts[%v]", idx), @@ -64,9 +62,7 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteConfigurationValidationError{ Field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), @@ -81,9 +77,7 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteConfigurationValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -95,9 +89,7 @@ func (m *RouteConfiguration) Validate() error { } - if v, ok := interface{}(m.GetValidateClusters()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValidateClusters()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteConfigurationValidationError{ Field: "ValidateClusters", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go index 701531875c09..82f5effe4545 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go @@ -60,7 +60,7 @@ func (x VirtualHost_TlsRequirementType) String() string { return proto.EnumName(VirtualHost_TlsRequirementType_name, int32(x)) } func (VirtualHost_TlsRequirementType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{0, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{0, 0} } type RouteAction_ClusterNotFoundResponseCode int32 @@ -85,7 +85,7 @@ func (x RouteAction_ClusterNotFoundResponseCode) String() string { return proto.EnumName(RouteAction_ClusterNotFoundResponseCode_name, int32(x)) } func (RouteAction_ClusterNotFoundResponseCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 0} } type RedirectAction_RedirectResponseCode int32 @@ -122,7 +122,7 @@ func (x RedirectAction_RedirectResponseCode) String() string { return proto.EnumName(RedirectAction_RedirectResponseCode_name, int32(x)) } func (RedirectAction_RedirectResponseCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{6, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{6, 0} } // The top level element in the routing configuration is a virtual host. Each virtual host has @@ -193,7 +193,7 @@ func (m *VirtualHost) Reset() { *m = VirtualHost{} } func (m *VirtualHost) String() string { return proto.CompactTextString(m) } func (*VirtualHost) ProtoMessage() {} func (*VirtualHost) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{0} } func (m *VirtualHost) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -354,7 +354,7 @@ func (m *Route) Reset() { *m = Route{} } func (m *Route) String() string { return proto.CompactTextString(m) } func (*Route) ProtoMessage() {} func (*Route) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{1} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{1} } func (m *Route) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -604,7 +604,7 @@ func (m *WeightedCluster) Reset() { *m = WeightedCluster{} } func (m *WeightedCluster) String() string { return proto.CompactTextString(m) } func (*WeightedCluster) ProtoMessage() {} func (*WeightedCluster) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{2} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{2} } func (m *WeightedCluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -701,7 +701,7 @@ func (m *WeightedCluster_ClusterWeight) Reset() { *m = WeightedCluster_C func (m *WeightedCluster_ClusterWeight) String() string { return proto.CompactTextString(m) } func (*WeightedCluster_ClusterWeight) ProtoMessage() {} func (*WeightedCluster_ClusterWeight) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{2, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{2, 0} } func (m *WeightedCluster_ClusterWeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -819,7 +819,7 @@ func (m *RouteMatch) Reset() { *m = RouteMatch{} } func (m *RouteMatch) String() string { return proto.CompactTextString(m) } func (*RouteMatch) ProtoMessage() {} func (*RouteMatch) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{3} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{3} } func (m *RouteMatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1037,7 +1037,7 @@ func (m *CorsPolicy) Reset() { *m = CorsPolicy{} } func (m *CorsPolicy) String() string { return proto.CompactTextString(m) } func (*CorsPolicy) ProtoMessage() {} func (*CorsPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{4} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{4} } func (m *CorsPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1179,8 +1179,8 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // :ref:`retry overview `. Timeout *time.Duration `protobuf:"bytes,8,opt,name=timeout,stdduration" json:"timeout,omitempty"` - // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout - // specified, although the connection manager wide :ref:`stream_idle_timeout + // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout, + // although the connection manager wide :ref:`stream_idle_timeout // ` // will still apply. A value of 0 will completely disable the route's idle timeout, even if a // connection manager stream idle timeout is configured. @@ -1269,7 +1269,7 @@ func (m *RouteAction) Reset() { *m = RouteAction{} } func (m *RouteAction) String() string { return proto.CompactTextString(m) } func (*RouteAction) ProtoMessage() {} func (*RouteAction) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5} } func (m *RouteAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1674,7 +1674,7 @@ func (m *RouteAction_RetryPolicy) Reset() { *m = RouteAction_RetryPolicy func (m *RouteAction_RetryPolicy) String() string { return proto.CompactTextString(m) } func (*RouteAction_RetryPolicy) ProtoMessage() {} func (*RouteAction_RetryPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 0} } func (m *RouteAction_RetryPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1751,7 +1751,7 @@ func (m *RouteAction_RequestMirrorPolicy) Reset() { *m = RouteAction_Req func (m *RouteAction_RequestMirrorPolicy) String() string { return proto.CompactTextString(m) } func (*RouteAction_RequestMirrorPolicy) ProtoMessage() {} func (*RouteAction_RequestMirrorPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 1} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 1} } func (m *RouteAction_RequestMirrorPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1811,7 +1811,7 @@ func (m *RouteAction_HashPolicy) Reset() { *m = RouteAction_HashPolicy{} func (m *RouteAction_HashPolicy) String() string { return proto.CompactTextString(m) } func (*RouteAction_HashPolicy) ProtoMessage() {} func (*RouteAction_HashPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 2} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 2} } func (m *RouteAction_HashPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1995,7 +1995,7 @@ func (m *RouteAction_HashPolicy_Header) Reset() { *m = RouteAction_HashP func (m *RouteAction_HashPolicy_Header) String() string { return proto.CompactTextString(m) } func (*RouteAction_HashPolicy_Header) ProtoMessage() {} func (*RouteAction_HashPolicy_Header) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 2, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 2, 0} } func (m *RouteAction_HashPolicy_Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2066,7 +2066,7 @@ func (m *RouteAction_HashPolicy_Cookie) Reset() { *m = RouteAction_HashP func (m *RouteAction_HashPolicy_Cookie) String() string { return proto.CompactTextString(m) } func (*RouteAction_HashPolicy_Cookie) ProtoMessage() {} func (*RouteAction_HashPolicy_Cookie) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 2, 1} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 2, 1} } func (m *RouteAction_HashPolicy_Cookie) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2132,7 +2132,7 @@ func (m *RouteAction_HashPolicy_ConnectionProperties) String() string { } func (*RouteAction_HashPolicy_ConnectionProperties) ProtoMessage() {} func (*RouteAction_HashPolicy_ConnectionProperties) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 2, 2} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 2, 2} } func (m *RouteAction_HashPolicy_ConnectionProperties) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2198,7 +2198,7 @@ func (m *RouteAction_WebSocketProxyConfig) Reset() { *m = RouteAction_We func (m *RouteAction_WebSocketProxyConfig) String() string { return proto.CompactTextString(m) } func (*RouteAction_WebSocketProxyConfig) ProtoMessage() {} func (*RouteAction_WebSocketProxyConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{5, 3} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{5, 3} } func (m *RouteAction_WebSocketProxyConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2272,7 +2272,7 @@ func (m *RedirectAction) Reset() { *m = RedirectAction{} } func (m *RedirectAction) String() string { return proto.CompactTextString(m) } func (*RedirectAction) ProtoMessage() {} func (*RedirectAction) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{6} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{6} } func (m *RedirectAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2454,7 +2454,7 @@ func (m *DirectResponseAction) Reset() { *m = DirectResponseAction{} } func (m *DirectResponseAction) String() string { return proto.CompactTextString(m) } func (*DirectResponseAction) ProtoMessage() {} func (*DirectResponseAction) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{7} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{7} } func (m *DirectResponseAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2516,7 +2516,7 @@ func (m *Decorator) Reset() { *m = Decorator{} } func (m *Decorator) String() string { return proto.CompactTextString(m) } func (*Decorator) ProtoMessage() {} func (*Decorator) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{8} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{8} } func (m *Decorator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2598,7 +2598,7 @@ func (m *VirtualCluster) Reset() { *m = VirtualCluster{} } func (m *VirtualCluster) String() string { return proto.CompactTextString(m) } func (*VirtualCluster) ProtoMessage() {} func (*VirtualCluster) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{9} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{9} } func (m *VirtualCluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2676,7 +2676,7 @@ func (m *RateLimit) Reset() { *m = RateLimit{} } func (m *RateLimit) String() string { return proto.CompactTextString(m) } func (*RateLimit) ProtoMessage() {} func (*RateLimit) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10} } func (m *RateLimit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2744,7 +2744,7 @@ func (m *RateLimit_Action) Reset() { *m = RateLimit_Action{} } func (m *RateLimit_Action) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action) ProtoMessage() {} func (*RateLimit_Action) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0} } func (m *RateLimit_Action) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3022,7 +3022,7 @@ func (m *RateLimit_Action_SourceCluster) Reset() { *m = RateLimit_Action func (m *RateLimit_Action_SourceCluster) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_SourceCluster) ProtoMessage() {} func (*RateLimit_Action_SourceCluster) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 0} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 0} } func (m *RateLimit_Action_SourceCluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3077,7 +3077,7 @@ func (m *RateLimit_Action_DestinationCluster) Reset() { *m = RateLimit_A func (m *RateLimit_Action_DestinationCluster) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_DestinationCluster) ProtoMessage() {} func (*RateLimit_Action_DestinationCluster) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 1} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 1} } func (m *RateLimit_Action_DestinationCluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3128,7 +3128,7 @@ func (m *RateLimit_Action_RequestHeaders) Reset() { *m = RateLimit_Actio func (m *RateLimit_Action_RequestHeaders) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_RequestHeaders) ProtoMessage() {} func (*RateLimit_Action_RequestHeaders) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 2} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 2} } func (m *RateLimit_Action_RequestHeaders) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3187,7 +3187,7 @@ func (m *RateLimit_Action_RemoteAddress) Reset() { *m = RateLimit_Action func (m *RateLimit_Action_RemoteAddress) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_RemoteAddress) ProtoMessage() {} func (*RateLimit_Action_RemoteAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 3} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 3} } func (m *RateLimit_Action_RemoteAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3233,7 +3233,7 @@ func (m *RateLimit_Action_GenericKey) Reset() { *m = RateLimit_Action_Ge func (m *RateLimit_Action_GenericKey) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_GenericKey) ProtoMessage() {} func (*RateLimit_Action_GenericKey) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 4} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 4} } func (m *RateLimit_Action_GenericKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3297,7 +3297,7 @@ func (m *RateLimit_Action_HeaderValueMatch) Reset() { *m = RateLimit_Act func (m *RateLimit_Action_HeaderValueMatch) String() string { return proto.CompactTextString(m) } func (*RateLimit_Action_HeaderValueMatch) ProtoMessage() {} func (*RateLimit_Action_HeaderValueMatch) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{10, 0, 5} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{10, 0, 5} } func (m *RateLimit_Action_HeaderValueMatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3361,7 +3361,7 @@ func (m *RateLimit_Action_HeaderValueMatch) GetHeaders() []*HeaderMatcher { // // { // "name": ":method", -// "value": "POST" +// "exact_match": "POST" // } // // .. attention:: @@ -3399,7 +3399,7 @@ func (m *HeaderMatcher) Reset() { *m = HeaderMatcher{} } func (m *HeaderMatcher) String() string { return proto.CompactTextString(m) } func (*HeaderMatcher) ProtoMessage() {} func (*HeaderMatcher) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{11} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{11} } func (m *HeaderMatcher) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3681,7 +3681,7 @@ func (m *QueryParameterMatcher) Reset() { *m = QueryParameterMatcher{} } func (m *QueryParameterMatcher) String() string { return proto.CompactTextString(m) } func (*QueryParameterMatcher) ProtoMessage() {} func (*QueryParameterMatcher) Descriptor() ([]byte, []int) { - return fileDescriptor_route_368581977423dd10, []int{12} + return fileDescriptor_route_96a4a6ec7f1da9a9, []int{12} } func (m *QueryParameterMatcher) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -14002,10 +14002,10 @@ var ( ) func init() { - proto.RegisterFile("envoy/api/v2/route/route.proto", fileDescriptor_route_368581977423dd10) + proto.RegisterFile("envoy/api/v2/route/route.proto", fileDescriptor_route_96a4a6ec7f1da9a9) } -var fileDescriptor_route_368581977423dd10 = []byte{ +var fileDescriptor_route_96a4a6ec7f1da9a9 = []byte{ // 2979 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, 0xf5, 0xe7, 0xf2, 0x9b, 0x8f, 0x5f, 0xab, 0xb1, 0x2c, 0xd1, 0x74, 0x62, 0xcb, 0xb4, 0xfd, 0x8f, diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go index 9a0e4cbfb65b..9b22fb81951c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go @@ -59,9 +59,7 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: fmt.Sprintf("Routes[%v]", idx), @@ -78,9 +76,7 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetVirtualClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: fmt.Sprintf("VirtualClusters[%v]", idx), @@ -95,9 +91,7 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRateLimits() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: fmt.Sprintf("RateLimits[%v]", idx), @@ -112,9 +106,7 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -129,9 +121,7 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), @@ -143,9 +133,7 @@ func (m *VirtualHost) Validate() error { } - if v, ok := interface{}(m.GetCors()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCors()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return VirtualHostValidationError{ Field: "Cors", @@ -198,9 +186,7 @@ func (m *Route) Validate() error { return nil } - if v, ok := interface{}(m.GetMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Match", @@ -210,9 +196,7 @@ func (m *Route) Validate() error { } } - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Metadata", @@ -222,9 +206,7 @@ func (m *Route) Validate() error { } } - if v, ok := interface{}(m.GetDecorator()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDecorator()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Decorator", @@ -239,9 +221,7 @@ func (m *Route) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -256,9 +236,7 @@ func (m *Route) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), @@ -274,9 +252,7 @@ func (m *Route) Validate() error { case *Route_Route: - if v, ok := interface{}(m.GetRoute()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRoute()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Route", @@ -288,9 +264,7 @@ func (m *Route) Validate() error { case *Route_Redirect: - if v, ok := interface{}(m.GetRedirect()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRedirect()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Redirect", @@ -302,9 +276,7 @@ func (m *Route) Validate() error { case *Route_DirectResponse: - if v, ok := interface{}(m.GetDirectResponse()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDirectResponse()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "DirectResponse", @@ -374,9 +346,7 @@ func (m *WeightedCluster) Validate() error { for idx, item := range m.GetClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WeightedClusterValidationError{ Field: fmt.Sprintf("Clusters[%v]", idx), @@ -442,9 +412,7 @@ func (m *RouteMatch) Validate() error { return nil } - if v, ok := interface{}(m.GetCaseSensitive()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCaseSensitive()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteMatchValidationError{ Field: "CaseSensitive", @@ -454,9 +422,7 @@ func (m *RouteMatch) Validate() error { } } - if v, ok := interface{}(m.GetRuntime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRuntime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteMatchValidationError{ Field: "Runtime", @@ -469,9 +435,7 @@ func (m *RouteMatch) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteMatchValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), @@ -486,9 +450,7 @@ func (m *RouteMatch) Validate() error { for idx, item := range m.GetQueryParameters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteMatchValidationError{ Field: fmt.Sprintf("QueryParameters[%v]", idx), @@ -586,9 +548,7 @@ func (m *CorsPolicy) Validate() error { // no validation rules for MaxAge - if v, ok := interface{}(m.GetAllowCredentials()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAllowCredentials()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CorsPolicyValidationError{ Field: "AllowCredentials", @@ -598,9 +558,7 @@ func (m *CorsPolicy) Validate() error { } } - if v, ok := interface{}(m.GetEnabled()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEnabled()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CorsPolicyValidationError{ Field: "Enabled", @@ -659,9 +617,7 @@ func (m *RouteAction) Validate() error { } } - if v, ok := interface{}(m.GetMetadataMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "MetadataMatch", @@ -673,9 +629,7 @@ func (m *RouteAction) Validate() error { // no validation rules for PrefixRewrite - if v, ok := interface{}(m.GetTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "Timeout", @@ -699,9 +653,7 @@ func (m *RouteAction) Validate() error { } - if v, ok := interface{}(m.GetRetryPolicy()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRetryPolicy()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "RetryPolicy", @@ -711,9 +663,7 @@ func (m *RouteAction) Validate() error { } } - if v, ok := interface{}(m.GetRequestMirrorPolicy()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequestMirrorPolicy()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "RequestMirrorPolicy", @@ -728,9 +678,7 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -745,9 +693,7 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), @@ -762,9 +708,7 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetRateLimits() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: fmt.Sprintf("RateLimits[%v]", idx), @@ -776,9 +720,7 @@ func (m *RouteAction) Validate() error { } - if v, ok := interface{}(m.GetIncludeVhRateLimits()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIncludeVhRateLimits()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "IncludeVhRateLimits", @@ -791,9 +733,7 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetHashPolicy() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: fmt.Sprintf("HashPolicy[%v]", idx), @@ -805,9 +745,7 @@ func (m *RouteAction) Validate() error { } - if v, ok := interface{}(m.GetUseWebsocket()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseWebsocket()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "UseWebsocket", @@ -817,9 +755,7 @@ func (m *RouteAction) Validate() error { } } - if v, ok := interface{}(m.GetWebsocketConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetWebsocketConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "WebsocketConfig", @@ -829,9 +765,7 @@ func (m *RouteAction) Validate() error { } } - if v, ok := interface{}(m.GetCors()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCors()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "Cors", @@ -841,9 +775,7 @@ func (m *RouteAction) Validate() error { } } - if v, ok := interface{}(m.GetMaxGrpcTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMaxGrpcTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "MaxGrpcTimeout", @@ -875,9 +807,7 @@ func (m *RouteAction) Validate() error { case *RouteAction_WeightedClusters: - if v, ok := interface{}(m.GetWeightedClusters()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetWeightedClusters()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "WeightedClusters", @@ -902,9 +832,7 @@ func (m *RouteAction) Validate() error { case *RouteAction_AutoHostRewrite: - if v, ok := interface{}(m.GetAutoHostRewrite()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAutoHostRewrite()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ Field: "AutoHostRewrite", @@ -1030,9 +958,7 @@ func (m *DirectResponseAction) Validate() error { } } - if v, ok := interface{}(m.GetBody()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetBody()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DirectResponseActionValidationError{ Field: "Body", @@ -1212,9 +1138,7 @@ func (m *RateLimit) Validate() error { for idx, item := range m.GetActions() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitValidationError{ Field: fmt.Sprintf("Actions[%v]", idx), @@ -1293,9 +1217,7 @@ func (m *HeaderMatcher) Validate() error { case *HeaderMatcher_RangeMatch: - if v, ok := interface{}(m.GetRangeMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRangeMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HeaderMatcherValidationError{ Field: "RangeMatch", @@ -1379,9 +1301,7 @@ func (m *QueryParameterMatcher) Validate() error { // no validation rules for Value - if v, ok := interface{}(m.GetRegex()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRegex()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return QueryParameterMatcherValidationError{ Field: "Regex", @@ -1440,9 +1360,7 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { } } - if v, ok := interface{}(m.GetWeight()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetWeight()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WeightedCluster_ClusterWeightValidationError{ Field: "Weight", @@ -1452,9 +1370,7 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { } } - if v, ok := interface{}(m.GetMetadataMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WeightedCluster_ClusterWeightValidationError{ Field: "MetadataMatch", @@ -1467,9 +1383,7 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WeightedCluster_ClusterWeightValidationError{ Field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), @@ -1484,9 +1398,7 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WeightedCluster_ClusterWeightValidationError{ Field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), @@ -1545,9 +1457,7 @@ func (m *RouteAction_RetryPolicy) Validate() error { // no validation rules for RetryOn - if v, ok := interface{}(m.GetNumRetries()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNumRetries()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_RetryPolicyValidationError{ Field: "NumRetries", @@ -1557,9 +1467,7 @@ func (m *RouteAction_RetryPolicy) Validate() error { } } - if v, ok := interface{}(m.GetPerTryTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPerTryTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_RetryPolicyValidationError{ Field: "PerTryTimeout", @@ -1667,9 +1575,7 @@ func (m *RouteAction_HashPolicy) Validate() error { case *RouteAction_HashPolicy_Header_: - if v, ok := interface{}(m.GetHeader()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_HashPolicyValidationError{ Field: "Header", @@ -1681,9 +1587,7 @@ func (m *RouteAction_HashPolicy) Validate() error { case *RouteAction_HashPolicy_Cookie_: - if v, ok := interface{}(m.GetCookie()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCookie()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_HashPolicyValidationError{ Field: "Cookie", @@ -1695,9 +1599,7 @@ func (m *RouteAction_HashPolicy) Validate() error { case *RouteAction_HashPolicy_ConnectionProperties_: - if v, ok := interface{}(m.GetConnectionProperties()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConnectionProperties()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_HashPolicyValidationError{ Field: "ConnectionProperties", @@ -1884,9 +1786,7 @@ func (m *RouteAction_HashPolicy_Cookie) Validate() error { } } - if v, ok := interface{}(m.GetTtl()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTtl()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteAction_HashPolicy_CookieValidationError{ Field: "Ttl", @@ -1990,9 +1890,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_SourceCluster_: - if v, ok := interface{}(m.GetSourceCluster()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSourceCluster()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "SourceCluster", @@ -2004,9 +1902,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_DestinationCluster_: - if v, ok := interface{}(m.GetDestinationCluster()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDestinationCluster()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "DestinationCluster", @@ -2018,9 +1914,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_RequestHeaders_: - if v, ok := interface{}(m.GetRequestHeaders()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequestHeaders()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "RequestHeaders", @@ -2032,9 +1926,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_RemoteAddress_: - if v, ok := interface{}(m.GetRemoteAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRemoteAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "RemoteAddress", @@ -2046,9 +1938,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_GenericKey_: - if v, ok := interface{}(m.GetGenericKey()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGenericKey()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "GenericKey", @@ -2060,9 +1950,7 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_HeaderValueMatch_: - if v, ok := interface{}(m.GetHeaderValueMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeaderValueMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_ActionValidationError{ Field: "HeaderValueMatch", @@ -2365,9 +2253,7 @@ func (m *RateLimit_Action_HeaderValueMatch) Validate() error { } } - if v, ok := interface{}(m.GetExpectMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetExpectMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_Action_HeaderValueMatchValidationError{ Field: "ExpectMatch", @@ -2387,9 +2273,7 @@ func (m *RateLimit_Action_HeaderValueMatch) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimit_Action_HeaderValueMatchValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go index a9390f75277e..5befffd7cc4f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go @@ -49,9 +49,7 @@ func (m *HttpGrpcAccessLogConfig) Validate() error { } } - if v, ok := interface{}(m.GetCommonConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpGrpcAccessLogConfigValidationError{ Field: "CommonConfig", @@ -110,9 +108,7 @@ func (m *TcpGrpcAccessLogConfig) Validate() error { } } - if v, ok := interface{}(m.GetCommonConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpGrpcAccessLogConfigValidationError{ Field: "CommonConfig", @@ -178,9 +174,7 @@ func (m *CommonGrpcAccessLogConfig) Validate() error { } } - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CommonGrpcAccessLogConfigValidationError{ Field: "GrpcService", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go index 48703e639db9..d4cfe3e294e3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go @@ -41,9 +41,7 @@ func (m *Bootstrap) Validate() error { return nil } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "Node", @@ -53,9 +51,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetStaticResources()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStaticResources()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "StaticResources", @@ -65,9 +61,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetDynamicResources()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDynamicResources()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "DynamicResources", @@ -77,9 +71,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetClusterManager()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetClusterManager()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "ClusterManager", @@ -89,9 +81,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetHdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "HdsConfig", @@ -106,9 +96,7 @@ func (m *Bootstrap) Validate() error { for idx, item := range m.GetStatsSinks() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: fmt.Sprintf("StatsSinks[%v]", idx), @@ -120,9 +108,7 @@ func (m *Bootstrap) Validate() error { } - if v, ok := interface{}(m.GetStatsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStatsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "StatsConfig", @@ -132,9 +118,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetStatsFlushInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStatsFlushInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "StatsFlushInterval", @@ -144,9 +128,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetWatchdog()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetWatchdog()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "Watchdog", @@ -156,9 +138,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetTracing()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "Tracing", @@ -168,9 +148,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetRateLimitService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRateLimitService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "RateLimitService", @@ -180,9 +158,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetRuntime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRuntime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "Runtime", @@ -192,9 +168,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetAdmin()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAdmin()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "Admin", @@ -204,9 +178,7 @@ func (m *Bootstrap) Validate() error { } } - if v, ok := interface{}(m.GetOverloadManager()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOverloadManager()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ Field: "OverloadManager", @@ -266,9 +238,7 @@ func (m *Admin) Validate() error { // no validation rules for ProfilePath - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AdminValidationError{ Field: "Address", @@ -322,9 +292,7 @@ func (m *ClusterManager) Validate() error { // no validation rules for LocalClusterName - if v, ok := interface{}(m.GetOutlierDetection()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOutlierDetection()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterManagerValidationError{ Field: "OutlierDetection", @@ -334,9 +302,7 @@ func (m *ClusterManager) Validate() error { } } - if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterManagerValidationError{ Field: "UpstreamBindConfig", @@ -346,9 +312,7 @@ func (m *ClusterManager) Validate() error { } } - if v, ok := interface{}(m.GetLoadStatsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLoadStatsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterManagerValidationError{ Field: "LoadStatsConfig", @@ -399,9 +363,7 @@ func (m *Watchdog) Validate() error { return nil } - if v, ok := interface{}(m.GetMissTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMissTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WatchdogValidationError{ Field: "MissTimeout", @@ -411,9 +373,7 @@ func (m *Watchdog) Validate() error { } } - if v, ok := interface{}(m.GetMegamissTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMegamissTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WatchdogValidationError{ Field: "MegamissTimeout", @@ -423,9 +383,7 @@ func (m *Watchdog) Validate() error { } } - if v, ok := interface{}(m.GetKillTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetKillTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WatchdogValidationError{ Field: "KillTimeout", @@ -435,9 +393,7 @@ func (m *Watchdog) Validate() error { } } - if v, ok := interface{}(m.GetMultikillTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMultikillTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return WatchdogValidationError{ Field: "MultikillTimeout", @@ -544,9 +500,7 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetListeners() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_StaticResourcesValidationError{ Field: fmt.Sprintf("Listeners[%v]", idx), @@ -561,9 +515,7 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetClusters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_StaticResourcesValidationError{ Field: fmt.Sprintf("Clusters[%v]", idx), @@ -578,9 +530,7 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetSecrets() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_StaticResourcesValidationError{ Field: fmt.Sprintf("Secrets[%v]", idx), @@ -634,9 +584,7 @@ func (m *Bootstrap_DynamicResources) Validate() error { return nil } - if v, ok := interface{}(m.GetLdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_DynamicResourcesValidationError{ Field: "LdsConfig", @@ -646,9 +594,7 @@ func (m *Bootstrap_DynamicResources) Validate() error { } } - if v, ok := interface{}(m.GetCdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_DynamicResourcesValidationError{ Field: "CdsConfig", @@ -658,9 +604,7 @@ func (m *Bootstrap_DynamicResources) Validate() error { } } - if v, ok := interface{}(m.GetAdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_DynamicResourcesValidationError{ Field: "AdsConfig", @@ -670,9 +614,7 @@ func (m *Bootstrap_DynamicResources) Validate() error { } } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_DynamicResourcesValidationError{ Field: "DeprecatedV1", @@ -724,9 +666,7 @@ func (m *Bootstrap_DynamicResources_DeprecatedV1) Validate() error { return nil } - if v, ok := interface{}(m.GetSdsConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSdsConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Bootstrap_DynamicResources_DeprecatedV1ValidationError{ Field: "SdsConfig", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go index 5475697add7a..2502cfac2a45 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go @@ -43,9 +43,7 @@ func (m *AccessLog) Validate() error { // no validation rules for Name - if v, ok := interface{}(m.GetFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogValidationError{ Field: "Filter", @@ -55,9 +53,7 @@ func (m *AccessLog) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogValidationError{ Field: "Config", @@ -113,9 +109,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_StatusCodeFilter: - if v, ok := interface{}(m.GetStatusCodeFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStatusCodeFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "StatusCodeFilter", @@ -127,9 +121,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_DurationFilter: - if v, ok := interface{}(m.GetDurationFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDurationFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "DurationFilter", @@ -141,9 +133,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_NotHealthCheckFilter: - if v, ok := interface{}(m.GetNotHealthCheckFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNotHealthCheckFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "NotHealthCheckFilter", @@ -155,9 +145,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_TraceableFilter: - if v, ok := interface{}(m.GetTraceableFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTraceableFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "TraceableFilter", @@ -169,9 +157,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_RuntimeFilter: - if v, ok := interface{}(m.GetRuntimeFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRuntimeFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "RuntimeFilter", @@ -183,9 +169,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_AndFilter: - if v, ok := interface{}(m.GetAndFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAndFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "AndFilter", @@ -197,9 +181,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_OrFilter: - if v, ok := interface{}(m.GetOrFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOrFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "OrFilter", @@ -211,9 +193,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_HeaderFilter: - if v, ok := interface{}(m.GetHeaderFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeaderFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "HeaderFilter", @@ -225,9 +205,7 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_ResponseFlagFilter: - if v, ok := interface{}(m.GetResponseFlagFilter()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetResponseFlagFilter()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogFilterValidationError{ Field: "ResponseFlagFilter", @@ -294,9 +272,7 @@ func (m *ComparisonFilter) Validate() error { } } - if v, ok := interface{}(m.GetValue()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ComparisonFilterValidationError{ Field: "Value", @@ -355,9 +331,7 @@ func (m *StatusCodeFilter) Validate() error { } } - if v, ok := interface{}(m.GetComparison()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetComparison()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatusCodeFilterValidationError{ Field: "Comparison", @@ -416,9 +390,7 @@ func (m *DurationFilter) Validate() error { } } - if v, ok := interface{}(m.GetComparison()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetComparison()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DurationFilterValidationError{ Field: "Comparison", @@ -561,9 +533,7 @@ func (m *RuntimeFilter) Validate() error { } } - if v, ok := interface{}(m.GetPercentSampled()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPercentSampled()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RuntimeFilterValidationError{ Field: "PercentSampled", @@ -626,9 +596,7 @@ func (m *AndFilter) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AndFilterValidationError{ Field: fmt.Sprintf("Filters[%v]", idx), @@ -691,9 +659,7 @@ func (m *OrFilter) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OrFilterValidationError{ Field: fmt.Sprintf("Filters[%v]", idx), @@ -754,9 +720,7 @@ func (m *HeaderFilter) Validate() error { } } - if v, ok := interface{}(m.GetHeader()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HeaderFilterValidationError{ Field: "Header", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go index 15bde43a4f09..41a792e1b280 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go @@ -55,9 +55,7 @@ func (m *FaultDelay) Validate() error { } } - if v, ok := interface{}(m.GetPercentage()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPercentage()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FaultDelayValidationError{ Field: "Percentage", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go index d1b0e2243a5a..57b3ae3f9d4e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go @@ -135,9 +135,7 @@ func (m *BufferPerRoute) Validate() error { } } - if v, ok := interface{}(m.GetBuffer()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetBuffer()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BufferPerRouteValidationError{ Field: "Buffer", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.pb.validate.go index 36299c292f72..2eaedf4a4f2d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.pb.validate.go @@ -47,9 +47,7 @@ func (m *ExtAuthz) Validate() error { case *ExtAuthz_GrpcService: - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ExtAuthzValidationError{ Field: "GrpcService", @@ -61,9 +59,7 @@ func (m *ExtAuthz) Validate() error { case *ExtAuthz_HttpService: - if v, ok := interface{}(m.GetHttpService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ExtAuthzValidationError{ Field: "HttpService", @@ -117,9 +113,7 @@ func (m *HttpService) Validate() error { return nil } - if v, ok := interface{}(m.GetServerUri()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetServerUri()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpServiceValidationError{ Field: "ServerUri", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go index 03d8ded09721..12d6c5c71acb 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go @@ -48,9 +48,7 @@ func (m *FaultAbort) Validate() error { } } - if v, ok := interface{}(m.GetPercentage()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPercentage()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FaultAbortValidationError{ Field: "Percentage", @@ -120,9 +118,7 @@ func (m *HTTPFault) Validate() error { return nil } - if v, ok := interface{}(m.GetDelay()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDelay()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPFaultValidationError{ Field: "Delay", @@ -132,9 +128,7 @@ func (m *HTTPFault) Validate() error { } } - if v, ok := interface{}(m.GetAbort()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAbort()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPFaultValidationError{ Field: "Abort", @@ -149,9 +143,7 @@ func (m *HTTPFault) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPFaultValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go index 75663e4b26d7..b35a1431f20a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go @@ -44,9 +44,7 @@ func (m *Config) Validate() error { for idx, item := range m.GetRequestRules() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConfigValidationError{ Field: fmt.Sprintf("RequestRules[%v]", idx), @@ -61,9 +59,7 @@ func (m *Config) Validate() error { for idx, item := range m.GetResponseRules() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConfigValidationError{ Field: fmt.Sprintf("ResponseRules[%v]", idx), @@ -179,9 +175,7 @@ func (m *Config_Rule) Validate() error { } } - if v, ok := interface{}(m.GetOnHeaderPresent()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOnHeaderPresent()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Config_RuleValidationError{ Field: "OnHeaderPresent", @@ -191,9 +185,7 @@ func (m *Config_Rule) Validate() error { } } - if v, ok := interface{}(m.GetOnHeaderMissing()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOnHeaderMissing()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Config_RuleValidationError{ Field: "OnHeaderMissing", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go index 95d8b15a341d..66d16f637bd8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go @@ -49,9 +49,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetPassThroughMode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPassThroughMode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "PassThroughMode", @@ -61,9 +59,7 @@ func (m *HealthCheck) Validate() error { } } - if v, ok := interface{}(m.GetCacheTime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCacheTime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: "CacheTime", @@ -78,9 +74,7 @@ func (m *HealthCheck) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go index 086dfdf776cf..e4d7f1c4f2c9 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go @@ -58,9 +58,7 @@ func (m *IPTagging) Validate() error { for idx, item := range m.GetIpTags() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return IPTaggingValidationError{ Field: fmt.Sprintf("IpTags[%v]", idx), @@ -119,9 +117,7 @@ func (m *IPTagging_IPTag) Validate() error { for idx, item := range m.GetIpList() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return IPTagging_IPTagValidationError{ Field: fmt.Sprintf("IpList[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go index e2669f323936..23013ba7679e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go @@ -54,9 +54,7 @@ func (m *JwtProvider) Validate() error { for idx, item := range m.GetFromHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtProviderValidationError{ Field: fmt.Sprintf("FromHeaders[%v]", idx), @@ -74,9 +72,7 @@ func (m *JwtProvider) Validate() error { case *JwtProvider_RemoteJwks: - if v, ok := interface{}(m.GetRemoteJwks()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRemoteJwks()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtProviderValidationError{ Field: "RemoteJwks", @@ -88,9 +84,7 @@ func (m *JwtProvider) Validate() error { case *JwtProvider_LocalJwks: - if v, ok := interface{}(m.GetLocalJwks()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocalJwks()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtProviderValidationError{ Field: "LocalJwks", @@ -149,9 +143,7 @@ func (m *RemoteJwks) Validate() error { return nil } - if v, ok := interface{}(m.GetHttpUri()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpUri()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RemoteJwksValidationError{ Field: "HttpUri", @@ -161,9 +153,7 @@ func (m *RemoteJwks) Validate() error { } } - if v, ok := interface{}(m.GetCacheDuration()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCacheDuration()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RemoteJwksValidationError{ Field: "CacheDuration", @@ -316,9 +306,7 @@ func (m *JwtRequirement) Validate() error { case *JwtRequirement_ProviderAndAudiences: - if v, ok := interface{}(m.GetProviderAndAudiences()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetProviderAndAudiences()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementValidationError{ Field: "ProviderAndAudiences", @@ -330,9 +318,7 @@ func (m *JwtRequirement) Validate() error { case *JwtRequirement_RequiresAny: - if v, ok := interface{}(m.GetRequiresAny()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequiresAny()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementValidationError{ Field: "RequiresAny", @@ -344,9 +330,7 @@ func (m *JwtRequirement) Validate() error { case *JwtRequirement_RequiresAll: - if v, ok := interface{}(m.GetRequiresAll()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequiresAll()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementValidationError{ Field: "RequiresAll", @@ -358,9 +342,7 @@ func (m *JwtRequirement) Validate() error { case *JwtRequirement_AllowMissingOrFailed: - if v, ok := interface{}(m.GetAllowMissingOrFailed()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAllowMissingOrFailed()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementValidationError{ Field: "AllowMissingOrFailed", @@ -424,9 +406,7 @@ func (m *JwtRequirementOrList) Validate() error { for idx, item := range m.GetRequirements() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementOrListValidationError{ Field: fmt.Sprintf("Requirements[%v]", idx), @@ -490,9 +470,7 @@ func (m *JwtRequirementAndList) Validate() error { for idx, item := range m.GetRequirements() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtRequirementAndListValidationError{ Field: fmt.Sprintf("Requirements[%v]", idx), @@ -553,9 +531,7 @@ func (m *RequirementRule) Validate() error { } } - if v, ok := interface{}(m.GetMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RequirementRuleValidationError{ Field: "Match", @@ -565,9 +541,7 @@ func (m *RequirementRule) Validate() error { } } - if v, ok := interface{}(m.GetRequires()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequires()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RequirementRuleValidationError{ Field: "Requires", @@ -624,9 +598,7 @@ func (m *JwtAuthentication) Validate() error { for idx, item := range m.GetRules() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return JwtAuthenticationValidationError{ Field: fmt.Sprintf("Rules[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go index bf64297079da..a4b456ccb720 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go @@ -57,9 +57,7 @@ func (m *RateLimit) Validate() error { // no validation rules for RequestType - if v, ok := interface{}(m.GetTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitValidationError{ Field: "Timeout", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go index 33dacbad0c53..c653f50c1a1b 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go @@ -41,9 +41,7 @@ func (m *RBAC) Validate() error { return nil } - if v, ok := interface{}(m.GetRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RBACValidationError{ Field: "Rules", @@ -53,9 +51,7 @@ func (m *RBAC) Validate() error { } } - if v, ok := interface{}(m.GetShadowRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetShadowRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RBACValidationError{ Field: "ShadowRules", @@ -107,9 +103,7 @@ func (m *RBACPerRoute) Validate() error { return nil } - if v, ok := interface{}(m.GetRbac()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRbac()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RBACPerRouteValidationError{ Field: "Rbac", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/router/v2/router.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/router/v2/router.pb.validate.go index 4fa1639d96ed..b0ef8fc130f4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/router/v2/router.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/router/v2/router.pb.validate.go @@ -41,9 +41,7 @@ func (m *Router) Validate() error { return nil } - if v, ok := interface{}(m.GetDynamicStats()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDynamicStats()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouterValidationError{ Field: "DynamicStats", @@ -58,9 +56,7 @@ func (m *Router) Validate() error { for idx, item := range m.GetUpstreamLog() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouterValidationError{ Field: fmt.Sprintf("UpstreamLog[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/squash/v2/squash.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/squash/v2/squash.pb.validate.go index 26031827acbc..6add8bed7d9e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/squash/v2/squash.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/squash/v2/squash.pb.validate.go @@ -48,9 +48,7 @@ func (m *Squash) Validate() error { } } - if v, ok := interface{}(m.GetAttachmentTemplate()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAttachmentTemplate()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SquashValidationError{ Field: "AttachmentTemplate", @@ -60,9 +58,7 @@ func (m *Squash) Validate() error { } } - if v, ok := interface{}(m.GetRequestTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequestTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SquashValidationError{ Field: "RequestTimeout", @@ -72,9 +68,7 @@ func (m *Squash) Validate() error { } } - if v, ok := interface{}(m.GetAttachmentTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAttachmentTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SquashValidationError{ Field: "AttachmentTimeout", @@ -84,9 +78,7 @@ func (m *Squash) Validate() error { } } - if v, ok := interface{}(m.GetAttachmentPollPeriod()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAttachmentPollPeriod()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return SquashValidationError{ Field: "AttachmentPollPeriod", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go index 28aa4f0697e7..ae1da03683b2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go @@ -49,9 +49,7 @@ func (m *GrpcJsonTranscoder) Validate() error { } } - if v, ok := interface{}(m.GetPrintOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPrintOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GrpcJsonTranscoderValidationError{ Field: "PrintOptions", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go index 33d092e3dffa..3aa1f73e3239 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go @@ -56,9 +56,7 @@ func (m *ClientSSLAuth) Validate() error { } } - if v, ok := interface{}(m.GetRefreshDelay()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRefreshDelay()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClientSSLAuthValidationError{ Field: "RefreshDelay", @@ -71,9 +69,7 @@ func (m *ClientSSLAuth) Validate() error { for idx, item := range m.GetIpWhiteList() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClientSSLAuthValidationError{ Field: fmt.Sprintf("IpWhiteList[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go index 574987a4beca..7546a8caba89 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go @@ -48,9 +48,7 @@ func (m *ExtAuthz) Validate() error { } } - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ExtAuthzValidationError{ Field: "GrpcService", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go index f11cf431bdb7..f99a666b9f7a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go @@ -59,9 +59,7 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetHttpFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: fmt.Sprintf("HttpFilters[%v]", idx), @@ -73,9 +71,7 @@ func (m *HttpConnectionManager) Validate() error { } - if v, ok := interface{}(m.GetAddUserAgent()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddUserAgent()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "AddUserAgent", @@ -85,9 +81,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetTracing()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "Tracing", @@ -97,9 +91,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "HttpProtocolOptions", @@ -109,9 +101,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "Http2ProtocolOptions", @@ -123,9 +113,7 @@ func (m *HttpConnectionManager) Validate() error { // no validation rules for ServerName - if v, ok := interface{}(m.GetIdleTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIdleTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "IdleTimeout", @@ -135,9 +123,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetStreamIdleTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStreamIdleTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "StreamIdleTimeout", @@ -147,9 +133,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetDrainTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDrainTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "DrainTimeout", @@ -162,9 +146,7 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetAccessLog() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: fmt.Sprintf("AccessLog[%v]", idx), @@ -176,9 +158,7 @@ func (m *HttpConnectionManager) Validate() error { } - if v, ok := interface{}(m.GetUseRemoteAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseRemoteAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "UseRemoteAddress", @@ -194,9 +174,7 @@ func (m *HttpConnectionManager) Validate() error { // no validation rules for Via - if v, ok := interface{}(m.GetGenerateRequestId()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGenerateRequestId()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "GenerateRequestId", @@ -213,9 +191,7 @@ func (m *HttpConnectionManager) Validate() error { } } - if v, ok := interface{}(m.GetSetCurrentClientCertDetails()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSetCurrentClientCertDetails()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "SetCurrentClientCertDetails", @@ -232,9 +208,7 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetUpgradeConfigs() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: fmt.Sprintf("UpgradeConfigs[%v]", idx), @@ -250,9 +224,7 @@ func (m *HttpConnectionManager) Validate() error { case *HttpConnectionManager_Rds: - if v, ok := interface{}(m.GetRds()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRds()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "Rds", @@ -264,9 +236,7 @@ func (m *HttpConnectionManager) Validate() error { case *HttpConnectionManager_RouteConfig: - if v, ok := interface{}(m.GetRouteConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ Field: "RouteConfig", @@ -325,9 +295,7 @@ func (m *Rds) Validate() error { return nil } - if v, ok := interface{}(m.GetConfigSource()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfigSource()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RdsValidationError{ Field: "ConfigSource", @@ -392,9 +360,7 @@ func (m *HttpFilter) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpFilterValidationError{ Field: "Config", @@ -404,9 +370,7 @@ func (m *HttpFilter) Validate() error { } } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpFilterValidationError{ Field: "DeprecatedV1", @@ -465,9 +429,7 @@ func (m *HttpConnectionManager_Tracing) Validate() error { } } - if v, ok := interface{}(m.GetClientSampling()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetClientSampling()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManager_TracingValidationError{ Field: "ClientSampling", @@ -477,9 +439,7 @@ func (m *HttpConnectionManager_Tracing) Validate() error { } } - if v, ok := interface{}(m.GetRandomSampling()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRandomSampling()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManager_TracingValidationError{ Field: "RandomSampling", @@ -489,9 +449,7 @@ func (m *HttpConnectionManager_Tracing) Validate() error { } } - if v, ok := interface{}(m.GetOverallSampling()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOverallSampling()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManager_TracingValidationError{ Field: "OverallSampling", @@ -545,9 +503,7 @@ func (m *HttpConnectionManager_SetCurrentClientCertDetails) Validate() error { return nil } - if v, ok := interface{}(m.GetSubject()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSubject()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManager_SetCurrentClientCertDetailsValidationError{ Field: "Subject", @@ -612,9 +568,7 @@ func (m *HttpConnectionManager_UpgradeConfig) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManager_UpgradeConfigValidationError{ Field: fmt.Sprintf("Filters[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go index 19ad3573d5cc..41f01a8babd6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go @@ -50,9 +50,7 @@ func (m *MongoProxy) Validate() error { // no validation rules for AccessLog - if v, ok := interface{}(m.GetDelay()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDelay()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return MongoProxyValidationError{ Field: "Delay", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go index 69c293626f93..22f831b0972a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go @@ -65,9 +65,7 @@ func (m *RateLimit) Validate() error { for idx, item := range m.GetDescriptors() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitValidationError{ Field: fmt.Sprintf("Descriptors[%v]", idx), @@ -79,9 +77,7 @@ func (m *RateLimit) Validate() error { } - if v, ok := interface{}(m.GetTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitValidationError{ Field: "Timeout", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go index 85709db784eb..b1d1976543fa 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go @@ -41,9 +41,7 @@ func (m *RBAC) Validate() error { return nil } - if v, ok := interface{}(m.GetRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RBACValidationError{ Field: "Rules", @@ -53,9 +51,7 @@ func (m *RBAC) Validate() error { } } - if v, ok := interface{}(m.GetShadowRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetShadowRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RBACValidationError{ Field: "ShadowRules", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go index aa775875164f..d7c21652aeaf 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go @@ -62,9 +62,7 @@ func (m *RedisProxy) Validate() error { } } - if v, ok := interface{}(m.GetSettings()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSettings()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RedisProxyValidationError{ Field: "Settings", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go index cfa7511a1773..720b0414feb4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go @@ -50,9 +50,7 @@ func (m *TcpProxy) Validate() error { // no validation rules for Cluster - if v, ok := interface{}(m.GetMetadataMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxyValidationError{ Field: "MetadataMatch", @@ -76,9 +74,7 @@ func (m *TcpProxy) Validate() error { } - if v, ok := interface{}(m.GetDownstreamIdleTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDownstreamIdleTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxyValidationError{ Field: "DownstreamIdleTimeout", @@ -88,9 +84,7 @@ func (m *TcpProxy) Validate() error { } } - if v, ok := interface{}(m.GetUpstreamIdleTimeout()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamIdleTimeout()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxyValidationError{ Field: "UpstreamIdleTimeout", @@ -103,9 +97,7 @@ func (m *TcpProxy) Validate() error { for idx, item := range m.GetAccessLog() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxyValidationError{ Field: fmt.Sprintf("AccessLog[%v]", idx), @@ -117,9 +109,7 @@ func (m *TcpProxy) Validate() error { } - if v, ok := interface{}(m.GetDeprecatedV1()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxyValidationError{ Field: "DeprecatedV1", @@ -192,9 +182,7 @@ func (m *TcpProxy_DeprecatedV1) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxy_DeprecatedV1ValidationError{ Field: fmt.Sprintf("Routes[%v]", idx), @@ -258,9 +246,7 @@ func (m *TcpProxy_DeprecatedV1_TCPRoute) Validate() error { for idx, item := range m.GetDestinationIpList() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxy_DeprecatedV1_TCPRouteValidationError{ Field: fmt.Sprintf("DestinationIpList[%v]", idx), @@ -277,9 +263,7 @@ func (m *TcpProxy_DeprecatedV1_TCPRoute) Validate() error { for idx, item := range m.GetSourceIpList() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TcpProxy_DeprecatedV1_TCPRouteValidationError{ Field: fmt.Sprintf("SourceIpList[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go index b16e3990d10b..7f6fe7207626 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go @@ -6,6 +6,7 @@ package v2 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" +import route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/lyft/protoc-gen-validate/validate" @@ -38,7 +39,7 @@ func (m *RouteConfiguration) Reset() { *m = RouteConfiguration{} } func (m *RouteConfiguration) String() string { return proto.CompactTextString(m) } func (*RouteConfiguration) ProtoMessage() {} func (*RouteConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_route_496e3a165eaf9f3f, []int{0} + return fileDescriptor_route_81fdc87dd2ee4c90, []int{0} } func (m *RouteConfiguration) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,7 +97,7 @@ func (m *Route) Reset() { *m = Route{} } func (m *Route) String() string { return proto.CompactTextString(m) } func (*Route) ProtoMessage() {} func (*Route) Descriptor() ([]byte, []int) { - return fileDescriptor_route_496e3a165eaf9f3f, []int{1} + return fileDescriptor_route_81fdc87dd2ee4c90, []int{1} } func (m *Route) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -139,25 +140,41 @@ func (m *Route) GetRoute() RouteAction { return RouteAction{} } -// [#comment:next free field: 4] +// [#comment:next free field: 5] type RouteMatch struct { // Types that are valid to be assigned to MatchSpecifier: // *RouteMatch_MethodName // *RouteMatch_ServiceName MatchSpecifier isRouteMatch_MatchSpecifier `protobuf_oneof:"match_specifier"` - // Inverts whatever matching is done in match_specifier. Cannot be combined with wildcard matching - // as that would result in routes never being matched. - Invert bool `protobuf:"varint,3,opt,name=invert,proto3" json:"invert,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Inverts whatever matching is done in the :ref:`method_name + // ` or + // :ref:`service_name + // ` fields. + // Cannot be combined with wildcard matching as that would result in routes never being matched. + // + // .. note:: + // + // This does not invert matching done as part of the :ref:`headers field + // ` field. To + // invert header matching, see :ref:`invert_match + // `. + Invert bool `protobuf:"varint,3,opt,name=invert,proto3" json:"invert,omitempty"` + // Specifies a set of headers that the route should match on. The router will check the request’s + // headers against all the specified headers in the route config. A match will happen if all the + // headers in the route are present in the request with the same values (or based on presence if + // the value field is not in the config). Note that this only applies for Thrift transports and/or + // protocols that support headers. + Headers []*route.HeaderMatcher `protobuf:"bytes,4,rep,name=headers" json:"headers,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RouteMatch) Reset() { *m = RouteMatch{} } func (m *RouteMatch) String() string { return proto.CompactTextString(m) } func (*RouteMatch) ProtoMessage() {} func (*RouteMatch) Descriptor() ([]byte, []int) { - return fileDescriptor_route_496e3a165eaf9f3f, []int{2} + return fileDescriptor_route_81fdc87dd2ee4c90, []int{2} } func (m *RouteMatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -230,6 +247,13 @@ func (m *RouteMatch) GetInvert() bool { return false } +func (m *RouteMatch) GetHeaders() []*route.HeaderMatcher { + if m != nil { + return m.Headers + } + return nil +} + // XXX_OneofFuncs is for the internal use of the proto package. func (*RouteMatch) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { return _RouteMatch_OneofMarshaler, _RouteMatch_OneofUnmarshaler, _RouteMatch_OneofSizer, []interface{}{ @@ -309,7 +333,7 @@ func (m *RouteAction) Reset() { *m = RouteAction{} } func (m *RouteAction) String() string { return proto.CompactTextString(m) } func (*RouteAction) ProtoMessage() {} func (*RouteAction) Descriptor() ([]byte, []int) { - return fileDescriptor_route_496e3a165eaf9f3f, []int{3} + return fileDescriptor_route_81fdc87dd2ee4c90, []int{3} } func (m *RouteAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -459,6 +483,18 @@ func (m *RouteMatch) MarshalTo(dAtA []byte) (int, error) { } i++ } + if len(m.Headers) > 0 { + for _, msg := range m.Headers { + dAtA[i] = 0x22 + i++ + i = encodeVarintRoute(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -558,6 +594,12 @@ func (m *RouteMatch) Size() (n int) { if m.Invert { n += 2 } + if len(m.Headers) > 0 { + for _, e := range m.Headers { + l = e.Size() + n += 1 + l + sovRoute(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -933,6 +975,37 @@ func (m *RouteMatch) Unmarshal(dAtA []byte) error { } } m.Invert = bool(v != 0) + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Headers", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRoute + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRoute + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Headers = append(m.Headers, &route.HeaderMatcher{}) + if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRoute(dAtA[iNdEx:]) @@ -1141,34 +1214,37 @@ var ( ) func init() { - proto.RegisterFile("envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto", fileDescriptor_route_496e3a165eaf9f3f) + proto.RegisterFile("envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto", fileDescriptor_route_81fdc87dd2ee4c90) } -var fileDescriptor_route_496e3a165eaf9f3f = []byte{ - // 398 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xb1, 0x0f, 0xd2, 0x40, - 0x14, 0xc6, 0xb9, 0x96, 0xa2, 0xbc, 0x1a, 0x25, 0x17, 0xa3, 0x0d, 0x03, 0xd6, 0xb2, 0x30, 0xdd, - 0x85, 0xba, 0xb8, 0x60, 0x62, 0x5d, 0x5c, 0x74, 0xe8, 0xe0, 0xe0, 0x42, 0x6a, 0xb9, 0xd2, 0x8b, - 0xa5, 0xd7, 0x5c, 0x8f, 0x2a, 0x9b, 0x93, 0x83, 0x7f, 0x91, 0x71, 0x62, 0x64, 0x34, 0xfe, 0x01, - 0xc6, 0xb0, 0xf1, 0x5f, 0x98, 0xde, 0x95, 0x40, 0xe2, 0x24, 0xdb, 0xeb, 0xd7, 0xf7, 0x7d, 0xbf, - 0xaf, 0x2f, 0x85, 0x05, 0x2b, 0x1b, 0xb1, 0xa3, 0xa9, 0x28, 0x33, 0xbe, 0xa6, 0x19, 0x2f, 0x14, - 0x93, 0xb4, 0x64, 0xea, 0x93, 0x90, 0x1f, 0xa9, 0xca, 0x25, 0xcf, 0xd4, 0xb2, 0x92, 0xe2, 0xf3, - 0x8e, 0x36, 0x61, 0x52, 0x54, 0x79, 0x32, 0xa7, 0x52, 0x6c, 0x15, 0x23, 0x95, 0x14, 0x4a, 0xe0, - 0xb9, 0xb6, 0x13, 0x63, 0x27, 0xc6, 0x4e, 0x3a, 0x3b, 0xb9, 0xb6, 0x93, 0xb3, 0x7d, 0xfc, 0xb8, - 0x49, 0x0a, 0xbe, 0x4a, 0x14, 0xa3, 0xe7, 0xc1, 0x64, 0x8d, 0x1f, 0xae, 0xc5, 0x5a, 0xe8, 0x91, - 0xb6, 0x93, 0x51, 0x83, 0x2f, 0x08, 0x70, 0xdc, 0x12, 0x5f, 0x69, 0xc6, 0x56, 0x26, 0x8a, 0x8b, - 0x12, 0x63, 0xe8, 0x97, 0xc9, 0x86, 0x79, 0xc8, 0x47, 0xb3, 0x61, 0xac, 0x67, 0xfc, 0x0e, 0x06, - 0xba, 0x5b, 0xed, 0x59, 0xbe, 0x3d, 0x73, 0xc3, 0xe7, 0xe4, 0xbf, 0xdb, 0x11, 0x8d, 0x8a, 0xfa, - 0x87, 0xdf, 0x4f, 0x7a, 0x71, 0x97, 0x16, 0xfc, 0x42, 0xe0, 0x68, 0x1d, 0xa7, 0xe0, 0x6c, 0x12, - 0x95, 0xe6, 0x1a, 0xeb, 0x86, 0x8b, 0x5b, 0x01, 0x6f, 0xda, 0x90, 0xe8, 0x7e, 0x4b, 0xf9, 0x71, - 0xda, 0xdb, 0xce, 0x37, 0x64, 0x8d, 0x50, 0x6c, 0xb2, 0xf1, 0x0a, 0x1c, 0x0d, 0xf6, 0x2c, 0x0d, - 0x79, 0x71, 0x2b, 0xe4, 0x65, 0xda, 0x5e, 0xea, 0x5f, 0x8a, 0x0e, 0x0f, 0xbe, 0x22, 0x80, 0x4b, - 0x17, 0xfc, 0x14, 0xdc, 0x0d, 0x53, 0xb9, 0x58, 0x2d, 0x2f, 0x67, 0x7d, 0xdd, 0x8b, 0xc1, 0x88, - 0x6f, 0xdb, 0xf3, 0x4e, 0xe1, 0x5e, 0xcd, 0x64, 0xc3, 0x53, 0x66, 0x76, 0xac, 0x6e, 0xc7, 0xed, - 0x54, 0xbd, 0xf4, 0x08, 0x06, 0xbc, 0x6c, 0x98, 0x54, 0x9e, 0xed, 0xa3, 0xd9, 0xdd, 0xb8, 0x7b, - 0x8a, 0x3c, 0x78, 0xa0, 0xbf, 0x6e, 0x59, 0x57, 0x2c, 0xe5, 0x19, 0x67, 0x12, 0x3b, 0xdf, 0x4f, - 0x7b, 0x1b, 0x05, 0x21, 0xb8, 0x57, 0x75, 0xf1, 0x14, 0xee, 0xa4, 0xc5, 0xb6, 0x56, 0x4c, 0x9a, - 0x12, 0xd1, 0xb0, 0xed, 0xde, 0x97, 0x96, 0x8f, 0xe2, 0xf3, 0x9b, 0x68, 0x74, 0x38, 0x4e, 0xd0, - 0xcf, 0xe3, 0x04, 0xfd, 0x39, 0x4e, 0xd0, 0x7b, 0xab, 0x09, 0x3f, 0x0c, 0xf4, 0xdf, 0xf2, 0xec, - 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0xec, 0xd5, 0x1b, 0xd0, 0x02, 0x00, 0x00, +var fileDescriptor_route_81fdc87dd2ee4c90 = []byte{ + // 443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xb1, 0x8e, 0xd3, 0x40, + 0x10, 0x86, 0x6f, 0x9d, 0x38, 0xc7, 0x8d, 0x11, 0x9c, 0x56, 0x08, 0xac, 0x2b, 0x42, 0x2e, 0xd7, + 0xa4, 0xda, 0xd5, 0x99, 0x06, 0x09, 0x1d, 0x12, 0xa6, 0xb9, 0x06, 0x0a, 0x17, 0x14, 0x34, 0xd1, + 0xe2, 0x4c, 0xe2, 0x15, 0x89, 0xd7, 0x5a, 0x6f, 0x0c, 0xd7, 0x51, 0xf3, 0x44, 0x88, 0xea, 0x24, + 0x9a, 0x2b, 0x11, 0x0f, 0x80, 0x50, 0xba, 0x7b, 0x0b, 0xe4, 0x59, 0x47, 0x17, 0x89, 0x8a, 0x74, + 0xe3, 0xd9, 0xf9, 0xff, 0x6f, 0x66, 0x3c, 0x70, 0x81, 0x65, 0x63, 0xae, 0x64, 0x6e, 0xca, 0xb9, + 0x5e, 0xc8, 0xb9, 0x5e, 0x3a, 0xb4, 0xb2, 0x44, 0xf7, 0xc9, 0xd8, 0x8f, 0xd2, 0x15, 0x56, 0xcf, + 0xdd, 0xb4, 0xb2, 0xe6, 0xf3, 0x95, 0x6c, 0x12, 0xb5, 0xac, 0x0a, 0x75, 0x2e, 0xad, 0x59, 0x3b, + 0x14, 0x95, 0x35, 0xce, 0xf0, 0x73, 0x92, 0x0b, 0x2f, 0x17, 0x5e, 0x2e, 0x3a, 0xb9, 0xd8, 0x95, + 0x8b, 0xad, 0xfc, 0x64, 0xe8, 0x89, 0xaa, 0xd2, 0xb2, 0x49, 0xbc, 0xd9, 0xae, 0xe5, 0xc9, 0x93, + 0x46, 0x2d, 0xf5, 0x4c, 0x39, 0x94, 0xdb, 0xa0, 0x7b, 0x78, 0xb4, 0x30, 0x0b, 0x43, 0xa1, 0x6c, + 0x23, 0x9f, 0x1d, 0x7f, 0x61, 0xc0, 0xb3, 0x56, 0xfe, 0x9a, 0x7a, 0x58, 0x5b, 0xe5, 0xb4, 0x29, + 0x39, 0x87, 0x7e, 0xa9, 0x56, 0x18, 0xb3, 0x11, 0x9b, 0x1c, 0x65, 0x14, 0xf3, 0x77, 0x30, 0x20, + 0x50, 0x1d, 0x07, 0xa3, 0xde, 0x24, 0x4a, 0x9e, 0x8b, 0xff, 0xee, 0x5e, 0x10, 0x2a, 0xed, 0xdf, + 0xfc, 0x7e, 0x7a, 0x90, 0x75, 0x6e, 0xe3, 0x5f, 0x0c, 0x42, 0xca, 0xf3, 0x1c, 0xc2, 0x95, 0x72, + 0x79, 0x41, 0xd8, 0x28, 0xb9, 0xd8, 0x17, 0xf0, 0xa6, 0x35, 0x49, 0x1f, 0xb4, 0x94, 0xef, 0xb7, + 0xd7, 0xbd, 0xf0, 0x2b, 0x0b, 0x8e, 0x59, 0xe6, 0xbd, 0xf9, 0x0c, 0x42, 0x02, 0xc7, 0x01, 0x41, + 0x5e, 0xee, 0x0b, 0x79, 0x95, 0xb7, 0x9b, 0xfa, 0x97, 0x42, 0xe6, 0xe3, 0x1f, 0x0c, 0xe0, 0xae, + 0x17, 0x7e, 0x0a, 0xd1, 0x0a, 0x5d, 0x61, 0x66, 0xd3, 0xbb, 0xb5, 0x5e, 0x1e, 0x64, 0xe0, 0x93, + 0x6f, 0xdb, 0xf5, 0x9e, 0xc1, 0xfd, 0x1a, 0x6d, 0xa3, 0x73, 0xf4, 0x35, 0x41, 0x57, 0x13, 0x75, + 0x59, 0x2a, 0x7a, 0x0c, 0x03, 0x5d, 0x36, 0x68, 0x5d, 0xdc, 0x1b, 0xb1, 0xc9, 0xbd, 0xac, 0xfb, + 0xe2, 0x2f, 0xe0, 0xb0, 0x40, 0x35, 0x43, 0x5b, 0xc7, 0x7d, 0xfa, 0x39, 0xa7, 0xdd, 0x58, 0xaa, + 0xd2, 0xa2, 0x49, 0x84, 0xbf, 0x90, 0x4b, 0x2a, 0xa1, 0x8e, 0xd0, 0x66, 0x5b, 0x45, 0x1a, 0xc3, + 0x43, 0x5a, 0xcd, 0xb4, 0xae, 0x30, 0xd7, 0x73, 0x8d, 0x96, 0x87, 0xdf, 0x6e, 0xaf, 0x7b, 0x6c, + 0x9c, 0x40, 0xb4, 0x33, 0x2b, 0x3f, 0x83, 0xc3, 0x7c, 0xb9, 0xae, 0x1d, 0x5a, 0x3f, 0x41, 0x7a, + 0xd4, 0x0e, 0xde, 0xb7, 0xc1, 0x88, 0x65, 0xdb, 0x97, 0xf4, 0xf8, 0x66, 0x33, 0x64, 0x3f, 0x37, + 0x43, 0xf6, 0x67, 0x33, 0x64, 0xef, 0x83, 0x26, 0xf9, 0x30, 0xa0, 0x53, 0x7b, 0xf6, 0x37, 0x00, + 0x00, 0xff, 0xff, 0xa9, 0xe0, 0x0a, 0xaa, 0x2d, 0x03, 0x00, 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go index 099232b07e8f..91290ce616d6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go @@ -47,9 +47,7 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteConfigurationValidationError{ Field: fmt.Sprintf("Routes[%v]", idx), @@ -102,9 +100,7 @@ func (m *Route) Validate() error { return nil } - if v, ok := interface{}(m.GetMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Match", @@ -114,9 +110,7 @@ func (m *Route) Validate() error { } } - if v, ok := interface{}(m.GetRoute()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRoute()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteValidationError{ Field: "Route", @@ -169,6 +163,21 @@ func (m *RouteMatch) Validate() error { // no validation rules for Invert + for idx, item := range m.GetHeaders() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + Field: fmt.Sprintf("Headers[%v]", idx), + Reason: "embedded message failed validation", + Cause: err, + } + } + } + + } + switch m.MatchSpecifier.(type) { case *RouteMatch_MethodName: diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go index d5e73d3ded38..c42051516a01 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go @@ -63,9 +63,7 @@ func (m *ThriftProxy) Validate() error { } } - if v, ok := interface{}(m.GetRouteConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ThriftProxyValidationError{ Field: "RouteConfig", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go index 5a6102032465..552ff50abadb 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go @@ -42,9 +42,7 @@ func (m *FileBasedMetadataConfig) Validate() error { return nil } - if v, ok := interface{}(m.GetSecretData()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSecretData()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FileBasedMetadataConfigValidationError{ Field: "SecretData", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go index 86750e05cdb0..49d93b4798e4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go @@ -49,9 +49,7 @@ func (m *MetricsServiceConfig) Validate() error { } } - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return MetricsServiceConfigValidationError{ Field: "GrpcService", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go index 86c0f693767b..21ae9ccfa108 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go @@ -43,9 +43,7 @@ func (m *StatsSink) Validate() error { // no validation rules for Name - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatsSinkValidationError{ Field: "Config", @@ -100,9 +98,7 @@ func (m *StatsConfig) Validate() error { for idx, item := range m.GetStatsTags() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatsConfigValidationError{ Field: fmt.Sprintf("StatsTags[%v]", idx), @@ -114,9 +110,7 @@ func (m *StatsConfig) Validate() error { } - if v, ok := interface{}(m.GetUseAllDefaultTags()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUseAllDefaultTags()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatsConfigValidationError{ Field: "UseAllDefaultTags", @@ -233,9 +227,7 @@ func (m *StatsdSink) Validate() error { case *StatsdSink_Address: - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatsdSinkValidationError{ Field: "Address", @@ -302,9 +294,7 @@ func (m *DogStatsdSink) Validate() error { case *DogStatsdSink_Address: - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DogStatsdSinkValidationError{ Field: "Address", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go index 0519ebceff19..10f1e0ed40fb 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go @@ -49,9 +49,7 @@ func (m *ResourceMonitor) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ResourceMonitorValidationError{ Field: "Config", @@ -162,9 +160,7 @@ func (m *Trigger) Validate() error { case *Trigger_Threshold: - if v, ok := interface{}(m.GetThreshold()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetThreshold()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TriggerValidationError{ Field: "Threshold", @@ -241,9 +237,7 @@ func (m *OverloadAction) Validate() error { for idx, item := range m.GetTriggers() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OverloadActionValidationError{ Field: fmt.Sprintf("Triggers[%v]", idx), @@ -297,9 +291,7 @@ func (m *OverloadManager) Validate() error { return nil } - if v, ok := interface{}(m.GetRefreshInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRefreshInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OverloadManagerValidationError{ Field: "RefreshInterval", @@ -319,9 +311,7 @@ func (m *OverloadManager) Validate() error { for idx, item := range m.GetResourceMonitors() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OverloadManagerValidationError{ Field: fmt.Sprintf("ResourceMonitors[%v]", idx), @@ -336,9 +326,7 @@ func (m *OverloadManager) Validate() error { for idx, item := range m.GetActions() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OverloadManagerValidationError{ Field: fmt.Sprintf("Actions[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2/rls.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2/rls.pb.validate.go index 720263beb933..1c684d6589af 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2/rls.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2/rls.pb.validate.go @@ -57,9 +57,7 @@ func (m *RateLimitServiceConfig) Validate() error { case *RateLimitServiceConfig_GrpcService: - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitServiceConfigValidationError{ Field: "GrpcService", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.go index 1bf44442b524..0725f23a2e97 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.go @@ -49,7 +49,7 @@ func (x RBAC_Action) String() string { return proto.EnumName(RBAC_Action_name, int32(x)) } func (RBAC_Action) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{0, 0} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{0, 0} } // Role Based Access Control (RBAC) provides service-level and method-level access control for a @@ -72,8 +72,12 @@ func (RBAC_Action) EnumDescriptor() ([]byte, []int) { // permissions: // - any: true // principals: -// - authenticated: { name: "cluster.local/ns/default/sa/admin" } -// - authenticated: { name: "cluster.local/ns/default/sa/superuser" } +// - authenticated: +// principal_name: +// exact: "cluster.local/ns/default/sa/admin" +// - authenticated: +// principal_name: +// exact: "cluster.local/ns/default/sa/superuser" // "product-viewer": // permissions: // - and_rules: @@ -104,7 +108,7 @@ func (m *RBAC) Reset() { *m = RBAC{} } func (m *RBAC) String() string { return proto.CompactTextString(m) } func (*RBAC) ProtoMessage() {} func (*RBAC) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{0} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{0} } func (m *RBAC) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,7 +172,7 @@ func (m *Policy) Reset() { *m = Policy{} } func (m *Policy) String() string { return proto.CompactTextString(m) } func (*Policy) ProtoMessage() {} func (*Policy) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{1} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{1} } func (m *Policy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -232,7 +236,7 @@ func (m *Permission) Reset() { *m = Permission{} } func (m *Permission) String() string { return proto.CompactTextString(m) } func (*Permission) ProtoMessage() {} func (*Permission) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{2} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{2} } func (m *Permission) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -559,7 +563,7 @@ func (m *Permission_Set) Reset() { *m = Permission_Set{} } func (m *Permission_Set) String() string { return proto.CompactTextString(m) } func (*Permission_Set) ProtoMessage() {} func (*Permission_Set) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{2, 0} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{2, 0} } func (m *Permission_Set) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -616,7 +620,7 @@ func (m *Principal) Reset() { *m = Principal{} } func (m *Principal) String() string { return proto.CompactTextString(m) } func (*Principal) ProtoMessage() {} func (*Principal) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{3} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{3} } func (m *Principal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -948,7 +952,7 @@ func (m *Principal_Set) Reset() { *m = Principal_Set{} } func (m *Principal_Set) String() string { return proto.CompactTextString(m) } func (*Principal_Set) ProtoMessage() {} func (*Principal_Set) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{3, 0} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{3, 0} } func (m *Principal_Set) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -986,19 +990,19 @@ func (m *Principal_Set) GetIds() []*Principal { // Authentication attributes for a downstream. type Principal_Authenticated struct { - // The name of the principal. If set, the URI SAN is used from the certificate, otherwise the + // The name of the principal. If set, The URI SAN is used from the certificate, otherwise the // subject field is used. If unset, it applies to any user that is authenticated. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + PrincipalName *matcher.StringMatcher `protobuf:"bytes,2,opt,name=principal_name,json=principalName" json:"principal_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Principal_Authenticated) Reset() { *m = Principal_Authenticated{} } func (m *Principal_Authenticated) String() string { return proto.CompactTextString(m) } func (*Principal_Authenticated) ProtoMessage() {} func (*Principal_Authenticated) Descriptor() ([]byte, []int) { - return fileDescriptor_rbac_2a92d9a2b60f8bb0, []int{3, 1} + return fileDescriptor_rbac_617eb1e5b6a3707a, []int{3, 1} } func (m *Principal_Authenticated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1027,11 +1031,11 @@ func (m *Principal_Authenticated) XXX_DiscardUnknown() { var xxx_messageInfo_Principal_Authenticated proto.InternalMessageInfo -func (m *Principal_Authenticated) GetName() string { +func (m *Principal_Authenticated) GetPrincipalName() *matcher.StringMatcher { if m != nil { - return m.Name + return m.PrincipalName } - return "" + return nil } func init() { @@ -1494,11 +1498,15 @@ func (m *Principal_Authenticated) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa + if m.PrincipalName != nil { + dAtA[i] = 0x12 i++ - i = encodeVarintRbac(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + i = encodeVarintRbac(dAtA, i, uint64(m.PrincipalName.Size())) + n17, err := m.PrincipalName.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n17 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -1753,8 +1761,8 @@ func (m *Principal_Set) Size() (n int) { func (m *Principal_Authenticated) Size() (n int) { var l int _ = l - l = len(m.Name) - if l > 0 { + if m.PrincipalName != nil { + l = m.PrincipalName.Size() n += 1 + l + sovRbac(uint64(l)) } if m.XXX_unrecognized != nil { @@ -2855,11 +2863,11 @@ func (m *Principal_Authenticated) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Authenticated: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrincipalName", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowRbac @@ -2869,20 +2877,24 @@ func (m *Principal_Authenticated) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthRbac } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex > l { return io.ErrUnexpectedEOF } - m.Name = string(dAtA[iNdEx:postIndex]) + if m.PrincipalName == nil { + m.PrincipalName = &matcher.StringMatcher{} + } + if err := m.PrincipalName.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -3012,58 +3024,61 @@ var ( ) func init() { - proto.RegisterFile("envoy/config/rbac/v2alpha/rbac.proto", fileDescriptor_rbac_2a92d9a2b60f8bb0) -} - -var fileDescriptor_rbac_2a92d9a2b60f8bb0 = []byte{ - // 783 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x8f, 0x1b, 0x35, - 0x18, 0xc6, 0xe3, 0x4c, 0x66, 0x76, 0xf2, 0x46, 0x29, 0x2b, 0x23, 0xc4, 0x10, 0xd1, 0x25, 0x4d, - 0x0b, 0x0a, 0x48, 0xcc, 0x48, 0xc3, 0x81, 0x8a, 0x0a, 0xa4, 0xcc, 0xb2, 0x90, 0x48, 0x6d, 0x59, - 0xcd, 0x1e, 0x10, 0x3d, 0x50, 0xb9, 0x63, 0xb7, 0x6b, 0xc8, 0xda, 0x23, 0x8f, 0x13, 0x29, 0x9f, - 0x02, 0xc4, 0x17, 0xe1, 0x8a, 0x38, 0xf5, 0xc8, 0x91, 0x8f, 0x00, 0x7b, 0xeb, 0xa7, 0x28, 0xf2, - 0x9f, 0x6c, 0x93, 0x03, 0xdb, 0xec, 0xaa, 0x97, 0xc8, 0x89, 0x9f, 0xe7, 0x79, 0xed, 0xd7, 0x3f, - 0x3b, 0x70, 0x87, 0x89, 0xa5, 0x5c, 0x65, 0x95, 0x14, 0x4f, 0xf9, 0xb3, 0x4c, 0x3d, 0x21, 0x55, - 0xb6, 0xcc, 0xc9, 0xbc, 0x3e, 0x25, 0xf6, 0x4b, 0x5a, 0x2b, 0xa9, 0x25, 0x7e, 0xcf, 0xaa, 0x52, - 0xa7, 0x4a, 0xed, 0x84, 0x57, 0x0d, 0xde, 0x5d, 0x92, 0x39, 0xa7, 0x44, 0xb3, 0x6c, 0x3d, 0x70, - 0x9e, 0xc1, 0x07, 0x2e, 0x99, 0xd4, 0x3c, 0x5b, 0xe6, 0x59, 0x25, 0x15, 0xcb, 0x08, 0xa5, 0x8a, - 0x35, 0x8d, 0x17, 0x1c, 0x6c, 0x09, 0x94, 0x5c, 0x68, 0xe6, 0x3e, 0xfd, 0xfc, 0x2d, 0x37, 0xaf, - 0x57, 0x35, 0xcb, 0xce, 0x88, 0xae, 0x4e, 0x99, 0xca, 0xce, 0x98, 0x26, 0x94, 0x68, 0xe2, 0x24, - 0xa3, 0x5f, 0xdb, 0xd0, 0x29, 0x8b, 0xc9, 0x21, 0xfe, 0x0a, 0x22, 0x52, 0x69, 0x2e, 0x45, 0x82, - 0x86, 0x68, 0x7c, 0x23, 0xff, 0x28, 0xfd, 0xdf, 0x15, 0xa7, 0xc6, 0x90, 0x4e, 0xac, 0xba, 0xf4, - 0x2e, 0x3c, 0x83, 0xb8, 0x96, 0x73, 0x5e, 0x71, 0xd6, 0x24, 0xed, 0x61, 0x30, 0xee, 0xe5, 0x9f, - 0xbe, 0x2e, 0xe1, 0xd8, 0xeb, 0x8f, 0x84, 0x56, 0xab, 0xf2, 0xc2, 0x3e, 0xf8, 0x11, 0xfa, 0x5b, - 0x53, 0x78, 0x1f, 0x82, 0x9f, 0xd9, 0xca, 0x2e, 0xac, 0x5b, 0x9a, 0x21, 0xfe, 0x1c, 0xc2, 0x25, - 0x99, 0x2f, 0x58, 0xd2, 0x1e, 0xa2, 0x71, 0x2f, 0xbf, 0x75, 0x49, 0x29, 0x1b, 0xb5, 0x2a, 0x9d, - 0xfe, 0x8b, 0xf6, 0x5d, 0x34, 0xba, 0x09, 0x91, 0x5b, 0x3c, 0xee, 0x42, 0x38, 0xb9, 0x7f, 0xff, - 0xbb, 0xef, 0xf7, 0x5b, 0x38, 0x86, 0xce, 0xd7, 0x47, 0x0f, 0x7f, 0xd8, 0x47, 0xa3, 0xdf, 0x11, - 0x44, 0xce, 0x84, 0x4f, 0xa0, 0x57, 0x33, 0x75, 0xc6, 0x9b, 0x86, 0x4b, 0xd1, 0x24, 0xc8, 0xee, - 0xeb, 0xc3, 0xcb, 0x8a, 0x5d, 0xa8, 0x0b, 0xf8, 0xf3, 0xc5, 0xf3, 0x20, 0xfc, 0x0d, 0xb5, 0x63, - 0x54, 0x6e, 0xa6, 0xe0, 0x63, 0x80, 0x5a, 0x71, 0x51, 0xf1, 0x9a, 0xcc, 0xd7, 0xbd, 0xba, 0x73, - 0x59, 0xe6, 0x5a, 0xbc, 0x15, 0xb9, 0x91, 0x31, 0xfa, 0xb7, 0x03, 0xf0, 0xaa, 0x32, 0x9e, 0x42, - 0x97, 0x08, 0xfa, 0x58, 0x2d, 0xe6, 0xac, 0xb1, 0x4d, 0xeb, 0xe5, 0x1f, 0xef, 0xb4, 0xe6, 0xf4, - 0x84, 0xe9, 0x69, 0xab, 0x8c, 0x89, 0xa0, 0xa5, 0x31, 0xe3, 0x6f, 0x20, 0x96, 0xca, 0x07, 0xb5, - 0xaf, 0x1e, 0xb4, 0x27, 0x95, 0xcb, 0xb9, 0x09, 0x01, 0x11, 0xab, 0x24, 0x18, 0xa2, 0x71, 0x5c, - 0x74, 0xcd, 0x2e, 0x3a, 0x3f, 0xb5, 0x63, 0x34, 0x6d, 0x95, 0xe6, 0x77, 0x7c, 0x0f, 0xa2, 0x53, - 0x46, 0x28, 0x53, 0x49, 0x67, 0xeb, 0x38, 0x49, 0xcd, 0xd3, 0x65, 0x9e, 0x3a, 0xa4, 0xa7, 0x56, - 0xf1, 0xc0, 0x61, 0x3c, 0x6d, 0x95, 0xde, 0x82, 0x8f, 0xe0, 0x06, 0x65, 0x8d, 0xe6, 0x82, 0x98, - 0x23, 0x7d, 0xcc, 0xeb, 0x24, 0xb4, 0x21, 0xef, 0x6f, 0x87, 0x98, 0xeb, 0x93, 0x1e, 0x72, 0xaa, - 0x4a, 0x22, 0x9e, 0xb1, 0x69, 0xab, 0xec, 0x6f, 0xb8, 0x66, 0x35, 0xbe, 0x0b, 0xfb, 0x9b, 0x31, - 0xb5, 0x54, 0x3a, 0x89, 0x86, 0x68, 0xdc, 0x2f, 0x7a, 0x66, 0xbd, 0xd1, 0x27, 0x9d, 0xe4, 0xe5, - 0xcb, 0x60, 0xda, 0x2a, 0xdf, 0xda, 0x90, 0x1d, 0x4b, 0xa5, 0xf1, 0x04, 0xe2, 0xf5, 0xa5, 0x4a, - 0xf6, 0x6c, 0xe9, 0xdb, 0xbe, 0xb4, 0xb9, 0x78, 0xa9, 0xbf, 0x78, 0xe9, 0x03, 0xaf, 0x79, 0xb5, - 0x83, 0x0b, 0x1b, 0x2e, 0x20, 0x16, 0x52, 0xdb, 0x46, 0x27, 0xb1, 0x8d, 0xd8, 0x0d, 0x32, 0xd3, - 0x63, 0x21, 0xb5, 0x69, 0xf2, 0xe0, 0x21, 0x04, 0x27, 0x4c, 0xe3, 0x6f, 0x21, 0x5c, 0x1f, 0xfc, - 0x35, 0x61, 0x75, 0xfe, 0xa2, 0x0f, 0x1d, 0x33, 0xc0, 0xe1, 0x1f, 0x2f, 0x9e, 0x07, 0x68, 0xf4, - 0x4b, 0x08, 0xdd, 0x0b, 0x12, 0xf1, 0x21, 0xec, 0x19, 0xc4, 0x38, 0x5d, 0x03, 0x36, 0xde, 0x05, - 0x60, 0x8f, 0x45, 0x44, 0x04, 0x9d, 0xd1, 0x06, 0x4f, 0x20, 0x92, 0xca, 0x66, 0xb4, 0xaf, 0x9c, - 0x11, 0x4a, 0x65, 0x22, 0x5e, 0x03, 0xd6, 0x23, 0xe8, 0x93, 0x85, 0x3e, 0x65, 0x42, 0xf3, 0x8a, - 0x68, 0x46, 0x3d, 0x5f, 0xf9, 0x4e, 0x85, 0x26, 0x9b, 0x4e, 0x03, 0xcc, 0x56, 0x14, 0xbe, 0x07, - 0xdd, 0x46, 0x2e, 0x54, 0xc5, 0x76, 0x47, 0x2e, 0x76, 0x86, 0x59, 0xbd, 0x41, 0x7c, 0x74, 0x75, - 0xe2, 0xdf, 0x00, 0x70, 0x5f, 0x42, 0x64, 0x80, 0xe3, 0xd4, 0xe3, 0xb6, 0xd3, 0xfb, 0x63, 0xda, - 0x2e, 0xa4, 0x9e, 0xd1, 0xc1, 0xcc, 0xb1, 0x56, 0x40, 0xe0, 0x08, 0xb8, 0xde, 0x13, 0x66, 0xcc, - 0x83, 0xdb, 0xd0, 0xdf, 0x6a, 0x34, 0xc6, 0xd0, 0x11, 0xe4, 0x8c, 0xf9, 0xd7, 0xde, 0x8e, 0x8b, - 0xb7, 0x01, 0x38, 0x35, 0x92, 0xa7, 0x9c, 0x29, 0x4f, 0x64, 0xf1, 0xce, 0x5f, 0xe7, 0x07, 0xe8, - 0xef, 0xf3, 0x03, 0xf4, 0xcf, 0xf9, 0x01, 0x7a, 0xb4, 0xe7, 0x6b, 0x3d, 0x89, 0xec, 0x1f, 0xdb, - 0x67, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x50, 0xff, 0x2e, 0xf7, 0x98, 0x07, 0x00, 0x00, + proto.RegisterFile("envoy/config/rbac/v2alpha/rbac.proto", fileDescriptor_rbac_617eb1e5b6a3707a) +} + +var fileDescriptor_rbac_617eb1e5b6a3707a = []byte{ + // 817 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xc1, 0x6e, 0xe3, 0x44, + 0x18, 0xc7, 0x33, 0xb6, 0xe3, 0x3a, 0x5f, 0x94, 0x12, 0x0d, 0x42, 0x98, 0x88, 0x2d, 0xd9, 0xb0, + 0xa0, 0x80, 0x84, 0x2d, 0x85, 0x03, 0x2b, 0x56, 0x20, 0xc5, 0xa5, 0x90, 0xa0, 0xdd, 0x52, 0xb9, + 0x07, 0xc4, 0x1e, 0xa8, 0x66, 0xed, 0xd9, 0x66, 0x20, 0x99, 0xb1, 0xc6, 0x93, 0x48, 0x79, 0x0b, + 0xc4, 0x8b, 0x70, 0x45, 0x9c, 0xf6, 0xc8, 0x11, 0xde, 0x00, 0x7a, 0xdb, 0xa7, 0x58, 0x34, 0x9e, + 0x49, 0x36, 0x46, 0xa2, 0x9b, 0x56, 0x5c, 0x2a, 0x37, 0xf3, 0xff, 0xff, 0xbf, 0xf9, 0x3e, 0xff, + 0x66, 0x0c, 0xf7, 0x28, 0x5f, 0x89, 0x75, 0x9c, 0x09, 0xfe, 0x94, 0x5d, 0xc6, 0xf2, 0x09, 0xc9, + 0xe2, 0xd5, 0x88, 0xcc, 0x8b, 0x19, 0xa9, 0xfe, 0x89, 0x0a, 0x29, 0x94, 0xc0, 0x6f, 0x55, 0xaa, + 0xc8, 0xa8, 0xa2, 0x6a, 0xc1, 0xaa, 0x7a, 0x6f, 0xae, 0xc8, 0x9c, 0xe5, 0x44, 0xd1, 0x78, 0xf3, + 0x60, 0x3c, 0xbd, 0x77, 0x4c, 0x32, 0x29, 0x58, 0xbc, 0x1a, 0xc5, 0x99, 0x90, 0x34, 0x26, 0x79, + 0x2e, 0x69, 0x59, 0x5a, 0xc1, 0x51, 0x4d, 0x20, 0xc5, 0x52, 0x51, 0xf3, 0xd7, 0xae, 0xdf, 0x35, + 0xeb, 0x6a, 0x5d, 0xd0, 0x78, 0x41, 0x54, 0x36, 0xa3, 0x32, 0x5e, 0x50, 0x45, 0x72, 0xa2, 0x48, + 0xbd, 0x46, 0x4d, 0x52, 0x2a, 0xc9, 0xf8, 0xa5, 0x11, 0x0c, 0x7e, 0x72, 0xc0, 0x4b, 0x93, 0xf1, + 0x31, 0xfe, 0x1c, 0x7c, 0x92, 0x29, 0x26, 0x78, 0x88, 0xfa, 0x68, 0x78, 0x38, 0x7a, 0x3f, 0xfa, + 0xcf, 0x96, 0x22, 0x6d, 0x88, 0xc6, 0x95, 0x3a, 0xb5, 0x2e, 0x3c, 0x85, 0xa0, 0x10, 0x73, 0x96, + 0x31, 0x5a, 0x86, 0x4e, 0xdf, 0x1d, 0xb6, 0x47, 0x1f, 0xbd, 0x2a, 0xe1, 0xcc, 0xea, 0x4f, 0xb8, + 0x92, 0xeb, 0x74, 0x6b, 0xef, 0x7d, 0x0f, 0x9d, 0xda, 0x12, 0xee, 0x82, 0xfb, 0x23, 0x5d, 0x57, + 0x1b, 0x6b, 0xa5, 0xfa, 0x11, 0x7f, 0x02, 0xcd, 0x15, 0x99, 0x2f, 0x69, 0xe8, 0xf4, 0xd1, 0xb0, + 0x3d, 0xba, 0x7b, 0x4d, 0xa9, 0x2a, 0x6a, 0x9d, 0x1a, 0xfd, 0xa7, 0xce, 0x7d, 0x34, 0xb8, 0x03, + 0xbe, 0xd9, 0x3c, 0x6e, 0x41, 0x73, 0xfc, 0xf0, 0xe1, 0x37, 0xdf, 0x76, 0x1b, 0x38, 0x00, 0xef, + 0x8b, 0x93, 0xd3, 0xef, 0xba, 0x68, 0xf0, 0x0b, 0x02, 0xdf, 0x98, 0xf0, 0x39, 0xb4, 0x0b, 0x2a, + 0x17, 0xac, 0x2c, 0x99, 0xe0, 0x65, 0x88, 0xaa, 0xbe, 0xde, 0xbb, 0xae, 0xd8, 0x56, 0x9d, 0xc0, + 0x6f, 0xcf, 0x9f, 0xb9, 0xcd, 0x9f, 0x91, 0x13, 0xa0, 0x74, 0x37, 0x05, 0x9f, 0x01, 0x14, 0x92, + 0xf1, 0x8c, 0x15, 0x64, 0xbe, 0x99, 0xd5, 0xbd, 0xeb, 0x32, 0x37, 0xe2, 0x5a, 0xe4, 0x4e, 0xc6, + 0xe0, 0x6f, 0x0f, 0xe0, 0x65, 0x65, 0x3c, 0x81, 0x16, 0xe1, 0xf9, 0x85, 0x5c, 0xce, 0x69, 0x59, + 0x0d, 0xad, 0x3d, 0xfa, 0x60, 0xaf, 0x3d, 0x47, 0xe7, 0x54, 0x4d, 0x1a, 0x69, 0x40, 0x78, 0x9e, + 0x6a, 0x33, 0xfe, 0x12, 0x02, 0x21, 0x6d, 0x90, 0x73, 0xf3, 0xa0, 0x03, 0x21, 0x4d, 0xce, 0x1d, + 0x70, 0x09, 0x5f, 0x87, 0x6e, 0x1f, 0x0d, 0x83, 0xa4, 0xa5, 0xbb, 0xf0, 0x7e, 0x70, 0x02, 0x34, + 0x69, 0xa4, 0xfa, 0x77, 0xfc, 0x00, 0xfc, 0x19, 0x25, 0x39, 0x95, 0xa1, 0x57, 0x7b, 0x9d, 0xa4, + 0x60, 0xd1, 0x6a, 0x14, 0x19, 0xe6, 0x27, 0x95, 0xe2, 0x91, 0x81, 0x78, 0xd2, 0x48, 0xad, 0x05, + 0x9f, 0xc0, 0x61, 0x4e, 0x4b, 0xc5, 0x38, 0xd1, 0xaf, 0xf4, 0x82, 0x15, 0x61, 0xb3, 0x0a, 0x79, + 0xbb, 0x1e, 0xa2, 0xcf, 0x57, 0x74, 0xcc, 0x72, 0x99, 0x12, 0x7e, 0x49, 0x27, 0x8d, 0xb4, 0xb3, + 0xe3, 0x9a, 0x16, 0xf8, 0x3e, 0x74, 0x77, 0x63, 0x0a, 0x21, 0x55, 0xe8, 0xf7, 0xd1, 0xb0, 0x93, + 0xb4, 0xf5, 0x7e, 0xfd, 0x0f, 0xbd, 0xf0, 0xc5, 0x0b, 0x77, 0xd2, 0x48, 0x5f, 0xdb, 0x91, 0x9d, + 0x09, 0xa9, 0xf0, 0x18, 0x82, 0xcd, 0xa9, 0x0b, 0x0f, 0xaa, 0xd2, 0xef, 0xda, 0xd2, 0xfa, 0xd8, + 0x45, 0xf6, 0xd8, 0x45, 0x8f, 0xac, 0xe6, 0x65, 0x07, 0x5b, 0x1b, 0x4e, 0x20, 0xe0, 0x42, 0x55, + 0x83, 0x0e, 0x83, 0x2a, 0x62, 0x3f, 0xc8, 0xf4, 0x8c, 0xb9, 0x50, 0x7a, 0xc8, 0xbd, 0x53, 0x70, + 0xcf, 0xa9, 0xc2, 0x5f, 0x41, 0x73, 0xf3, 0xe2, 0x6f, 0x09, 0xab, 0xf1, 0x27, 0x1d, 0xf0, 0xf4, + 0x03, 0x6e, 0xfe, 0xfa, 0xfc, 0x99, 0x8b, 0x06, 0x7f, 0x36, 0xa1, 0xb5, 0x25, 0x11, 0x1f, 0xc3, + 0x81, 0x46, 0x8c, 0xe5, 0x1b, 0xc0, 0x86, 0xfb, 0x00, 0x6c, 0xb1, 0xf0, 0x09, 0xcf, 0xa7, 0x79, + 0x89, 0xc7, 0xe0, 0x0b, 0x59, 0x65, 0x38, 0x37, 0xce, 0x68, 0x0a, 0xa9, 0x23, 0x5e, 0x01, 0xd6, + 0x63, 0xe8, 0x90, 0xa5, 0x9a, 0x51, 0xae, 0x58, 0x46, 0x14, 0xcd, 0x2d, 0x5f, 0xa3, 0xbd, 0x0a, + 0x8d, 0x77, 0x9d, 0x1a, 0x98, 0x5a, 0x14, 0x7e, 0x00, 0xad, 0x52, 0x2c, 0x65, 0x46, 0xf7, 0x47, + 0x2e, 0x30, 0x86, 0x69, 0xb1, 0x43, 0xbc, 0x7f, 0x73, 0xe2, 0xff, 0x07, 0xe0, 0x3e, 0x03, 0x5f, + 0x03, 0xc7, 0x72, 0x8b, 0xdb, 0x5e, 0xf7, 0x8f, 0x1e, 0x3b, 0x17, 0x6a, 0x9a, 0xf7, 0xa6, 0x86, + 0xb5, 0x04, 0x5c, 0x43, 0xc0, 0xed, 0xae, 0x30, 0x6d, 0xee, 0x51, 0xe8, 0xd4, 0x06, 0x8d, 0x27, + 0x70, 0xb8, 0xbd, 0xda, 0x2e, 0x38, 0x59, 0xfc, 0xfb, 0x8e, 0xaf, 0xf5, 0x78, 0x5e, 0x7d, 0xcb, + 0x6c, 0x87, 0x69, 0x67, 0x6b, 0x3c, 0x25, 0x0b, 0xfa, 0xb5, 0x17, 0xa0, 0xae, 0x93, 0x7a, 0x3a, + 0x23, 0x79, 0x1d, 0x80, 0xe5, 0xba, 0xc8, 0x53, 0x46, 0xa5, 0x65, 0x3a, 0x79, 0xe3, 0xf7, 0xab, + 0x23, 0xf4, 0xc7, 0xd5, 0x11, 0xfa, 0xeb, 0xea, 0x08, 0x3d, 0x3e, 0xb0, 0xbb, 0x7d, 0xe2, 0x57, + 0x9f, 0xc6, 0x8f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x9c, 0xf6, 0x81, 0xfb, 0x07, 0x00, + 0x00, } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.validate.go index a88e6b64502a..f2f140b0d4ae 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2alpha/rbac.pb.validate.go @@ -96,9 +96,7 @@ func (m *Policy) Validate() error { for idx, item := range m.GetPermissions() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PolicyValidationError{ Field: fmt.Sprintf("Permissions[%v]", idx), @@ -120,9 +118,7 @@ func (m *Policy) Validate() error { for idx, item := range m.GetPrincipals() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PolicyValidationError{ Field: fmt.Sprintf("Principals[%v]", idx), @@ -179,9 +175,7 @@ func (m *Permission) Validate() error { case *Permission_AndRules: - if v, ok := interface{}(m.GetAndRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAndRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "AndRules", @@ -193,9 +187,7 @@ func (m *Permission) Validate() error { case *Permission_OrRules: - if v, ok := interface{}(m.GetOrRules()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOrRules()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "OrRules", @@ -216,9 +208,7 @@ func (m *Permission) Validate() error { case *Permission_Header: - if v, ok := interface{}(m.GetHeader()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "Header", @@ -230,9 +220,7 @@ func (m *Permission) Validate() error { case *Permission_DestinationIp: - if v, ok := interface{}(m.GetDestinationIp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDestinationIp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "DestinationIp", @@ -253,9 +241,7 @@ func (m *Permission) Validate() error { case *Permission_Metadata: - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "Metadata", @@ -267,9 +253,7 @@ func (m *Permission) Validate() error { case *Permission_NotRule: - if v, ok := interface{}(m.GetNotRule()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNotRule()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PermissionValidationError{ Field: "NotRule", @@ -332,9 +316,7 @@ func (m *Principal) Validate() error { case *Principal_AndIds: - if v, ok := interface{}(m.GetAndIds()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAndIds()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "AndIds", @@ -346,9 +328,7 @@ func (m *Principal) Validate() error { case *Principal_OrIds: - if v, ok := interface{}(m.GetOrIds()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOrIds()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "OrIds", @@ -369,9 +349,7 @@ func (m *Principal) Validate() error { case *Principal_Authenticated_: - if v, ok := interface{}(m.GetAuthenticated()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAuthenticated()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "Authenticated", @@ -383,9 +361,7 @@ func (m *Principal) Validate() error { case *Principal_SourceIp: - if v, ok := interface{}(m.GetSourceIp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSourceIp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "SourceIp", @@ -397,9 +373,7 @@ func (m *Principal) Validate() error { case *Principal_Header: - if v, ok := interface{}(m.GetHeader()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "Header", @@ -411,9 +385,7 @@ func (m *Principal) Validate() error { case *Principal_Metadata: - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "Metadata", @@ -425,9 +397,7 @@ func (m *Principal) Validate() error { case *Principal_NotId: - if v, ok := interface{}(m.GetNotId()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNotId()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return PrincipalValidationError{ Field: "NotId", @@ -497,9 +467,7 @@ func (m *Permission_Set) Validate() error { for idx, item := range m.GetRules() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Permission_SetValidationError{ Field: fmt.Sprintf("Rules[%v]", idx), @@ -563,9 +531,7 @@ func (m *Principal_Set) Validate() error { for idx, item := range m.GetIds() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Principal_SetValidationError{ Field: fmt.Sprintf("Ids[%v]", idx), @@ -619,7 +585,15 @@ func (m *Principal_Authenticated) Validate() error { return nil } - // no validation rules for Name + if v, ok := interface{}(m.GetPrincipalName()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Principal_AuthenticatedValidationError{ + Field: "PrincipalName", + Reason: "embedded message failed validation", + Cause: err, + } + } + } return nil } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go index 903fc76890df..f33e6a2c228c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go @@ -41,9 +41,7 @@ func (m *Tracing) Validate() error { return nil } - if v, ok := interface{}(m.GetHttp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TracingValidationError{ Field: "Http", @@ -216,9 +214,7 @@ func (m *DynamicOtConfig) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DynamicOtConfigValidationError{ Field: "Config", @@ -277,9 +273,7 @@ func (m *TraceServiceConfig) Validate() error { } } - if v, ok := interface{}(m.GetGrpcService()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TraceServiceConfigValidationError{ Field: "GrpcService", @@ -338,9 +332,7 @@ func (m *Tracing_Http) Validate() error { } } - if v, ok := interface{}(m.GetConfig()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return Tracing_HttpValidationError{ Field: "Config", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/capture/v2alpha/capture.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/capture/v2alpha/capture.pb.validate.go index 727c1293a66f..de9725e8f9e8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/capture/v2alpha/capture.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/capture/v2alpha/capture.pb.validate.go @@ -86,9 +86,7 @@ func (m *Capture) Validate() error { return nil } - if v, ok := interface{}(m.GetTransportSocket()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTransportSocket()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CaptureValidationError{ Field: "TransportSocket", @@ -102,9 +100,7 @@ func (m *Capture) Validate() error { case *Capture_FileSink: - if v, ok := interface{}(m.GetFileSink()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetFileSink()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CaptureValidationError{ Field: "FileSink", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.go index bd3f3b0203c1..a9e4bf8f36ca 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.go @@ -57,7 +57,7 @@ func (x HTTPAccessLogEntry_HTTPVersion) String() string { return proto.EnumName(HTTPAccessLogEntry_HTTPVersion_name, int32(x)) } func (HTTPAccessLogEntry_HTTPVersion) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{1, 0} + return fileDescriptor_accesslog_83fd095bde55c855, []int{1, 0} } // Reasons why the request was unauthorized @@ -82,7 +82,7 @@ func (x ResponseFlags_Unauthorized_Reason) String() string { return proto.EnumName(ResponseFlags_Unauthorized_Reason_name, int32(x)) } func (ResponseFlags_Unauthorized_Reason) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{3, 0, 0} + return fileDescriptor_accesslog_83fd095bde55c855, []int{3, 0, 0} } type TLSProperties_TLSVersion int32 @@ -114,7 +114,7 @@ func (x TLSProperties_TLSVersion) String() string { return proto.EnumName(TLSProperties_TLSVersion_name, int32(x)) } func (TLSProperties_TLSVersion) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{4, 0} + return fileDescriptor_accesslog_83fd095bde55c855, []int{4, 0} } // [#not-implemented-hide:] @@ -130,7 +130,7 @@ func (m *TCPAccessLogEntry) Reset() { *m = TCPAccessLogEntry{} } func (m *TCPAccessLogEntry) String() string { return proto.CompactTextString(m) } func (*TCPAccessLogEntry) ProtoMessage() {} func (*TCPAccessLogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{0} + return fileDescriptor_accesslog_83fd095bde55c855, []int{0} } func (m *TCPAccessLogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -183,7 +183,7 @@ func (m *HTTPAccessLogEntry) Reset() { *m = HTTPAccessLogEntry{} } func (m *HTTPAccessLogEntry) String() string { return proto.CompactTextString(m) } func (*HTTPAccessLogEntry) ProtoMessage() {} func (*HTTPAccessLogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{1} + return fileDescriptor_accesslog_83fd095bde55c855, []int{1} } func (m *HTTPAccessLogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -316,7 +316,7 @@ func (m *AccessLogCommon) Reset() { *m = AccessLogCommon{} } func (m *AccessLogCommon) String() string { return proto.CompactTextString(m) } func (*AccessLogCommon) ProtoMessage() {} func (*AccessLogCommon) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{2} + return fileDescriptor_accesslog_83fd095bde55c855, []int{2} } func (m *AccessLogCommon) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -492,6 +492,7 @@ type ResponseFlags struct { RateLimited bool `protobuf:"varint,12,opt,name=rate_limited,json=rateLimited,proto3" json:"rate_limited,omitempty"` // Indicates if the request was deemed unauthorized and the reason for it. UnauthorizedDetails *ResponseFlags_Unauthorized `protobuf:"bytes,13,opt,name=unauthorized_details,json=unauthorizedDetails" json:"unauthorized_details,omitempty"` + // [#not-implemented-hide:] Hide from docs. // Indicates that the request was rejected because there was an error in rate limit service. RateLimitServiceError bool `protobuf:"varint,14,opt,name=rate_limit_service_error,json=rateLimitServiceError,proto3" json:"rate_limit_service_error,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -503,7 +504,7 @@ func (m *ResponseFlags) Reset() { *m = ResponseFlags{} } func (m *ResponseFlags) String() string { return proto.CompactTextString(m) } func (*ResponseFlags) ProtoMessage() {} func (*ResponseFlags) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{3} + return fileDescriptor_accesslog_83fd095bde55c855, []int{3} } func (m *ResponseFlags) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -641,7 +642,7 @@ func (m *ResponseFlags_Unauthorized) Reset() { *m = ResponseFlags_Unauth func (m *ResponseFlags_Unauthorized) String() string { return proto.CompactTextString(m) } func (*ResponseFlags_Unauthorized) ProtoMessage() {} func (*ResponseFlags_Unauthorized) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{3, 0} + return fileDescriptor_accesslog_83fd095bde55c855, []int{3, 0} } func (m *ResponseFlags_Unauthorized) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -699,7 +700,7 @@ func (m *TLSProperties) Reset() { *m = TLSProperties{} } func (m *TLSProperties) String() string { return proto.CompactTextString(m) } func (*TLSProperties) ProtoMessage() {} func (*TLSProperties) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{4} + return fileDescriptor_accesslog_83fd095bde55c855, []int{4} } func (m *TLSProperties) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -798,7 +799,7 @@ func (m *HTTPRequestProperties) Reset() { *m = HTTPRequestProperties{} } func (m *HTTPRequestProperties) String() string { return proto.CompactTextString(m) } func (*HTTPRequestProperties) ProtoMessage() {} func (*HTTPRequestProperties) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{5} + return fileDescriptor_accesslog_83fd095bde55c855, []int{5} } func (m *HTTPRequestProperties) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -944,7 +945,7 @@ func (m *HTTPResponseProperties) Reset() { *m = HTTPResponseProperties{} func (m *HTTPResponseProperties) String() string { return proto.CompactTextString(m) } func (*HTTPResponseProperties) ProtoMessage() {} func (*HTTPResponseProperties) Descriptor() ([]byte, []int) { - return fileDescriptor_accesslog_f7d38ea1e253147a, []int{6} + return fileDescriptor_accesslog_83fd095bde55c855, []int{6} } func (m *HTTPResponseProperties) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4369,10 +4370,10 @@ var ( ) func init() { - proto.RegisterFile("envoy/data/accesslog/v2/accesslog.proto", fileDescriptor_accesslog_f7d38ea1e253147a) + proto.RegisterFile("envoy/data/accesslog/v2/accesslog.proto", fileDescriptor_accesslog_83fd095bde55c855) } -var fileDescriptor_accesslog_f7d38ea1e253147a = []byte{ +var fileDescriptor_accesslog_83fd095bde55c855 = []byte{ // 1726 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x52, 0x23, 0xc9, 0x11, 0x5e, 0x21, 0xc1, 0x48, 0x29, 0x01, 0x4d, 0x21, 0xa0, 0x61, 0x67, 0x80, 0x95, 0xff, 0x70, diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.validate.go index 931af6720ab2..777ea96031ce 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2/accesslog.pb.validate.go @@ -42,9 +42,7 @@ func (m *TCPAccessLogEntry) Validate() error { return nil } - if v, ok := interface{}(m.GetCommonProperties()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonProperties()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TCPAccessLogEntryValidationError{ Field: "CommonProperties", @@ -96,9 +94,7 @@ func (m *HTTPAccessLogEntry) Validate() error { return nil } - if v, ok := interface{}(m.GetCommonProperties()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCommonProperties()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPAccessLogEntryValidationError{ Field: "CommonProperties", @@ -110,9 +106,7 @@ func (m *HTTPAccessLogEntry) Validate() error { // no validation rules for ProtocolVersion - if v, ok := interface{}(m.GetRequest()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequest()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPAccessLogEntryValidationError{ Field: "Request", @@ -122,9 +116,7 @@ func (m *HTTPAccessLogEntry) Validate() error { } } - if v, ok := interface{}(m.GetResponse()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetResponse()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPAccessLogEntryValidationError{ Field: "Response", @@ -183,9 +175,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetDownstreamRemoteAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDownstreamRemoteAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "DownstreamRemoteAddress", @@ -195,9 +185,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetDownstreamLocalAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDownstreamLocalAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "DownstreamLocalAddress", @@ -207,9 +195,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTlsProperties()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsProperties()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TlsProperties", @@ -219,9 +205,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetStartTime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStartTime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "StartTime", @@ -231,9 +215,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToLastRxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToLastRxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToLastRxByte", @@ -243,9 +225,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToFirstUpstreamTxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToFirstUpstreamTxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToFirstUpstreamTxByte", @@ -255,9 +235,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToLastUpstreamTxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToLastUpstreamTxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToLastUpstreamTxByte", @@ -267,9 +245,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToFirstUpstreamRxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToFirstUpstreamRxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToFirstUpstreamRxByte", @@ -279,9 +255,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToLastUpstreamRxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToLastUpstreamRxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToLastUpstreamRxByte", @@ -291,9 +265,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToFirstDownstreamTxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToFirstDownstreamTxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToFirstDownstreamTxByte", @@ -303,9 +275,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetTimeToLastDownstreamTxByte()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimeToLastDownstreamTxByte()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "TimeToLastDownstreamTxByte", @@ -315,9 +285,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetUpstreamRemoteAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamRemoteAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "UpstreamRemoteAddress", @@ -327,9 +295,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetUpstreamLocalAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUpstreamLocalAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "UpstreamLocalAddress", @@ -341,9 +307,7 @@ func (m *AccessLogCommon) Validate() error { // no validation rules for UpstreamCluster - if v, ok := interface{}(m.GetResponseFlags()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetResponseFlags()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "ResponseFlags", @@ -353,9 +317,7 @@ func (m *AccessLogCommon) Validate() error { } } - if v, ok := interface{}(m.GetMetadata()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AccessLogCommonValidationError{ Field: "Metadata", @@ -431,9 +393,7 @@ func (m *ResponseFlags) Validate() error { // no validation rules for RateLimited - if v, ok := interface{}(m.GetUnauthorizedDetails()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetUnauthorizedDetails()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ResponseFlagsValidationError{ Field: "UnauthorizedDetails", @@ -489,9 +449,7 @@ func (m *TLSProperties) Validate() error { // no validation rules for TlsVersion - if v, ok := interface{}(m.GetTlsCipherSuite()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTlsCipherSuite()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TLSPropertiesValidationError{ Field: "TlsCipherSuite", @@ -551,9 +509,7 @@ func (m *HTTPRequestProperties) Validate() error { // no validation rules for Authority - if v, ok := interface{}(m.GetPort()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetPort()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPRequestPropertiesValidationError{ Field: "Port", @@ -623,9 +579,7 @@ func (m *HTTPResponseProperties) Validate() error { return nil } - if v, ok := interface{}(m.GetResponseCode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetResponseCode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPResponsePropertiesValidationError{ Field: "ResponseCode", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/core/v2alpha/health_check_event.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/core/v2alpha/health_check_event.pb.validate.go index 65f5ffbff4fd..356428f3d679 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/core/v2alpha/health_check_event.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/core/v2alpha/health_check_event.pb.validate.go @@ -49,9 +49,7 @@ func (m *HealthCheckEvent) Validate() error { } } - if v, ok := interface{}(m.GetHost()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHost()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckEventValidationError{ Field: "Host", @@ -68,9 +66,7 @@ func (m *HealthCheckEvent) Validate() error { } } - if v, ok := interface{}(m.GetTimestamp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimestamp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckEventValidationError{ Field: "Timestamp", @@ -84,9 +80,7 @@ func (m *HealthCheckEvent) Validate() error { case *HealthCheckEvent_EjectUnhealthyEvent: - if v, ok := interface{}(m.GetEjectUnhealthyEvent()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEjectUnhealthyEvent()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckEventValidationError{ Field: "EjectUnhealthyEvent", @@ -98,9 +92,7 @@ func (m *HealthCheckEvent) Validate() error { case *HealthCheckEvent_AddHealthyEvent: - if v, ok := interface{}(m.GetAddHealthyEvent()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddHealthyEvent()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckEventValidationError{ Field: "AddHealthyEvent", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/capture.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/capture.pb.validate.go index f0aaa2838660..432148e09eff 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/capture.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/capture.pb.validate.go @@ -43,9 +43,7 @@ func (m *Connection) Validate() error { // no validation rules for Id - if v, ok := interface{}(m.GetLocalAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocalAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConnectionValidationError{ Field: "LocalAddress", @@ -55,9 +53,7 @@ func (m *Connection) Validate() error { } } - if v, ok := interface{}(m.GetRemoteAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRemoteAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ConnectionValidationError{ Field: "RemoteAddress", @@ -108,9 +104,7 @@ func (m *Event) Validate() error { return nil } - if v, ok := interface{}(m.GetTimestamp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTimestamp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EventValidationError{ Field: "Timestamp", @@ -124,9 +118,7 @@ func (m *Event) Validate() error { case *Event_Read_: - if v, ok := interface{}(m.GetRead()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRead()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EventValidationError{ Field: "Read", @@ -138,9 +130,7 @@ func (m *Event) Validate() error { case *Event_Write_: - if v, ok := interface{}(m.GetWrite()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetWrite()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EventValidationError{ Field: "Write", @@ -193,9 +183,7 @@ func (m *Trace) Validate() error { return nil } - if v, ok := interface{}(m.GetConnection()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetConnection()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TraceValidationError{ Field: "Connection", @@ -208,9 +196,7 @@ func (m *Trace) Validate() error { for idx, item := range m.GetEvents() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return TraceValidationError{ Field: fmt.Sprintf("Events[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2/als.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2/als.pb.validate.go index 831f46aef290..2a6db86492a8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2/als.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2/als.pb.validate.go @@ -84,9 +84,7 @@ func (m *StreamAccessLogsMessage) Validate() error { return nil } - if v, ok := interface{}(m.GetIdentifier()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIdentifier()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessageValidationError{ Field: "Identifier", @@ -100,9 +98,7 @@ func (m *StreamAccessLogsMessage) Validate() error { case *StreamAccessLogsMessage_HttpLogs: - if v, ok := interface{}(m.GetHttpLogs()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttpLogs()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessageValidationError{ Field: "HttpLogs", @@ -114,9 +110,7 @@ func (m *StreamAccessLogsMessage) Validate() error { case *StreamAccessLogsMessage_TcpLogs: - if v, ok := interface{}(m.GetTcpLogs()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTcpLogs()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessageValidationError{ Field: "TcpLogs", @@ -183,9 +177,7 @@ func (m *StreamAccessLogsMessage_Identifier) Validate() error { } } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessage_IdentifierValidationError{ Field: "Node", @@ -255,9 +247,7 @@ func (m *StreamAccessLogsMessage_HTTPAccessLogEntries) Validate() error { for idx, item := range m.GetLogEntry() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessage_HTTPAccessLogEntriesValidationError{ Field: fmt.Sprintf("LogEntry[%v]", idx), @@ -323,9 +313,7 @@ func (m *StreamAccessLogsMessage_TCPAccessLogEntries) Validate() error { for idx, item := range m.GetLogEntry() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamAccessLogsMessage_TCPAccessLogEntriesValidationError{ Field: fmt.Sprintf("LogEntry[%v]", idx), diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/attribute_context.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/attribute_context.pb.validate.go index e015e126d28f..5d950406eac0 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/attribute_context.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/attribute_context.pb.validate.go @@ -42,9 +42,7 @@ func (m *AttributeContext) Validate() error { return nil } - if v, ok := interface{}(m.GetSource()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetSource()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContextValidationError{ Field: "Source", @@ -54,9 +52,7 @@ func (m *AttributeContext) Validate() error { } } - if v, ok := interface{}(m.GetDestination()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDestination()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContextValidationError{ Field: "Destination", @@ -66,9 +62,7 @@ func (m *AttributeContext) Validate() error { } } - if v, ok := interface{}(m.GetRequest()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRequest()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContextValidationError{ Field: "Request", @@ -122,9 +116,7 @@ func (m *AttributeContext_Peer) Validate() error { return nil } - if v, ok := interface{}(m.GetAddress()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContext_PeerValidationError{ Field: "Address", @@ -182,9 +174,7 @@ func (m *AttributeContext_Request) Validate() error { return nil } - if v, ok := interface{}(m.GetTime()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetTime()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContext_RequestValidationError{ Field: "Time", @@ -194,9 +184,7 @@ func (m *AttributeContext_Request) Validate() error { } } - if v, ok := interface{}(m.GetHttp()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHttp()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AttributeContext_RequestValidationError{ Field: "Http", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/external_auth.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/external_auth.pb.validate.go index d4eca0ab56e5..08dfeaf8beb6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/external_auth.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha/external_auth.pb.validate.go @@ -42,9 +42,7 @@ func (m *CheckRequest) Validate() error { return nil } - if v, ok := interface{}(m.GetAttributes()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetAttributes()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CheckRequestValidationError{ Field: "Attributes", @@ -103,9 +101,7 @@ func (m *DeniedHttpResponse) Validate() error { } } - if v, ok := interface{}(m.GetStatus()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStatus()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DeniedHttpResponseValidationError{ Field: "Status", @@ -118,9 +114,7 @@ func (m *DeniedHttpResponse) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DeniedHttpResponseValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), @@ -179,9 +173,7 @@ func (m *OkHttpResponse) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OkHttpResponseValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), @@ -235,9 +227,7 @@ func (m *CheckResponse) Validate() error { return nil } - if v, ok := interface{}(m.GetStatus()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStatus()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CheckResponseValidationError{ Field: "Status", @@ -251,9 +241,7 @@ func (m *CheckResponse) Validate() error { case *CheckResponse_DeniedResponse: - if v, ok := interface{}(m.GetDeniedResponse()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDeniedResponse()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CheckResponseValidationError{ Field: "DeniedResponse", @@ -265,9 +253,7 @@ func (m *CheckResponse) Validate() error { case *CheckResponse_OkResponse: - if v, ok := interface{}(m.GetOkResponse()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOkResponse()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return CheckResponseValidationError{ Field: "OkResponse", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go index 06b97aef0aa0..8d5111c8246c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go @@ -83,9 +83,7 @@ func (m *HealthCheckRequest) Validate() error { return nil } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckRequestValidationError{ Field: "Node", @@ -95,9 +93,7 @@ func (m *HealthCheckRequest) Validate() error { } } - if v, ok := interface{}(m.GetCapability()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCapability()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckRequestValidationError{ Field: "Capability", @@ -149,9 +145,7 @@ func (m *EndpointHealth) Validate() error { return nil } - if v, ok := interface{}(m.GetEndpoint()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEndpoint()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EndpointHealthValidationError{ Field: "Endpoint", @@ -208,9 +202,7 @@ func (m *EndpointHealthResponse) Validate() error { for idx, item := range m.GetEndpointsHealth() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return EndpointHealthResponseValidationError{ Field: fmt.Sprintf("EndpointsHealth[%v]", idx), @@ -268,9 +260,7 @@ func (m *HealthCheckRequestOrEndpointHealthResponse) Validate() error { case *HealthCheckRequestOrEndpointHealthResponse_HealthCheckRequest: - if v, ok := interface{}(m.GetHealthCheckRequest()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetHealthCheckRequest()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckRequestOrEndpointHealthResponseValidationError{ Field: "HealthCheckRequest", @@ -282,9 +272,7 @@ func (m *HealthCheckRequestOrEndpointHealthResponse) Validate() error { case *HealthCheckRequestOrEndpointHealthResponse_EndpointHealthResponse: - if v, ok := interface{}(m.GetEndpointHealthResponse()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetEndpointHealthResponse()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckRequestOrEndpointHealthResponseValidationError{ Field: "EndpointHealthResponse", @@ -339,9 +327,7 @@ func (m *LocalityEndpoints) Validate() error { return nil } - if v, ok := interface{}(m.GetLocality()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LocalityEndpointsValidationError{ Field: "Locality", @@ -354,9 +340,7 @@ func (m *LocalityEndpoints) Validate() error { for idx, item := range m.GetEndpoints() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LocalityEndpointsValidationError{ Field: fmt.Sprintf("Endpoints[%v]", idx), @@ -415,9 +399,7 @@ func (m *ClusterHealthCheck) Validate() error { for idx, item := range m.GetHealthChecks() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterHealthCheckValidationError{ Field: fmt.Sprintf("HealthChecks[%v]", idx), @@ -432,9 +414,7 @@ func (m *ClusterHealthCheck) Validate() error { for idx, item := range m.GetLocalityEndpoints() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterHealthCheckValidationError{ Field: fmt.Sprintf("LocalityEndpoints[%v]", idx), @@ -491,9 +471,7 @@ func (m *HealthCheckSpecifier) Validate() error { for idx, item := range m.GetClusterHealthChecks() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckSpecifierValidationError{ Field: fmt.Sprintf("ClusterHealthChecks[%v]", idx), @@ -505,9 +483,7 @@ func (m *HealthCheckSpecifier) Validate() error { } - if v, ok := interface{}(m.GetInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HealthCheckSpecifierValidationError{ Field: "Interval", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2/lrs.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2/lrs.pb.validate.go index 59623740b07b..d2d7bcde8b14 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2/lrs.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2/lrs.pb.validate.go @@ -42,9 +42,7 @@ func (m *LoadStatsRequest) Validate() error { return nil } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LoadStatsRequestValidationError{ Field: "Node", @@ -57,9 +55,7 @@ func (m *LoadStatsRequest) Validate() error { for idx, item := range m.GetClusterStats() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LoadStatsRequestValidationError{ Field: fmt.Sprintf("ClusterStats[%v]", idx), @@ -120,9 +116,7 @@ func (m *LoadStatsResponse) Validate() error { } } - if v, ok := interface{}(m.GetLoadReportingInterval()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetLoadReportingInterval()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return LoadStatsResponseValidationError{ Field: "LoadReportingInterval", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2/metrics_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2/metrics_service.pb.validate.go index 47e84aeb95cf..5f5a28d9891d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2/metrics_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2/metrics_service.pb.validate.go @@ -84,9 +84,7 @@ func (m *StreamMetricsMessage) Validate() error { return nil } - if v, ok := interface{}(m.GetIdentifier()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIdentifier()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamMetricsMessageValidationError{ Field: "Identifier", @@ -99,9 +97,7 @@ func (m *StreamMetricsMessage) Validate() error { for idx, item := range m.GetEnvoyMetrics() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamMetricsMessageValidationError{ Field: fmt.Sprintf("EnvoyMetrics[%v]", idx), @@ -162,9 +158,7 @@ func (m *StreamMetricsMessage_Identifier) Validate() error { } } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamMetricsMessage_IdentifierValidationError{ Field: "Node", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2/rls.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2/rls.pb.validate.go index 3e7cd8bc515b..95e5e3ffe8f8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2/rls.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2/rls.pb.validate.go @@ -47,9 +47,7 @@ func (m *RateLimitRequest) Validate() error { for idx, item := range m.GetDescriptors() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitRequestValidationError{ Field: fmt.Sprintf("Descriptors[%v]", idx), @@ -110,9 +108,7 @@ func (m *RateLimitResponse) Validate() error { for idx, item := range m.GetStatuses() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitResponseValidationError{ Field: fmt.Sprintf("Statuses[%v]", idx), @@ -127,9 +123,7 @@ func (m *RateLimitResponse) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitResponseValidationError{ Field: fmt.Sprintf("Headers[%v]", idx), @@ -232,9 +226,7 @@ func (m *RateLimitResponse_DescriptorStatus) Validate() error { // no validation rules for Code - if v, ok := interface{}(m.GetCurrentLimit()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetCurrentLimit()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RateLimitResponse_DescriptorStatusValidationError{ Field: "CurrentLimit", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/trace/v2/trace_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/trace/v2/trace_service.pb.validate.go index e1e881ac889a..3210ffce2ff2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/trace/v2/trace_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/trace/v2/trace_service.pb.validate.go @@ -84,9 +84,7 @@ func (m *StreamTracesMessage) Validate() error { return nil } - if v, ok := interface{}(m.GetIdentifier()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetIdentifier()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamTracesMessageValidationError{ Field: "Identifier", @@ -99,9 +97,7 @@ func (m *StreamTracesMessage) Validate() error { for idx, item := range m.GetSpans() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamTracesMessageValidationError{ Field: fmt.Sprintf("Spans[%v]", idx), @@ -162,9 +158,7 @@ func (m *StreamTracesMessage_Identifier) Validate() error { } } - if v, ok := interface{}(m.GetNode()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StreamTracesMessage_IdentifierValidationError{ Field: "Node", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go index c92eccc61e81..b7b0a6c96eac 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go @@ -59,9 +59,7 @@ func (m *MetadataMatcher) Validate() error { for idx, item := range m.GetPath() { _, _ = idx, item - if v, ok := interface{}(item).(interface { - Validate() error - }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return MetadataMatcherValidationError{ Field: fmt.Sprintf("Path[%v]", idx), @@ -80,9 +78,7 @@ func (m *MetadataMatcher) Validate() error { } } - if v, ok := interface{}(m.GetValue()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return MetadataMatcherValidationError{ Field: "Value", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go index c04cc6cff620..e52b9210107b 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go @@ -46,9 +46,7 @@ func (m *DoubleMatcher) Validate() error { case *DoubleMatcher_Range: - if v, ok := interface{}(m.GetRange()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetRange()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return DoubleMatcherValidationError{ Field: "Range", diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go index 6e01c3b866f3..f0d95840e7a3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go @@ -46,9 +46,7 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_NullMatch_: - if v, ok := interface{}(m.GetNullMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetNullMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ValueMatcherValidationError{ Field: "NullMatch", @@ -60,9 +58,7 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_DoubleMatch: - if v, ok := interface{}(m.GetDoubleMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetDoubleMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ValueMatcherValidationError{ Field: "DoubleMatch", @@ -74,9 +70,7 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_StringMatch: - if v, ok := interface{}(m.GetStringMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetStringMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ValueMatcherValidationError{ Field: "StringMatch", @@ -94,9 +88,7 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_ListMatch: - if v, ok := interface{}(m.GetListMatch()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetListMatch()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ValueMatcherValidationError{ Field: "ListMatch", @@ -160,9 +152,7 @@ func (m *ListMatcher) Validate() error { case *ListMatcher_OneOf: - if v, ok := interface{}(m.GetOneOf()).(interface { - Validate() error - }); ok { + if v, ok := interface{}(m.GetOneOf()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListMatcherValidationError{ Field: "OneOf", diff --git a/vendor/github.com/envoyproxy/go-control-plane/glide.lock b/vendor/github.com/envoyproxy/go-control-plane/glide.lock index 57dee805c8c9..1ee25a2a6d52 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/glide.lock +++ b/vendor/github.com/envoyproxy/go-control-plane/glide.lock @@ -1,8 +1,8 @@ -hash: d07bf6ef47022e5470f5ef94f2e7dc301ec64c7552d5b1431f12938d7ed89563 -updated: 2018-08-21T18:58:33.820384463-07:00 +hash: c2b34096c5059c94468a70266af5ad1090e0482a248265bcebad5ce37a6ba044 +updated: 2018-09-11T18:33:29.526761309-07:00 imports: - name: github.com/envoyproxy/data-plane-api - version: 8e09edd8fe81be46dc179c678f5f65c40ae7af63 + version: a29483497d9342d4e6419dd99723cb40fae96670 - name: github.com/gogo/googleapis version: 0cd9801be74a10d5ac39d69626eac8255ffcd502 subpackages: @@ -66,7 +66,7 @@ imports: - googleapis/rpc/status - opencensus - name: google.golang.org/grpc - version: 32fb0ac620c32ba40a4626ddf94d90d12cce3455 + version: 8dea3dc473e90c8179e519d91302d0597c0ca1d1 subpackages: - balancer - balancer/base diff --git a/vendor/github.com/envoyproxy/go-control-plane/glide.yaml b/vendor/github.com/envoyproxy/go-control-plane/glide.yaml index f170f76c0c47..486386574f3d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/glide.yaml +++ b/vendor/github.com/envoyproxy/go-control-plane/glide.yaml @@ -22,6 +22,6 @@ import: - package: istio.io/gogo-genproto - package: github.com/gogo/googleapis - package: github.com/envoyproxy/data-plane-api - version: 8e09edd8fe81be46dc179c678f5f65c40ae7af63 + version: a29483497d9342d4e6419dd99723cb40fae96670 - package: github.com/sirupsen/logrus version: ^1.0.4