From dd2fe2e5d24b2e769ed17cdfdc15e635c4e36667 Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:20:01 +0000 Subject: [PATCH] Mirrored from envoyproxy/envoy @ b039d8a316a081d1eae3e3222e045b749d26765e Signed-off-by: update-envoy[bot] <135279899+update-envoy[bot]@users.noreply.github.com> --- .../generic_proxy/codecs/kafka/v3/kafka.pb.go | 177 ++++++++++++++++++ .../codecs/kafka/v3/kafka.pb.validate.go | 136 ++++++++++++++ envoy/COMMIT | 2 +- 3 files changed, 314 insertions(+), 1 deletion(-) create mode 100755 contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.go create mode 100755 contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.go b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.go new file mode 100755 index 0000000000..8fa621475b --- /dev/null +++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.go @@ -0,0 +1,177 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.30.0 +// protoc v4.23.4 +// source: contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.proto + +package kafkav3 + +import ( + _ "github.com/cncf/xds/go/udpa/annotations" + _ "github.com/cncf/xds/go/xds/annotations/v3" + 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) +) + +// Configuration for Kafka codec. This codec gives the generic proxy the ability to proxy +// Kafka traffic. But note any route configuration for Kafka traffic is not supported yet. +// The generic proxy can only used to generate logs or metrics for Kafka traffic but cannot +// do matching or routing. +// +// .. note:: +// +// The codec can currently only be used in the sidecar mode. And to ensure the codec works +// properly, please make sure the following conditions are met: +// +// 1. The generic proxy must be configured with a wildcard route that matches all traffic. +// 2. The target cluster must be configured as a original destination cluster. +// 3. The :ref:`bind_upstream_connection +// ` +// of generic proxy router must be set to true to ensure same upstream connection is used +// for all traffic from same downstream connection. +type KafkaCodecConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *KafkaCodecConfig) Reset() { + *x = KafkaCodecConfig{} + if protoimpl.UnsafeEnabled { + mi := &file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *KafkaCodecConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*KafkaCodecConfig) ProtoMessage() {} + +func (x *KafkaCodecConfig) ProtoReflect() protoreflect.Message { + mi := &file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_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 KafkaCodecConfig.ProtoReflect.Descriptor instead. +func (*KafkaCodecConfig) Descriptor() ([]byte, []int) { + return file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescGZIP(), []int{0} +} + +var File_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto protoreflect.FileDescriptor + +var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDesc = []byte{ + 0x0a, 0x52, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 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, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, + 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, + 0x6b, 0x61, 0x66, 0x6b, 0x61, 0x2f, 0x76, 0x33, 0x2f, 0x6b, 0x61, 0x66, 0x6b, 0x61, 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, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, + 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2e, 0x6b, 0x61, 0x66, 0x6b, + 0x61, 0x2e, 0x76, 0x33, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 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, 0x12, 0x0a, 0x10, 0x4b, 0x61, 0x66, 0x6b, 0x61, 0x43, 0x6f, 0x64, + 0x65, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xe3, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, + 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 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, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, + 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, + 0x2e, 0x6b, 0x61, 0x66, 0x6b, 0x61, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x4b, 0x61, 0x66, 0x6b, 0x61, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x75, 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, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 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, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, + 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, 0x6b, 0x61, + 0x66, 0x6b, 0x61, 0x2f, 0x76, 0x33, 0x3b, 0x6b, 0x61, 0x66, 0x6b, 0x61, 0x76, 0x33, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescOnce sync.Once + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescData = file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDesc +) + +func file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescGZIP() []byte { + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescOnce.Do(func() { + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescData = protoimpl.X.CompressGZIP(file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescData) + }) + return file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDescData +} + +var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_goTypes = []interface{}{ + (*KafkaCodecConfig)(nil), // 0: envoy.extensions.filters.network.generic_proxy.codecs.kafka.v3.KafkaCodecConfig +} +var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_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_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_init() +} +func file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_init() { + if File_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*KafkaCodecConfig); 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_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_goTypes, + DependencyIndexes: file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_depIdxs, + MessageInfos: file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_msgTypes, + }.Build() + File_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto = out.File + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_rawDesc = nil + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_goTypes = nil + file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_kafka_v3_kafka_proto_depIdxs = nil +} diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go new file mode 100755 index 0000000000..a5b07c3995 --- /dev/null +++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go @@ -0,0 +1,136 @@ +// Code generated by protoc-gen-validate. DO NOT EDIT. +// source: contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.proto + +package kafkav3 + +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 KafkaCodecConfig 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 *KafkaCodecConfig) Validate() error { + return m.validate(false) +} + +// ValidateAll checks the field values on KafkaCodecConfig 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 +// KafkaCodecConfigMultiError, or nil if none found. +func (m *KafkaCodecConfig) ValidateAll() error { + return m.validate(true) +} + +func (m *KafkaCodecConfig) validate(all bool) error { + if m == nil { + return nil + } + + var errors []error + + if len(errors) > 0 { + return KafkaCodecConfigMultiError(errors) + } + + return nil +} + +// KafkaCodecConfigMultiError is an error wrapping multiple validation errors +// returned by KafkaCodecConfig.ValidateAll() if the designated constraints +// aren't met. +type KafkaCodecConfigMultiError []error + +// Error returns a concatenation of all the error messages it wraps. +func (m KafkaCodecConfigMultiError) 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 KafkaCodecConfigMultiError) AllErrors() []error { return m } + +// KafkaCodecConfigValidationError is the validation error returned by +// KafkaCodecConfig.Validate if the designated constraints aren't met. +type KafkaCodecConfigValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e KafkaCodecConfigValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e KafkaCodecConfigValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e KafkaCodecConfigValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e KafkaCodecConfigValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e KafkaCodecConfigValidationError) ErrorName() string { return "KafkaCodecConfigValidationError" } + +// Error satisfies the builtin error interface +func (e KafkaCodecConfigValidationError) 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 %sKafkaCodecConfig.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = KafkaCodecConfigValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = KafkaCodecConfigValidationError{} diff --git a/envoy/COMMIT b/envoy/COMMIT index 35c4259bf1..5a350fd2ad 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -483ecb2d4055b42a806f0a1003243ba62c86cf3a +b039d8a316a081d1eae3e3222e045b749d26765e