diff --git a/envoy/COMMIT b/envoy/COMMIT index a6a98a8e70..58830cc954 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -fa6f083611b88fb0a5727f5b806b2b07f8304d2f +de85ff2a125a2c23378bd463259fbea3e05442f9 diff --git a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.go b/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.go deleted file mode 100755 index 63a78bc642..0000000000 --- a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.go +++ /dev/null @@ -1,157 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.30.0 -// protoc v4.23.4 -// source: envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.proto - -package http_capsulev3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -type FilterConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *FilterConfig) Reset() { - *x = FilterConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FilterConfig) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FilterConfig) ProtoMessage() {} - -func (x *FilterConfig) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use FilterConfig.ProtoReflect.Descriptor instead. -func (*FilterConfig) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescGZIP(), []int{0} -} - -var File_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDesc = []byte{ - 0x0a, 0x51, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x75, 0x64, 0x70, 0x2f, 0x75, - 0x64, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x33, - 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x3e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x75, 0x64, - 0x70, 0x2e, 0x75, 0x64, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x65, - 0x2e, 0x76, 0x33, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x42, 0xe0, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x4c, 0x69, - 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x75, 0x64, 0x70, 0x2e, 0x75, 0x64, 0x70, 0x5f, 0x70, 0x72, - 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x68, 0x74, 0x74, 0x70, - 0x5f, 0x63, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x48, 0x74, 0x74, - 0x70, 0x43, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x74, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2f, 0x75, 0x64, 0x70, 0x2f, 0x75, 0x64, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x70, 0x73, - 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x70, 0x73, - 0x75, 0x6c, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescData = file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDesc -) - -func file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescData) - }) - return file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDescData -} - -var file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_goTypes = []interface{}{ - (*FilterConfig)(nil), // 0: envoy.extensions.filters.udp.udp_proxy.session.http_capsule.v3.FilterConfig -} -var file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_init() -} -func file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_init() { - if File_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto = out.File - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_rawDesc = nil - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_goTypes = nil - file_envoy_extensions_filters_udp_udp_proxy_session_http_capsule_v3_http_capsule_proto_depIdxs = nil -} diff --git a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.validate.go b/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.validate.go deleted file mode 100755 index 674c735b6c..0000000000 --- a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.validate.go +++ /dev/null @@ -1,135 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.proto - -package http_capsulev3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on FilterConfig with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *FilterConfig) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on FilterConfig with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in FilterConfigMultiError, or -// nil if none found. -func (m *FilterConfig) ValidateAll() error { - return m.validate(true) -} - -func (m *FilterConfig) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return FilterConfigMultiError(errors) - } - - return nil -} - -// FilterConfigMultiError is an error wrapping multiple validation errors -// returned by FilterConfig.ValidateAll() if the designated constraints aren't met. -type FilterConfigMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m FilterConfigMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m FilterConfigMultiError) AllErrors() []error { return m } - -// FilterConfigValidationError is the validation error returned by -// FilterConfig.Validate if the designated constraints aren't met. -type FilterConfigValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e FilterConfigValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e FilterConfigValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e FilterConfigValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e FilterConfigValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e FilterConfigValidationError) ErrorName() string { return "FilterConfigValidationError" } - -// Error satisfies the builtin error interface -func (e FilterConfigValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sFilterConfig.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = FilterConfigValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = FilterConfigValidationError{} diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go index 4f041a48cb..647e004a07 100755 --- a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go +++ b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go @@ -79,7 +79,6 @@ type UdpProxyConfig struct { ProxyAccessLog []*v31.AccessLog `protobuf:"bytes,10,rep,name=proxy_access_log,json=proxyAccessLog,proto3" json:"proxy_access_log,omitempty"` // Optional session filters that will run for each UDP session. // Only one of use_per_packet_load_balancing or session_filters can be used. - // [#extension-category: envoy.filters.udp.session] SessionFilters []*UdpProxyConfig_SessionFilter `protobuf:"bytes,11,rep,name=session_filters,json=sessionFilters,proto3" json:"session_filters,omitempty"` }