diff --git a/api/event-bus.html b/api/event-bus.html index bedfa251f9..8059c1d885 100644 --- a/api/event-bus.html +++ b/api/event-bus.html @@ -67,8 +67,8 @@

BusConfig kafka
- -KafkaConfig + +KafkaBus @@ -677,6 +677,7 @@

KafkaBus

(Appears on: +BusConfig, EventBusSpec)

@@ -692,38 +693,6 @@

KafkaBus -exotic
- - -KafkaConfig - - - - -

Exotic holds an exotic Kafka config

- - - - -

KafkaConfig -

-

-(Appears on: -BusConfig, -KafkaBus) -

-

-

- - - - - - - - - - - - - -
FieldDescription
url
string @@ -801,7 +770,7 @@

KafkaConsumerGroup

(Appears on: -KafkaConfig) +KafkaBus)

diff --git a/api/event-bus.md b/api/event-bus.md index 6755117b1e..95d9c2d58a 100644 --- a/api/event-bus.md +++ b/api/event-bus.md @@ -76,8 +76,8 @@ NATSConfig
-kafka
- KafkaConfig +kafka
+KafkaBus
(Optional) @@ -673,6 +673,7 @@ KafkaBus

(Appears on: +BusConfig, EventBusSpec)

@@ -694,41 +695,6 @@ Description

-exotic
- KafkaConfig -
-

-Exotic holds an exotic Kafka config -

-
-

-KafkaConfig -

-

-(Appears on: -BusConfig, -KafkaBus) -

-

-

- - - - - - - - - -
-Field - -Description -
url
string
@@ -803,7 +769,7 @@ KafkaConsumerGroup

(Appears on: -KafkaConfig) +KafkaBus)

diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json index 2558b31db3..5f9cc7a64a 100644 --- a/api/jsonschema/schema.json +++ b/api/jsonschema/schema.json @@ -288,7 +288,7 @@ "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamConfig" }, "kafka": { - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaConfig" + "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaBus" }, "nats": { "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.NATSConfig" @@ -525,15 +525,6 @@ }, "io.argoproj.eventbus.v1alpha1.KafkaBus": { "description": "KafkaBus holds the KafkaBus EventBus information", - "properties": { - "exotic": { - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaConfig", - "description": "Exotic holds an exotic Kafka config" - } - }, - "type": "object" - }, - "io.argoproj.eventbus.v1alpha1.KafkaConfig": { "properties": { "consumerGroup": { "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaConsumerGroup", diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 45841eae50..7e04e675c4 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -290,7 +290,7 @@ "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamConfig" }, "kafka": { - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaConfig" + "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaBus" }, "nats": { "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.NATSConfig" @@ -517,15 +517,6 @@ }, "io.argoproj.eventbus.v1alpha1.KafkaBus": { "description": "KafkaBus holds the KafkaBus EventBus information", - "type": "object", - "properties": { - "exotic": { - "description": "Exotic holds an exotic Kafka config", - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.KafkaConfig" - } - } - }, - "io.argoproj.eventbus.v1alpha1.KafkaConfig": { "type": "object", "properties": { "consumerGroup": { diff --git a/controllers/eventbus/installer/installer.go b/controllers/eventbus/installer/installer.go index ce6c100fb1..ab686ec6ca 100644 --- a/controllers/eventbus/installer/installer.go +++ b/controllers/eventbus/installer/installer.go @@ -50,9 +50,7 @@ func getInstaller(eventBus *v1alpha1.EventBus, client client.Client, kubeClient } else if js := eventBus.Spec.JetStream; js != nil { return NewJetStreamInstaller(client, eventBus, config, getLabels(eventBus), kubeClient, logger), nil } else if kafka := eventBus.Spec.Kafka; kafka != nil { - if kafka.Exotic != nil { - return NewExoticKafkaInstaller(eventBus, logger), nil - } + return NewExoticKafkaInstaller(eventBus, logger), nil } return nil, fmt.Errorf("invalid eventbus spec") } diff --git a/controllers/eventbus/installer/exotic_kafka.go b/controllers/eventbus/installer/kafka.go similarity index 84% rename from controllers/eventbus/installer/exotic_kafka.go rename to controllers/eventbus/installer/kafka.go index 8c998658d3..5b0feacfd4 100644 --- a/controllers/eventbus/installer/exotic_kafka.go +++ b/controllers/eventbus/installer/kafka.go @@ -26,17 +26,17 @@ func NewExoticKafkaInstaller(eventBus *v1alpha1.EventBus, logger *zap.SugaredLog func (i *exoticKafkaInstaller) Install(ctx context.Context) (*v1alpha1.BusConfig, error) { kafkaObj := i.eventBus.Spec.Kafka - if kafkaObj == nil || kafkaObj.Exotic == nil { + if kafkaObj == nil { return nil, fmt.Errorf("invalid request") } - if kafkaObj.Exotic.Topic == "" { - kafkaObj.Exotic.Topic = fmt.Sprintf("%s-%s", i.eventBus.Namespace, i.eventBus.Name) + if kafkaObj.Topic == "" { + kafkaObj.Topic = fmt.Sprintf("%s-%s", i.eventBus.Namespace, i.eventBus.Name) } i.eventBus.Status.MarkDeployed("Skipped", "Skip deployment because of using exotic config.") i.logger.Info("use exotic config") busConfig := &v1alpha1.BusConfig{ - Kafka: kafkaObj.Exotic, + Kafka: kafkaObj, } return busConfig, nil } diff --git a/controllers/eventbus/installer/exotic_kafka_test.go b/controllers/eventbus/installer/kafka_test.go similarity index 83% rename from controllers/eventbus/installer/exotic_kafka_test.go rename to controllers/eventbus/installer/kafka_test.go index 94887cc4bf..e5a045a13a 100644 --- a/controllers/eventbus/installer/exotic_kafka_test.go +++ b/controllers/eventbus/installer/kafka_test.go @@ -12,8 +12,8 @@ import ( ) const ( - testExoticKafkaName = "test-kafka" - testExoticKafkaURL = "kafka:9092" + testKafkaName = "test-kafka" + testKafkaURL = "kafka:9092" ) var ( @@ -24,13 +24,11 @@ var ( }, ObjectMeta: metav1.ObjectMeta{ Namespace: testNamespace, - Name: testExoticKafkaName, + Name: testKafkaName, }, Spec: v1alpha1.EventBusSpec{ Kafka: &v1alpha1.KafkaBus{ - Exotic: &v1alpha1.KafkaConfig{ - URL: testExoticKafkaURL, - }, + URL: testKafkaURL, }, }, } @@ -42,7 +40,7 @@ func TestInstallationKafkaExotic(t *testing.T) { conf, err := installer.Install(context.TODO()) assert.NoError(t, err) assert.NotNil(t, conf.Kafka) - assert.Equal(t, conf.Kafka.URL, testExoticKafkaURL) + assert.Equal(t, conf.Kafka.URL, testKafkaURL) }) } diff --git a/controllers/eventbus/validate.go b/controllers/eventbus/validate.go index 73a45983e8..889b41b4a5 100644 --- a/controllers/eventbus/validate.go +++ b/controllers/eventbus/validate.go @@ -37,11 +37,8 @@ func ValidateEventBus(eb *v1alpha1.EventBus) error { } } if x := eb.Spec.Kafka; x != nil { - if x.Exotic == nil { - return fmt.Errorf("\"exotic\" must be defined") - } - if x.Exotic.URL == "" { - return fmt.Errorf("\"spec.kafka.exotic.url\" is missing") + if x.URL == "" { + return fmt.Errorf("\"spec.kafka.url\" is missing") } } return nil diff --git a/controllers/eventbus/validate_test.go b/controllers/eventbus/validate_test.go index 3a16855e29..8c4ce69667 100644 --- a/controllers/eventbus/validate_test.go +++ b/controllers/eventbus/validate_test.go @@ -46,9 +46,7 @@ var ( }, Spec: v1alpha1.EventBusSpec{ Kafka: &v1alpha1.KafkaBus{ - Exotic: &v1alpha1.KafkaConfig{ - URL: "127.0.0.1:9092", - }, + URL: "127.0.0.1:9092", }, }, } @@ -131,9 +129,9 @@ func TestValidate(t *testing.T) { t.Run("test kafka eventbus no URL", func(t *testing.T) { eb := testKafkaEventBus.DeepCopy() - eb.Spec.Kafka.Exotic.URL = "" + eb.Spec.Kafka.URL = "" err := ValidateEventBus(eb) assert.Error(t, err) - assert.Contains(t, err.Error(), "\"spec.kafka.exotic.url\" is missing") + assert.Contains(t, err.Error(), "\"spec.kafka.url\" is missing") }) } diff --git a/eventbus/kafka/base/kafka.go b/eventbus/kafka/base/kafka.go index 18c6269e58..b39fcb8dd3 100644 --- a/eventbus/kafka/base/kafka.go +++ b/eventbus/kafka/base/kafka.go @@ -11,10 +11,10 @@ import ( type Kafka struct { Logger *zap.SugaredLogger - config *eventbusv1alpha1.KafkaConfig + config *eventbusv1alpha1.KafkaBus } -func NewKafka(config *eventbusv1alpha1.KafkaConfig, logger *zap.SugaredLogger) *Kafka { +func NewKafka(config *eventbusv1alpha1.KafkaBus, logger *zap.SugaredLogger) *Kafka { // set defaults if config.ConsumerGroup == nil { config.ConsumerGroup = &eventbusv1alpha1.KafkaConsumerGroup{} diff --git a/eventbus/kafka/eventsource/source_kafka.go b/eventbus/kafka/eventsource/source_kafka.go index 7bebe38f62..d73e0d193f 100644 --- a/eventbus/kafka/eventsource/source_kafka.go +++ b/eventbus/kafka/eventsource/source_kafka.go @@ -13,7 +13,7 @@ type KafkaSource struct { topic string } -func NewKafkaSource(config *eventbusv1alpha1.KafkaConfig, logger *zap.SugaredLogger) *KafkaSource { +func NewKafkaSource(config *eventbusv1alpha1.KafkaBus, logger *zap.SugaredLogger) *KafkaSource { return &KafkaSource{ Kafka: base.NewKafka(config, logger), topic: config.Topic, diff --git a/eventbus/kafka/sensor/kafka_sensor.go b/eventbus/kafka/sensor/kafka_sensor.go index f17d7ea1a6..38f1840678 100644 --- a/eventbus/kafka/sensor/kafka_sensor.go +++ b/eventbus/kafka/sensor/kafka_sensor.go @@ -40,7 +40,7 @@ type KafkaSensor struct { connected bool } -func NewKafkaSensor(kafkaConfig *eventbusv1alpha1.KafkaConfig, sensor *sensorv1alpha1.Sensor, hostname string, logger *zap.SugaredLogger) *KafkaSensor { +func NewKafkaSensor(kafkaConfig *eventbusv1alpha1.KafkaBus, sensor *sensorv1alpha1.Sensor, hostname string, logger *zap.SugaredLogger) *KafkaSensor { topics := &Topics{ event: kafkaConfig.Topic, trigger: fmt.Sprintf("%s-%s-%s", kafkaConfig.Topic, sensor.Name, "trigger"), diff --git a/pkg/apis/eventbus/v1alpha1/eventbus_types.go b/pkg/apis/eventbus/v1alpha1/eventbus_types.go index 556a965c99..deae6e8871 100644 --- a/pkg/apis/eventbus/v1alpha1/eventbus_types.go +++ b/pkg/apis/eventbus/v1alpha1/eventbus_types.go @@ -55,7 +55,7 @@ type BusConfig struct { // +optional JetStream *JetStreamConfig `json:"jetstream,omitempty" protobuf:"bytes,2,opt,name=jetstream"` // +optional - Kafka *KafkaConfig `json:"kafka,omitempty" protobuf:"bytes,3,opt,name=kafka"` + Kafka *KafkaBus `json:"kafka,omitempty" protobuf:"bytes,3,opt,name=kafka"` } const ( diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go index 26af7968b0..083e447e8c 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.pb.go +++ b/pkg/apis/eventbus/v1alpha1/generated.pb.go @@ -300,38 +300,10 @@ func (m *KafkaBus) XXX_DiscardUnknown() { var xxx_messageInfo_KafkaBus proto.InternalMessageInfo -func (m *KafkaConfig) Reset() { *m = KafkaConfig{} } -func (*KafkaConfig) ProtoMessage() {} -func (*KafkaConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{9} -} -func (m *KafkaConfig) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *KafkaConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *KafkaConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_KafkaConfig.Merge(m, src) -} -func (m *KafkaConfig) XXX_Size() int { - return m.Size() -} -func (m *KafkaConfig) XXX_DiscardUnknown() { - xxx_messageInfo_KafkaConfig.DiscardUnknown(m) -} - -var xxx_messageInfo_KafkaConfig proto.InternalMessageInfo - func (m *KafkaConsumerGroup) Reset() { *m = KafkaConsumerGroup{} } func (*KafkaConsumerGroup) ProtoMessage() {} func (*KafkaConsumerGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{10} + return fileDescriptor_871e47633eb7aad4, []int{9} } func (m *KafkaConsumerGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -359,7 +331,7 @@ var xxx_messageInfo_KafkaConsumerGroup proto.InternalMessageInfo func (m *NATSBus) Reset() { *m = NATSBus{} } func (*NATSBus) ProtoMessage() {} func (*NATSBus) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{11} + return fileDescriptor_871e47633eb7aad4, []int{10} } func (m *NATSBus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -387,7 +359,7 @@ var xxx_messageInfo_NATSBus proto.InternalMessageInfo func (m *NATSConfig) Reset() { *m = NATSConfig{} } func (*NATSConfig) ProtoMessage() {} func (*NATSConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{12} + return fileDescriptor_871e47633eb7aad4, []int{11} } func (m *NATSConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -415,7 +387,7 @@ var xxx_messageInfo_NATSConfig proto.InternalMessageInfo func (m *NativeStrategy) Reset() { *m = NativeStrategy{} } func (*NativeStrategy) ProtoMessage() {} func (*NativeStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{13} + return fileDescriptor_871e47633eb7aad4, []int{12} } func (m *NativeStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -443,7 +415,7 @@ var xxx_messageInfo_NativeStrategy proto.InternalMessageInfo func (m *PersistenceStrategy) Reset() { *m = PersistenceStrategy{} } func (*PersistenceStrategy) ProtoMessage() {} func (*PersistenceStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{14} + return fileDescriptor_871e47633eb7aad4, []int{13} } func (m *PersistenceStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -479,7 +451,6 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamBus.NodeSelectorEntry") proto.RegisterType((*JetStreamConfig)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamConfig") proto.RegisterType((*KafkaBus)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.KafkaBus") - proto.RegisterType((*KafkaConfig)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.KafkaConfig") proto.RegisterType((*KafkaConsumerGroup)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.KafkaConsumerGroup") proto.RegisterType((*NATSBus)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.NATSBus") proto.RegisterType((*NATSConfig)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.NATSConfig") @@ -493,135 +464,133 @@ func init() { } var fileDescriptor_871e47633eb7aad4 = []byte{ - // 2040 bytes of a gzipped FileDescriptorProto + // 2011 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xf7, 0x92, 0x94, 0x44, 0x0e, 0xa9, 0x3f, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x41, - 0x0a, 0x15, 0x89, 0x97, 0x75, 0x90, 0xb6, 0xae, 0x7b, 0x70, 0xb9, 0xb2, 0x62, 0xcb, 0x16, 0x65, - 0x75, 0x28, 0x1b, 0x48, 0x1a, 0xd4, 0x1d, 0xad, 0x46, 0xd4, 0x4a, 0xfb, 0x87, 0xdd, 0x99, 0x65, - 0xc5, 0x9e, 0x8a, 0xf6, 0xd0, 0x6b, 0x50, 0x14, 0x45, 0xbf, 0x41, 0x81, 0x7e, 0x80, 0xa2, 0x5f, - 0xa0, 0xa8, 0x0f, 0x05, 0x9a, 0x4b, 0xd1, 0x9c, 0x88, 0x98, 0x41, 0xbf, 0x84, 0x4f, 0xc5, 0xcc, - 0xce, 0xfe, 0x21, 0x77, 0x15, 0x4b, 0x26, 0xdd, 0x20, 0xb7, 0x9d, 0xf7, 0xde, 0xfc, 0xde, 0x9b, - 0x37, 0x6f, 0xde, 0x1f, 0x12, 0x3c, 0xe8, 0x9a, 0xec, 0xd8, 0x3f, 0xd0, 0x0c, 0xd7, 0x6e, 0x62, - 0xaf, 0xeb, 0xf6, 0x3c, 0xf7, 0x44, 0x7c, 0xdc, 0x20, 0x7d, 0xe2, 0x30, 0xda, 0xec, 0x9d, 0x76, - 0x9b, 0xb8, 0x67, 0xd2, 0xa6, 0x58, 0x1f, 0xf8, 0xb4, 0xd9, 0xbf, 0x89, 0xad, 0xde, 0x31, 0xbe, - 0xd9, 0xec, 0x12, 0x87, 0x78, 0x98, 0x91, 0x43, 0xad, 0xe7, 0xb9, 0xcc, 0x85, 0xb7, 0x63, 0x2c, - 0x2d, 0xc4, 0x12, 0x1f, 0x4f, 0x03, 0x2c, 0xad, 0x77, 0xda, 0xd5, 0x38, 0x96, 0x16, 0x62, 0x69, - 0x21, 0xd6, 0xfa, 0x9d, 0x0b, 0xdb, 0x61, 0xb8, 0xb6, 0xed, 0x3a, 0x93, 0xca, 0xd7, 0x6f, 0x24, - 0x00, 0xba, 0x6e, 0xd7, 0x6d, 0x0a, 0xf2, 0x81, 0x7f, 0x24, 0x56, 0x62, 0x21, 0xbe, 0xa4, 0x78, - 0xe3, 0xf4, 0x16, 0xd5, 0x4c, 0x97, 0x43, 0x36, 0x0d, 0xd7, 0x23, 0xcd, 0x7e, 0xea, 0x3c, 0xeb, - 0x1f, 0xc4, 0x32, 0x36, 0x36, 0x8e, 0x4d, 0x87, 0x78, 0x83, 0xd0, 0x8e, 0xa6, 0x47, 0xa8, 0xeb, - 0x7b, 0x06, 0xb9, 0xd4, 0x2e, 0xda, 0xb4, 0x09, 0xc3, 0x59, 0xba, 0x9a, 0xe7, 0xed, 0xf2, 0x7c, - 0x87, 0x99, 0x76, 0x5a, 0xcd, 0xf7, 0x5f, 0xb6, 0x81, 0x1a, 0xc7, 0xc4, 0xc6, 0x93, 0xfb, 0x1a, - 0xff, 0xce, 0x81, 0x92, 0xee, 0xd3, 0x4d, 0xd7, 0x39, 0x32, 0xbb, 0xf0, 0x10, 0x14, 0x1c, 0xcc, - 0xa8, 0xaa, 0x5c, 0x57, 0x36, 0xca, 0xef, 0x7f, 0xa8, 0xbd, 0xfa, 0x0d, 0x6a, 0xbb, 0xad, 0xfd, - 0x4e, 0x80, 0xaa, 0x17, 0x47, 0xc3, 0x7a, 0x81, 0xaf, 0x91, 0x40, 0x87, 0x67, 0xa0, 0x74, 0x42, - 0x18, 0x65, 0x1e, 0xc1, 0xb6, 0x9a, 0x13, 0xaa, 0x1e, 0x4e, 0xa3, 0xea, 0x01, 0x61, 0x1d, 0x01, - 0x26, 0xf5, 0x2d, 0x8e, 0x86, 0xf5, 0x52, 0x44, 0x44, 0xb1, 0x32, 0x78, 0x0c, 0xe6, 0x4e, 0xf1, - 0xd1, 0x29, 0x56, 0xf3, 0x42, 0xeb, 0xbd, 0x69, 0xb4, 0x3e, 0xe4, 0x40, 0x52, 0x63, 0x69, 0x34, - 0xac, 0xcf, 0x09, 0x02, 0x0a, 0x14, 0x34, 0xfe, 0x9a, 0x03, 0xd5, 0x4d, 0xd7, 0x61, 0x98, 0xdf, - 0xc4, 0x3e, 0xb1, 0x7b, 0x16, 0x66, 0x04, 0x7e, 0x04, 0x4a, 0x61, 0xa0, 0x84, 0x4e, 0xde, 0xd0, - 0x82, 0x9b, 0xe3, 0x6a, 0x34, 0x1e, 0x7a, 0x5a, 0xff, 0xa6, 0x86, 0xa4, 0x10, 0x22, 0xbf, 0xf0, - 0x4d, 0x8f, 0xd8, 0xdc, 0x16, 0xbd, 0xfa, 0x6c, 0x58, 0xbf, 0xc2, 0x8f, 0x16, 0x72, 0x29, 0x8a, - 0xd1, 0xe0, 0x01, 0x58, 0x36, 0x6d, 0xdc, 0x25, 0x7b, 0xbe, 0x65, 0xed, 0xb9, 0x96, 0x69, 0x0c, - 0x84, 0x6b, 0x4b, 0xfa, 0x2d, 0xb9, 0x6d, 0x79, 0x7b, 0x9c, 0xfd, 0x62, 0x58, 0xbf, 0x96, 0x8e, - 0x7a, 0x2d, 0x16, 0x40, 0x93, 0x80, 0x5c, 0x07, 0x25, 0x86, 0xef, 0x99, 0x6c, 0xc0, 0xcf, 0x46, - 0xce, 0x98, 0x74, 0xe4, 0xdb, 0x59, 0x87, 0xe8, 0x8c, 0x8b, 0xea, 0xab, 0xdc, 0x88, 0x09, 0x22, - 0x9a, 0x04, 0x6c, 0xfc, 0x33, 0x07, 0x8a, 0x5b, 0xdc, 0xd9, 0xba, 0x4f, 0xe1, 0xcf, 0x41, 0x91, - 0xbf, 0x90, 0x43, 0xcc, 0xb0, 0x74, 0xd7, 0x77, 0x13, 0x9a, 0xa2, 0x40, 0x8f, 0xaf, 0x89, 0x4b, - 0x73, 0xdd, 0x8f, 0x0e, 0x4e, 0x88, 0xc1, 0xda, 0x84, 0x61, 0x1d, 0xca, 0xf3, 0x83, 0x98, 0x86, - 0x22, 0x54, 0x78, 0x02, 0x0a, 0xb4, 0x47, 0x0c, 0x19, 0x86, 0xf7, 0xa7, 0x09, 0x88, 0xd0, 0xea, - 0x4e, 0x8f, 0x18, 0x7a, 0x45, 0x6a, 0x2d, 0xf0, 0x15, 0x12, 0x3a, 0xa0, 0x07, 0xe6, 0x29, 0xc3, - 0xcc, 0xa7, 0xd2, 0x6b, 0x0f, 0x66, 0xa2, 0x4d, 0x20, 0xea, 0x4b, 0x52, 0xdf, 0x7c, 0xb0, 0x46, - 0x52, 0x53, 0xe3, 0x3f, 0x0a, 0xa8, 0x84, 0xa2, 0x3b, 0x26, 0x65, 0xf0, 0x93, 0x94, 0x4b, 0xb5, - 0x8b, 0xb9, 0x94, 0xef, 0x16, 0x0e, 0x5d, 0x91, 0xaa, 0x8a, 0x21, 0x25, 0xe1, 0x4e, 0x13, 0xcc, - 0x99, 0x8c, 0xd8, 0x54, 0xcd, 0x5d, 0xcf, 0x6f, 0x94, 0xdf, 0xbf, 0x3b, 0x8b, 0x13, 0xea, 0x8b, - 0x52, 0xe1, 0xdc, 0x36, 0x87, 0x46, 0x81, 0x86, 0xc6, 0xbf, 0x72, 0xf1, 0xc9, 0xb8, 0x93, 0x21, - 0x1e, 0x4b, 0x5e, 0x9b, 0xd3, 0x26, 0x2f, 0xae, 0x79, 0x32, 0x73, 0xf9, 0xe9, 0xcc, 0x75, 0x7f, - 0x26, 0x99, 0x4b, 0x1c, 0xf3, 0xdc, 0xb4, 0x45, 0xc6, 0xd3, 0xd6, 0xdd, 0xa9, 0xd3, 0x16, 0x57, - 0x97, 0xce, 0x59, 0x5f, 0x28, 0x60, 0x69, 0x3c, 0xac, 0xe0, 0xd3, 0x28, 0x64, 0x03, 0xaf, 0xfe, - 0xe0, 0xe2, 0xaa, 0x83, 0xc2, 0xac, 0x7d, 0x75, 0x7c, 0x42, 0x1b, 0xcc, 0x1b, 0x22, 0x87, 0x4a, - 0x77, 0x6e, 0x4d, 0x73, 0xb6, 0xa8, 0x90, 0xc5, 0xea, 0x82, 0x35, 0x92, 0x4a, 0x1a, 0xbf, 0x5d, - 0x02, 0x95, 0xa4, 0xd3, 0xe1, 0x77, 0xc0, 0x42, 0x9f, 0x78, 0xd4, 0x74, 0x1d, 0x71, 0xc2, 0x92, - 0xbe, 0x2c, 0x77, 0x2e, 0x3c, 0x09, 0xc8, 0x28, 0xe4, 0xc3, 0x0d, 0x50, 0xf4, 0x48, 0xcf, 0x32, - 0x0d, 0x4c, 0x85, 0xb1, 0x73, 0x7a, 0x85, 0xbf, 0x02, 0x24, 0x69, 0x28, 0xe2, 0xc2, 0xdf, 0x2b, - 0xa0, 0x6a, 0x4c, 0x26, 0x7f, 0x79, 0x79, 0xed, 0x69, 0x0e, 0x98, 0xaa, 0x28, 0xfa, 0x1b, 0xa3, - 0x61, 0x3d, 0x5d, 0x68, 0x50, 0x5a, 0x3d, 0xfc, 0x8b, 0x02, 0xae, 0x7a, 0xc4, 0x72, 0xf1, 0x21, - 0xf1, 0x52, 0x1b, 0xd4, 0xc2, 0xeb, 0x30, 0xee, 0xda, 0x68, 0x58, 0xbf, 0x8a, 0xce, 0xd3, 0x89, - 0xce, 0x37, 0x07, 0xfe, 0x59, 0x01, 0xaa, 0x4d, 0x98, 0x67, 0x1a, 0x34, 0x6d, 0xeb, 0xdc, 0xeb, - 0xb0, 0xf5, 0xad, 0xd1, 0xb0, 0xae, 0xb6, 0xcf, 0x51, 0x89, 0xce, 0x35, 0x06, 0xfe, 0x46, 0x01, - 0xe5, 0x1e, 0x8f, 0x10, 0xca, 0x88, 0x63, 0x10, 0x75, 0x5e, 0x18, 0xf7, 0x68, 0x1a, 0xe3, 0xf6, - 0x62, 0xb8, 0x0e, 0xe3, 0xcd, 0x5a, 0x77, 0xa0, 0x2f, 0x8f, 0x86, 0xf5, 0x72, 0x82, 0x81, 0x92, - 0x4a, 0xa1, 0x91, 0x48, 0xea, 0x0b, 0xc2, 0x80, 0x1f, 0x5e, 0xfa, 0xa1, 0xb6, 0x25, 0x40, 0x10, - 0xd5, 0xe1, 0x2a, 0x91, 0xdb, 0xff, 0xa0, 0x80, 0x8a, 0xe3, 0x1e, 0x92, 0x0e, 0xb1, 0x88, 0xc1, - 0x5c, 0x4f, 0x2d, 0x8a, 0x1c, 0xff, 0xf1, 0xac, 0x12, 0xa0, 0xb6, 0x9b, 0x00, 0xdf, 0x72, 0x98, - 0x37, 0xd0, 0xd7, 0xe4, 0x63, 0xac, 0x24, 0x59, 0x68, 0xcc, 0x0a, 0xf8, 0x18, 0x94, 0x99, 0x6b, - 0xf1, 0xa6, 0xd6, 0x74, 0x1d, 0xaa, 0x96, 0x84, 0x51, 0xb5, 0xac, 0x86, 0x64, 0x3f, 0x12, 0xd3, - 0x57, 0x25, 0x70, 0x39, 0xa6, 0x51, 0x94, 0xc4, 0x81, 0x24, 0xdd, 0xeb, 0x00, 0xe1, 0xd9, 0x6f, - 0x67, 0x41, 0xef, 0xb9, 0x87, 0xaf, 0xd4, 0xee, 0x40, 0x07, 0xac, 0x44, 0x5d, 0x56, 0x87, 0x18, - 0x1e, 0x61, 0x54, 0x2d, 0x8b, 0x23, 0x64, 0x36, 0x86, 0x3b, 0xae, 0x81, 0xad, 0xa0, 0x91, 0x41, - 0xe4, 0x88, 0x78, 0xfc, 0xf6, 0x75, 0x55, 0x1e, 0x66, 0x65, 0x7b, 0x02, 0x09, 0xa5, 0xb0, 0xe1, - 0x3d, 0x50, 0xed, 0x79, 0xa6, 0x2b, 0x4c, 0xb0, 0x30, 0xa5, 0xbb, 0xd8, 0x26, 0x6a, 0x45, 0x64, - 0xbe, 0xab, 0x12, 0xa6, 0xba, 0x37, 0x29, 0x80, 0xd2, 0x7b, 0x78, 0x36, 0x0c, 0x89, 0xea, 0x62, - 0x9c, 0x0d, 0xc3, 0xbd, 0x28, 0xe2, 0xc2, 0x0f, 0x41, 0x11, 0x1f, 0x1d, 0x99, 0x0e, 0x97, 0x5c, - 0x12, 0x2e, 0x7c, 0x2b, 0xeb, 0x68, 0x2d, 0x29, 0x13, 0xe0, 0x84, 0x2b, 0x14, 0xed, 0x85, 0x0f, - 0x00, 0xa4, 0xc4, 0xeb, 0x9b, 0x06, 0x69, 0x19, 0x86, 0xeb, 0x3b, 0x4c, 0xd8, 0xbe, 0x2c, 0x6c, - 0x5f, 0x97, 0xb6, 0xc3, 0x4e, 0x4a, 0x02, 0x65, 0xec, 0xe2, 0xd6, 0x53, 0xc2, 0x98, 0xe9, 0x74, - 0xa9, 0xba, 0x22, 0x10, 0x84, 0xd6, 0x8e, 0xa4, 0xa1, 0x88, 0x0b, 0xdf, 0x05, 0x25, 0xca, 0xb0, - 0xc7, 0x5a, 0x5e, 0x97, 0xaa, 0xd5, 0xeb, 0xf9, 0x8d, 0x52, 0x50, 0xa8, 0x3b, 0x21, 0x11, 0xc5, - 0x7c, 0xf8, 0x01, 0xa8, 0xd0, 0xc4, 0x24, 0xa2, 0x42, 0x01, 0xbd, 0xc2, 0x23, 0x38, 0x39, 0xa1, - 0xa0, 0x31, 0x29, 0xa8, 0x01, 0x60, 0xe3, 0xb3, 0x3d, 0x3c, 0xe0, 0xd9, 0x50, 0x5d, 0x15, 0x7b, - 0x96, 0x78, 0xc7, 0xda, 0x8e, 0xa8, 0x28, 0x21, 0xb1, 0x7e, 0x07, 0x54, 0x53, 0x4f, 0x05, 0xae, - 0x80, 0xfc, 0x29, 0x19, 0x04, 0x45, 0x0c, 0xf1, 0x4f, 0xb8, 0x06, 0xe6, 0xfa, 0xd8, 0xf2, 0x49, - 0x30, 0x07, 0xa0, 0x60, 0x71, 0x3b, 0x77, 0x4b, 0x69, 0xfc, 0x43, 0x01, 0xcb, 0x13, 0x43, 0x13, - 0xbc, 0x06, 0xf2, 0xbe, 0x67, 0xc9, 0x22, 0x58, 0x96, 0xee, 0xcc, 0x3f, 0x46, 0x3b, 0x88, 0xd3, - 0xe1, 0x4f, 0x41, 0x05, 0x1b, 0x06, 0xa1, 0x34, 0x08, 0x24, 0x59, 0xad, 0xdf, 0x39, 0xa7, 0xef, - 0xf7, 0x08, 0x7b, 0x48, 0x06, 0xa1, 0x81, 0x81, 0x03, 0x5a, 0x89, 0xed, 0x68, 0x0c, 0x0c, 0xde, - 0x9a, 0x70, 0x5b, 0x5e, 0x18, 0x11, 0x3d, 0xfe, 0xf3, 0x5d, 0xd7, 0xf8, 0x25, 0x28, 0x86, 0x0d, - 0x0d, 0x3c, 0x05, 0xf3, 0xe4, 0xcc, 0x65, 0xa6, 0x21, 0x7b, 0x95, 0x99, 0x4d, 0x77, 0x80, 0x37, - 0x12, 0x5b, 0x02, 0x1a, 0x49, 0x15, 0x8d, 0xbf, 0xe5, 0x41, 0x39, 0x21, 0xf3, 0x32, 0xf7, 0xbd, - 0x0d, 0xe6, 0x98, 0xdb, 0x33, 0x0d, 0x39, 0x93, 0x45, 0x1d, 0xed, 0x3e, 0x27, 0xa2, 0x80, 0x97, - 0xec, 0x45, 0xf2, 0x2f, 0xe9, 0x45, 0x1e, 0x83, 0x3c, 0xb3, 0xa8, 0xac, 0xda, 0xb7, 0x2f, 0x9d, - 0xeb, 0xf7, 0x77, 0xc2, 0xd9, 0x7c, 0x81, 0x9b, 0xb9, 0xbf, 0xd3, 0x41, 0x1c, 0x0f, 0x7e, 0x04, - 0x0a, 0x14, 0x53, 0x4b, 0x56, 0xd8, 0x1f, 0x5d, 0xbe, 0xd9, 0x6b, 0x75, 0x76, 0x92, 0x43, 0x3f, - 0x5f, 0x23, 0x01, 0x09, 0x7f, 0xa7, 0x80, 0x45, 0xc3, 0x75, 0xa8, 0x6f, 0x13, 0xef, 0x9e, 0xe7, - 0xfa, 0x3d, 0x59, 0x29, 0x77, 0x67, 0x71, 0x4b, 0x31, 0xaa, 0x5e, 0x1d, 0x0d, 0xeb, 0x8b, 0x63, - 0x24, 0x34, 0xae, 0xb7, 0xf1, 0x77, 0x05, 0xc0, 0xf4, 0x46, 0xd8, 0x04, 0xa5, 0x2e, 0xff, 0x10, - 0x59, 0x25, 0xb8, 0xc7, 0x68, 0xe2, 0xbe, 0x17, 0x32, 0x50, 0x2c, 0xc3, 0x53, 0xa9, 0x47, 0x0e, - 0xb0, 0x85, 0x13, 0x75, 0x5a, 0xde, 0x6f, 0x94, 0x4a, 0xd1, 0xa4, 0x00, 0x4a, 0xef, 0x81, 0xdf, - 0x03, 0x65, 0x91, 0x42, 0x1e, 0x59, 0x87, 0x84, 0x06, 0x23, 0x75, 0x31, 0xae, 0x50, 0x9d, 0x98, - 0x85, 0x92, 0x72, 0x8d, 0xff, 0x2a, 0x60, 0x41, 0x0e, 0x2a, 0xd0, 0x01, 0xf3, 0x0e, 0x66, 0x66, - 0x9f, 0xc8, 0xd8, 0x9f, 0x6a, 0xb4, 0xdc, 0x15, 0x48, 0x51, 0xeb, 0x21, 0xc2, 0x3f, 0xa0, 0x21, - 0xa9, 0x05, 0x9e, 0x44, 0x6f, 0x2d, 0x37, 0xd3, 0x9f, 0x8a, 0xb2, 0x9e, 0xda, 0x97, 0x0a, 0x00, - 0xb1, 0xc8, 0xcb, 0x5e, 0xda, 0xbb, 0xa0, 0x64, 0x58, 0x3e, 0x65, 0xc4, 0xdb, 0xbe, 0x1b, 0xbe, - 0x36, 0x7e, 0x85, 0x9b, 0x21, 0x11, 0xc5, 0x7c, 0xf8, 0x1e, 0x28, 0x60, 0x9f, 0x1d, 0xcb, 0xe7, - 0xa6, 0xf2, 0x90, 0x6d, 0xf9, 0xec, 0xf8, 0x05, 0x4f, 0x57, 0x3e, 0x3b, 0x8e, 0x2e, 0x4d, 0x48, - 0xa5, 0x72, 0x60, 0x61, 0x86, 0x39, 0xb0, 0xf1, 0xe9, 0x32, 0x58, 0x1a, 0x77, 0x3c, 0x7c, 0x2f, - 0x31, 0x70, 0x28, 0xa2, 0xc4, 0x46, 0xa3, 0x77, 0xc6, 0xd0, 0x11, 0x9e, 0x25, 0x77, 0xa1, 0xb3, - 0x4c, 0xb6, 0xad, 0xf9, 0xaf, 0xa3, 0x6d, 0xcd, 0x9e, 0x93, 0x0a, 0x5f, 0xef, 0x9c, 0xf4, 0xcd, - 0x19, 0x3d, 0xfe, 0x38, 0xd9, 0x90, 0xcf, 0x8b, 0xc6, 0xf1, 0x93, 0xd9, 0xbd, 0xfd, 0xd9, 0xb4, - 0xe4, 0x0b, 0x33, 0x6a, 0xc9, 0x93, 0x53, 0x4e, 0xf1, 0x75, 0x4d, 0x39, 0x19, 0x7d, 0x7f, 0xe9, - 0x35, 0xf4, 0xfd, 0x0d, 0x30, 0x6f, 0xe3, 0xb3, 0x56, 0x97, 0x88, 0xa9, 0xa2, 0x14, 0x24, 0xbe, - 0xb6, 0xa0, 0x20, 0xc9, 0xf9, 0xbf, 0xcf, 0x06, 0xd9, 0x0d, 0x76, 0xe5, 0x95, 0x1a, 0xec, 0xcc, - 0x39, 0x63, 0x71, 0xca, 0x39, 0x63, 0xe9, 0xc2, 0x73, 0xc6, 0xf2, 0x14, 0x73, 0xc6, 0x3b, 0x60, - 0xc1, 0xc6, 0x67, 0x6d, 0x2a, 0x47, 0x83, 0x82, 0x5e, 0xe6, 0x2d, 0x58, 0x3b, 0x20, 0xa1, 0x90, - 0xc7, 0x0d, 0xb3, 0xf1, 0x99, 0x3e, 0x60, 0x84, 0xcf, 0x05, 0xd1, 0x08, 0xd1, 0x96, 0x34, 0x14, - 0x71, 0x25, 0x60, 0xc7, 0x3f, 0xa0, 0x62, 0x20, 0x88, 0x01, 0x39, 0x09, 0x85, 0xbc, 0xcb, 0x8e, - 0x01, 0x70, 0x07, 0xac, 0x79, 0xf8, 0x88, 0xdd, 0x27, 0xd8, 0x63, 0x07, 0x04, 0xb3, 0x7d, 0xd3, - 0x26, 0xae, 0xcf, 0xd4, 0xb5, 0xa8, 0x00, 0xac, 0xa1, 0x0c, 0x3e, 0xca, 0xdc, 0x05, 0xb7, 0xc1, - 0x2a, 0xa7, 0x6f, 0xf1, 0x27, 0x6c, 0xba, 0x4e, 0x08, 0xf6, 0x86, 0x00, 0x7b, 0x73, 0x34, 0xac, - 0xaf, 0xa2, 0x34, 0x1b, 0x65, 0xed, 0x81, 0x3f, 0x06, 0x2b, 0x9c, 0xbc, 0x43, 0x30, 0x25, 0x21, - 0xce, 0xb7, 0x82, 0x96, 0x9e, 0x47, 0x22, 0x9a, 0xe0, 0xa1, 0x94, 0x34, 0xdc, 0x04, 0x55, 0x4e, - 0xdb, 0x74, 0x6d, 0xdb, 0x8c, 0xce, 0xf5, 0xa6, 0x80, 0x10, 0x89, 0x1c, 0x4d, 0x32, 0x51, 0x5a, - 0x7e, 0xfa, 0x31, 0xe9, 0x4f, 0x39, 0xb0, 0x9a, 0x51, 0xd4, 0xf8, 0xf9, 0x28, 0x73, 0x3d, 0xdc, - 0x25, 0x71, 0x68, 0x2b, 0xf1, 0xf9, 0x3a, 0x13, 0x3c, 0x94, 0x92, 0x86, 0x4f, 0x01, 0x08, 0x8a, - 0x7f, 0xdb, 0x3d, 0x94, 0x8a, 0xf5, 0x3b, 0xfc, 0xaa, 0x5b, 0x11, 0xf5, 0xc5, 0xb0, 0x7e, 0x23, - 0xeb, 0xef, 0x99, 0xd0, 0x1e, 0xf6, 0xc4, 0xb5, 0x7c, 0x9b, 0xc4, 0x1b, 0x50, 0x02, 0x12, 0xfe, - 0x0c, 0x80, 0xbe, 0xe0, 0x77, 0xcc, 0x5f, 0x85, 0xc5, 0xfd, 0x2b, 0x7f, 0xe7, 0xd7, 0xc2, 0x7f, - 0x92, 0xb4, 0x9f, 0xf8, 0xd8, 0x61, 0xfc, 0x7d, 0x88, 0xd8, 0x7b, 0x12, 0xa1, 0xa0, 0x04, 0xa2, - 0xae, 0x3d, 0x7b, 0x5e, 0xbb, 0xf2, 0xd9, 0xf3, 0xda, 0x95, 0xcf, 0x9f, 0xd7, 0xae, 0xfc, 0x7a, - 0x54, 0x53, 0x9e, 0x8d, 0x6a, 0xca, 0x67, 0xa3, 0x9a, 0xf2, 0xf9, 0xa8, 0xa6, 0x7c, 0x31, 0xaa, - 0x29, 0x9f, 0x7e, 0x59, 0xbb, 0xf2, 0x71, 0x31, 0x2c, 0x2b, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, - 0xea, 0x71, 0xb1, 0xd7, 0x58, 0x1e, 0x00, 0x00, + 0x15, 0xd7, 0x8a, 0x94, 0x44, 0x0e, 0xa9, 0x3f, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x41, + 0x0a, 0x17, 0x89, 0x97, 0x75, 0x91, 0xb6, 0xae, 0x7b, 0x70, 0xb9, 0x8a, 0x62, 0xcb, 0x16, 0x65, + 0x75, 0x28, 0x1b, 0x48, 0x1a, 0xd4, 0x1d, 0xad, 0x46, 0xd4, 0x4a, 0xfb, 0x87, 0x9d, 0x99, 0x25, + 0xc4, 0x9e, 0x8a, 0xf6, 0xd0, 0x6b, 0x50, 0x14, 0x45, 0xbf, 0x41, 0x81, 0xde, 0xdb, 0x6f, 0x50, + 0xd4, 0x87, 0x02, 0x0d, 0x7a, 0x69, 0x4e, 0x44, 0xcc, 0xa0, 0x5f, 0xc2, 0xa7, 0x62, 0x66, 0x67, + 0xff, 0x90, 0x4b, 0xd9, 0x92, 0x29, 0xd7, 0xc8, 0x6d, 0xe7, 0xbd, 0x37, 0xbf, 0xf7, 0xe6, 0xcd, + 0xcc, 0x7b, 0xbf, 0x21, 0xc1, 0xfd, 0x8e, 0xcd, 0x8f, 0x82, 0x7d, 0xc3, 0xf2, 0xdd, 0x06, 0xa6, + 0x1d, 0xbf, 0x4b, 0xfd, 0x63, 0xf9, 0x71, 0x83, 0xf4, 0x88, 0xc7, 0x59, 0xa3, 0x7b, 0xd2, 0x69, + 0xe0, 0xae, 0xcd, 0x1a, 0x72, 0xbc, 0x1f, 0xb0, 0x46, 0xef, 0x26, 0x76, 0xba, 0x47, 0xf8, 0x66, + 0xa3, 0x43, 0x3c, 0x42, 0x31, 0x27, 0x07, 0x46, 0x97, 0xfa, 0xdc, 0x87, 0xb7, 0x13, 0x2c, 0x23, + 0xc2, 0x92, 0x1f, 0x4f, 0x42, 0x2c, 0xa3, 0x7b, 0xd2, 0x31, 0x04, 0x96, 0x11, 0x61, 0x19, 0x11, + 0xd6, 0xfa, 0x9d, 0x73, 0xc7, 0x61, 0xf9, 0xae, 0xeb, 0x7b, 0xe3, 0xce, 0xd7, 0x6f, 0xa4, 0x00, + 0x3a, 0x7e, 0xc7, 0x6f, 0x48, 0xf1, 0x7e, 0x70, 0x28, 0x47, 0x72, 0x20, 0xbf, 0x94, 0x79, 0xfd, + 0xe4, 0x16, 0x33, 0x6c, 0x5f, 0x40, 0x36, 0x2c, 0x9f, 0x92, 0x46, 0x2f, 0xb3, 0x9e, 0xf5, 0x0f, + 0x13, 0x1b, 0x17, 0x5b, 0x47, 0xb6, 0x47, 0x68, 0x3f, 0x8a, 0xa3, 0x41, 0x09, 0xf3, 0x03, 0x6a, + 0x91, 0x0b, 0xcd, 0x62, 0x0d, 0x97, 0x70, 0x3c, 0xc9, 0x57, 0xe3, 0xac, 0x59, 0x34, 0xf0, 0xb8, + 0xed, 0x66, 0xdd, 0xfc, 0xe0, 0x65, 0x13, 0x98, 0x75, 0x44, 0x5c, 0x3c, 0x3e, 0xaf, 0xfe, 0xef, + 0x59, 0x50, 0x34, 0x03, 0xb6, 0xe1, 0x7b, 0x87, 0x76, 0x07, 0x1e, 0x80, 0xbc, 0x87, 0x39, 0xd3, + 0xb5, 0x6b, 0xda, 0xf5, 0xd2, 0xf7, 0x3e, 0x36, 0x5e, 0x7d, 0x07, 0x8d, 0x9d, 0xe6, 0x5e, 0x3b, + 0x44, 0x35, 0x0b, 0xc3, 0x41, 0x2d, 0x2f, 0xc6, 0x48, 0xa2, 0xc3, 0x53, 0x50, 0x3c, 0x26, 0x9c, + 0x71, 0x4a, 0xb0, 0xab, 0xcf, 0x4a, 0x57, 0x0f, 0xa6, 0x71, 0x75, 0x9f, 0xf0, 0xb6, 0x04, 0x53, + 0xfe, 0x16, 0x87, 0x83, 0x5a, 0x31, 0x16, 0xa2, 0xc4, 0x19, 0x24, 0x60, 0xee, 0x04, 0x1f, 0x9e, + 0x60, 0x3d, 0x27, 0xbd, 0x7e, 0x34, 0x8d, 0xd7, 0x07, 0x02, 0xc8, 0x0c, 0x98, 0x59, 0x1c, 0x0e, + 0x6a, 0x73, 0x72, 0x84, 0x42, 0xf4, 0xfa, 0xdf, 0x66, 0x41, 0x65, 0xc3, 0xf7, 0x38, 0x16, 0xdb, + 0xb0, 0x47, 0xdc, 0xae, 0x83, 0x39, 0x81, 0x9f, 0x80, 0x62, 0x74, 0x4a, 0xa2, 0x0c, 0x5f, 0x37, + 0xc2, 0x6d, 0x13, 0x3e, 0x0c, 0x71, 0xee, 0x8c, 0xde, 0x4d, 0x03, 0x29, 0x23, 0x44, 0x7e, 0x19, + 0xd8, 0x94, 0xb8, 0x22, 0x10, 0xb3, 0xf2, 0x74, 0x50, 0x9b, 0x11, 0xeb, 0x8a, 0xb4, 0x0c, 0x25, + 0x68, 0x70, 0x1f, 0x2c, 0xdb, 0x2e, 0xee, 0x90, 0xdd, 0xc0, 0x71, 0x76, 0x7d, 0xc7, 0xb6, 0xfa, + 0x32, 0xaf, 0x45, 0xf3, 0x96, 0x9a, 0xb6, 0xbc, 0x35, 0xaa, 0x7e, 0x3e, 0xa8, 0x5d, 0xcd, 0x1e, + 0x79, 0x23, 0x31, 0x40, 0xe3, 0x80, 0xc2, 0x07, 0x23, 0x56, 0x40, 0x6d, 0xde, 0x17, 0x6b, 0x23, + 0xa7, 0x5c, 0x65, 0xf1, 0xdd, 0x49, 0x8b, 0x68, 0x8f, 0x9a, 0x9a, 0xab, 0x22, 0x88, 0x31, 0x21, + 0x1a, 0x07, 0xac, 0xff, 0x73, 0x16, 0x14, 0x36, 0x45, 0xa6, 0xcd, 0x80, 0xc1, 0x5f, 0x80, 0x82, + 0xb8, 0x1e, 0x07, 0x98, 0x63, 0x95, 0xae, 0xef, 0xa6, 0x3c, 0xc5, 0xa7, 0x3c, 0xd9, 0x23, 0x61, + 0x2d, 0x7c, 0x3f, 0xdc, 0x3f, 0x26, 0x16, 0x6f, 0x11, 0x8e, 0x4d, 0xa8, 0xd6, 0x0f, 0x12, 0x19, + 0x8a, 0x51, 0xe1, 0x31, 0xc8, 0xb3, 0x2e, 0xb1, 0xd4, 0x19, 0xbc, 0x37, 0xcd, 0x69, 0x88, 0xa2, + 0x6e, 0x77, 0x89, 0x65, 0x96, 0x95, 0xd7, 0xbc, 0x18, 0x21, 0xe9, 0x03, 0x52, 0x30, 0xcf, 0x38, + 0xe6, 0x01, 0x53, 0x59, 0xbb, 0x7f, 0x29, 0xde, 0x24, 0xa2, 0xb9, 0xa4, 0xfc, 0xcd, 0x87, 0x63, + 0xa4, 0x3c, 0xd5, 0xff, 0xa3, 0x81, 0x72, 0x64, 0xba, 0x6d, 0x33, 0x0e, 0x3f, 0xcb, 0xa4, 0xd4, + 0x38, 0x5f, 0x4a, 0xc5, 0x6c, 0x99, 0xd0, 0x15, 0xe5, 0xaa, 0x10, 0x49, 0x52, 0xe9, 0xb4, 0xc1, + 0x9c, 0xcd, 0x89, 0xcb, 0xf4, 0xd9, 0x6b, 0xb9, 0x69, 0x6f, 0x57, 0x14, 0xb6, 0xb9, 0xa8, 0x1c, + 0xce, 0x6d, 0x09, 0x68, 0x14, 0x7a, 0xa8, 0xff, 0x6b, 0x36, 0x59, 0x99, 0x48, 0x32, 0xc4, 0x23, + 0x95, 0x6b, 0x63, 0xda, 0xca, 0x25, 0x3c, 0x8f, 0x97, 0xad, 0x20, 0x5b, 0xb6, 0xee, 0x5d, 0x4a, + 0xd9, 0x92, 0xcb, 0x7c, 0xd3, 0x35, 0xeb, 0x2b, 0x0d, 0x2c, 0x8d, 0x1e, 0x2b, 0xf8, 0x24, 0x3e, + 0xb2, 0x61, 0x56, 0x7f, 0x78, 0x7e, 0xd7, 0x61, 0x57, 0x36, 0x5e, 0x7c, 0x3e, 0xa1, 0x0b, 0xe6, + 0x2d, 0x59, 0xb2, 0x55, 0x3a, 0x37, 0xa7, 0x59, 0x5b, 0xdc, 0xc5, 0x12, 0x77, 0xe1, 0x18, 0x29, + 0x27, 0xf5, 0xdf, 0x2e, 0x81, 0x72, 0x3a, 0xe9, 0xf0, 0x3b, 0x60, 0xa1, 0x47, 0x28, 0xb3, 0x7d, + 0x4f, 0xae, 0xb0, 0x68, 0x2e, 0xab, 0x99, 0x0b, 0x8f, 0x43, 0x31, 0x8a, 0xf4, 0xf0, 0x3a, 0x28, + 0x50, 0xd2, 0x75, 0x6c, 0x0b, 0x33, 0x19, 0xec, 0x9c, 0x59, 0x16, 0xb7, 0x00, 0x29, 0x19, 0x8a, + 0xb5, 0xf0, 0xf7, 0x1a, 0xa8, 0x58, 0xe3, 0xc5, 0x5f, 0x6d, 0x5e, 0x6b, 0x9a, 0x05, 0x66, 0x3a, + 0x8a, 0xf9, 0xd6, 0x70, 0x50, 0xcb, 0x36, 0x1a, 0x94, 0x75, 0x0f, 0xff, 0xa2, 0x81, 0x2b, 0x94, + 0x38, 0x3e, 0x3e, 0x20, 0x34, 0x33, 0x41, 0xcf, 0xbf, 0x8e, 0xe0, 0xae, 0x0e, 0x07, 0xb5, 0x2b, + 0xe8, 0x2c, 0x9f, 0xe8, 0xec, 0x70, 0xe0, 0x9f, 0x35, 0xa0, 0xbb, 0x84, 0x53, 0xdb, 0x62, 0xd9, + 0x58, 0xe7, 0x5e, 0x47, 0xac, 0xef, 0x0c, 0x07, 0x35, 0xbd, 0x75, 0x86, 0x4b, 0x74, 0x66, 0x30, + 0xf0, 0x37, 0x1a, 0x28, 0x75, 0xc5, 0x09, 0x61, 0x9c, 0x78, 0x16, 0xd1, 0xe7, 0x65, 0x70, 0x0f, + 0xa7, 0x09, 0x6e, 0x37, 0x81, 0x6b, 0x73, 0xc1, 0xd4, 0x3a, 0x7d, 0x73, 0x79, 0x38, 0xa8, 0x95, + 0x52, 0x0a, 0x94, 0x76, 0x0a, 0xad, 0x54, 0x51, 0x5f, 0x90, 0x01, 0xfc, 0xe8, 0xc2, 0x17, 0xb5, + 0xa5, 0x00, 0xc2, 0x53, 0x1d, 0x8d, 0x52, 0xb5, 0xfd, 0x0f, 0x1a, 0x28, 0x7b, 0xfe, 0x01, 0x69, + 0x13, 0x87, 0x58, 0xdc, 0xa7, 0x7a, 0x41, 0xd6, 0xf8, 0x4f, 0x2f, 0xab, 0x00, 0x1a, 0x3b, 0x29, + 0xf0, 0x4d, 0x8f, 0xd3, 0xbe, 0xb9, 0xa6, 0x2e, 0x63, 0x39, 0xad, 0x42, 0x23, 0x51, 0xc0, 0x47, + 0xa0, 0xc4, 0x7d, 0x47, 0x30, 0x5a, 0xdb, 0xf7, 0x98, 0x5e, 0x94, 0x41, 0x55, 0x27, 0x11, 0x92, + 0xbd, 0xd8, 0xcc, 0x5c, 0x55, 0xc0, 0xa5, 0x44, 0xc6, 0x50, 0x1a, 0x07, 0x92, 0x2c, 0xd7, 0x01, + 0x32, 0xb3, 0xdf, 0x9e, 0x04, 0xbd, 0xeb, 0x1f, 0xbc, 0x12, 0xdd, 0x81, 0x1e, 0x58, 0x89, 0x59, + 0x56, 0x9b, 0x58, 0x94, 0x70, 0xa6, 0x97, 0xe4, 0x12, 0x26, 0x12, 0xc3, 0x6d, 0xdf, 0xc2, 0x4e, + 0x48, 0x64, 0x10, 0x39, 0x24, 0x54, 0xec, 0xbe, 0xa9, 0xab, 0xc5, 0xac, 0x6c, 0x8d, 0x21, 0xa1, + 0x0c, 0x36, 0xbc, 0x0b, 0x2a, 0x5d, 0x6a, 0xfb, 0x32, 0x04, 0x07, 0x33, 0xb6, 0x83, 0x5d, 0xa2, + 0x97, 0x65, 0xe5, 0xbb, 0xa2, 0x60, 0x2a, 0xbb, 0xe3, 0x06, 0x28, 0x3b, 0x47, 0x54, 0xc3, 0x48, + 0xa8, 0x2f, 0x26, 0xd5, 0x30, 0x9a, 0x8b, 0x62, 0x2d, 0xfc, 0x18, 0x14, 0xf0, 0xe1, 0xa1, 0xed, + 0x09, 0xcb, 0x25, 0x99, 0xc2, 0x77, 0x26, 0x2d, 0xad, 0xa9, 0x6c, 0x42, 0x9c, 0x68, 0x84, 0xe2, + 0xb9, 0xf0, 0x3e, 0x80, 0x8c, 0xd0, 0x9e, 0x6d, 0x91, 0xa6, 0x65, 0xf9, 0x81, 0xc7, 0x65, 0xec, + 0xcb, 0x32, 0xf6, 0x75, 0x15, 0x3b, 0x6c, 0x67, 0x2c, 0xd0, 0x84, 0x59, 0x22, 0x7a, 0x46, 0x38, + 0xb7, 0xbd, 0x0e, 0xd3, 0x57, 0x24, 0x82, 0xf4, 0xda, 0x56, 0x32, 0x14, 0x6b, 0xe1, 0xfb, 0xa0, + 0xc8, 0x38, 0xa6, 0xbc, 0x49, 0x3b, 0x4c, 0xaf, 0x5c, 0xcb, 0x5d, 0x2f, 0x86, 0x8d, 0xba, 0x1d, + 0x09, 0x51, 0xa2, 0x87, 0x1f, 0x82, 0x32, 0x4b, 0x3d, 0x43, 0x74, 0x28, 0xa1, 0x57, 0xc4, 0x09, + 0x4e, 0x3f, 0x4f, 0xd0, 0x88, 0x15, 0x34, 0x00, 0x70, 0xf1, 0xe9, 0x2e, 0xee, 0x8b, 0x6a, 0xa8, + 0xaf, 0xca, 0x39, 0x4b, 0x82, 0xb1, 0xb6, 0x62, 0x29, 0x4a, 0x59, 0xac, 0xdf, 0x01, 0x95, 0xcc, + 0x55, 0x81, 0x2b, 0x20, 0x77, 0x42, 0xfa, 0x61, 0x13, 0x43, 0xe2, 0x13, 0xae, 0x81, 0xb9, 0x1e, + 0x76, 0x02, 0x12, 0xbe, 0x03, 0x50, 0x38, 0xb8, 0x3d, 0x7b, 0x4b, 0xab, 0xff, 0x43, 0x03, 0xcb, + 0x63, 0x2f, 0x26, 0x78, 0x15, 0xe4, 0x02, 0xea, 0xa8, 0x26, 0x58, 0x52, 0xe9, 0xcc, 0x3d, 0x42, + 0xdb, 0x48, 0xc8, 0xe1, 0xcf, 0x40, 0x19, 0x5b, 0x16, 0x61, 0x2c, 0x3c, 0x48, 0xaa, 0x5b, 0xbf, + 0x77, 0x06, 0xef, 0xa7, 0x84, 0x3f, 0x20, 0xfd, 0x28, 0xc0, 0x30, 0x01, 0xcd, 0xd4, 0x74, 0x34, + 0x02, 0x06, 0x6f, 0x8d, 0xa5, 0x2d, 0x27, 0x83, 0x88, 0x2f, 0xff, 0xd9, 0xa9, 0xab, 0xff, 0x35, + 0x07, 0x0a, 0x11, 0xa3, 0x79, 0xd9, 0x12, 0xde, 0x05, 0x73, 0xdc, 0xef, 0xda, 0x96, 0x7a, 0x17, + 0xc5, 0xac, 0x72, 0x4f, 0x08, 0x51, 0xa8, 0x4b, 0xf3, 0x81, 0xdc, 0x4b, 0xf8, 0xc0, 0x23, 0x90, + 0xe3, 0x0e, 0x53, 0x9d, 0xf3, 0xf6, 0x85, 0xeb, 0xed, 0xde, 0x76, 0xf4, 0x38, 0x5e, 0x10, 0x61, + 0xee, 0x6d, 0xb7, 0x91, 0xc0, 0x83, 0x9f, 0x80, 0x3c, 0xc3, 0xcc, 0x51, 0x5d, 0xee, 0xc7, 0x17, + 0x27, 0x5c, 0xcd, 0xf6, 0x76, 0xfa, 0xd5, 0x2d, 0xc6, 0x48, 0x42, 0xc2, 0xdf, 0x69, 0x60, 0xd1, + 0xf2, 0x3d, 0x16, 0xb8, 0x84, 0xde, 0xa5, 0x7e, 0xd0, 0x55, 0xdd, 0x6a, 0x67, 0x6a, 0x42, 0xb9, + 0x91, 0x46, 0x35, 0x2b, 0xc3, 0x41, 0x6d, 0x71, 0x44, 0x84, 0x46, 0xfd, 0xd6, 0xff, 0xae, 0x01, + 0x98, 0x9d, 0x08, 0x1b, 0xa0, 0xd8, 0x11, 0x1f, 0xf2, 0x66, 0x87, 0xfb, 0x18, 0xbf, 0x7a, 0xef, + 0x46, 0x0a, 0x94, 0xd8, 0x88, 0x72, 0x46, 0xc9, 0x3e, 0x76, 0x70, 0xaa, 0x57, 0xaa, 0xfd, 0x8d, + 0xcb, 0x19, 0x1a, 0x37, 0x40, 0xd9, 0x39, 0xf0, 0xfb, 0xa0, 0x24, 0xaf, 0xf1, 0x43, 0xe7, 0x80, + 0xb0, 0xf0, 0x59, 0x5b, 0x48, 0xba, 0x44, 0x3b, 0x51, 0xa1, 0xb4, 0x5d, 0xfd, 0xbf, 0x1a, 0x58, + 0x50, 0x8f, 0x05, 0xe8, 0x81, 0x79, 0x0f, 0x73, 0xbb, 0x47, 0x14, 0x57, 0x9e, 0xea, 0x79, 0xb7, + 0x23, 0x91, 0xe2, 0xf6, 0x0f, 0x04, 0x97, 0x0d, 0x65, 0x48, 0x79, 0x81, 0xc7, 0x60, 0x9e, 0x9c, + 0xfa, 0xdc, 0x8e, 0x1e, 0xaf, 0x97, 0xf5, 0x5b, 0x8d, 0xf4, 0xb5, 0x29, 0x91, 0x91, 0xf2, 0x50, + 0xff, 0x5a, 0x03, 0x20, 0x31, 0x79, 0xd9, 0x4d, 0x7b, 0x1f, 0x14, 0x2d, 0x27, 0x60, 0x9c, 0xd0, + 0xad, 0x8f, 0xa2, 0xdb, 0x26, 0xb6, 0x70, 0x23, 0x12, 0xa2, 0x44, 0x0f, 0x3f, 0x00, 0x79, 0x1c, + 0xf0, 0x23, 0x75, 0xdd, 0x74, 0x71, 0x64, 0x9b, 0x01, 0x3f, 0x7a, 0x2e, 0x4a, 0x46, 0xc0, 0x8f, + 0xe2, 0x4d, 0x93, 0x56, 0x99, 0x3a, 0x94, 0xbf, 0xc4, 0x3a, 0x54, 0xff, 0x7c, 0x19, 0x2c, 0x8d, + 0x26, 0x1e, 0x7e, 0x90, 0x22, 0xfd, 0x9a, 0x6c, 0x73, 0xf1, 0xf3, 0x77, 0x02, 0xf1, 0x8f, 0xd6, + 0x32, 0x7b, 0xae, 0xb5, 0x8c, 0x53, 0xc7, 0xdc, 0x9b, 0xa0, 0x8e, 0x93, 0xdf, 0x2a, 0xf9, 0x37, + 0xfb, 0x56, 0xf9, 0xe6, 0xd0, 0xff, 0x3f, 0x8e, 0x93, 0xe2, 0x79, 0x49, 0xde, 0x3e, 0xbb, 0xbc, + 0xbb, 0x7f, 0x39, 0xb4, 0x78, 0xe1, 0x92, 0x68, 0x71, 0xfa, 0xa5, 0x51, 0x78, 0x5d, 0x2f, 0x8d, + 0x09, 0xdc, 0xbb, 0xf8, 0x1a, 0xb8, 0x77, 0x1d, 0xcc, 0xbb, 0xf8, 0xb4, 0xd9, 0x21, 0x92, 0xd9, + 0x17, 0xc3, 0xc2, 0xd7, 0x92, 0x12, 0xa4, 0x34, 0xff, 0x77, 0x7e, 0x3e, 0x99, 0xe4, 0x96, 0x5f, + 0x89, 0xe4, 0x4e, 0xe4, 0xfa, 0x8b, 0x53, 0x72, 0xfd, 0xa5, 0x73, 0x73, 0xfd, 0xe5, 0x29, 0xb8, + 0xfe, 0x7b, 0x60, 0xc1, 0xc5, 0xa7, 0x2d, 0xa6, 0xe8, 0x79, 0xde, 0x2c, 0x09, 0x0a, 0xd6, 0x0a, + 0x45, 0x28, 0xd2, 0x89, 0xc0, 0x5c, 0x7c, 0x6a, 0xf6, 0x39, 0x11, 0xdc, 0x3c, 0xa6, 0xf1, 0x2d, + 0x25, 0x43, 0xb1, 0x56, 0x01, 0xb6, 0x83, 0x7d, 0x26, 0x49, 0x79, 0x02, 0x28, 0x44, 0x28, 0xd2, + 0x5d, 0x94, 0x8a, 0xc3, 0x6d, 0xb0, 0x46, 0xf1, 0x21, 0xbf, 0x47, 0x30, 0xe5, 0xfb, 0x04, 0xf3, + 0x3d, 0xdb, 0x25, 0x7e, 0xc0, 0xf5, 0xb5, 0xb8, 0x01, 0xac, 0xa1, 0x09, 0x7a, 0x34, 0x71, 0x16, + 0xdc, 0x02, 0xab, 0x42, 0xbe, 0x29, 0xae, 0xb0, 0xed, 0x7b, 0x11, 0xd8, 0x5b, 0x12, 0xec, 0xed, + 0xe1, 0xa0, 0xb6, 0x8a, 0xb2, 0x6a, 0x34, 0x69, 0x0e, 0xfc, 0x09, 0x58, 0x11, 0xe2, 0x6d, 0x82, + 0x19, 0x89, 0x70, 0xbe, 0x15, 0xd2, 0x6a, 0x71, 0x12, 0xd1, 0x98, 0x0e, 0x65, 0xac, 0xe1, 0x06, + 0xa8, 0x08, 0xd9, 0x86, 0xef, 0xba, 0x76, 0xbc, 0xae, 0xb7, 0x25, 0x84, 0x2c, 0xe4, 0x68, 0x5c, + 0x89, 0xb2, 0xf6, 0xd3, 0x3f, 0x55, 0xfe, 0x34, 0x0b, 0x56, 0x27, 0x34, 0x35, 0xb1, 0x3e, 0xc6, + 0x7d, 0x8a, 0x3b, 0x24, 0x39, 0xda, 0x5a, 0xb2, 0xbe, 0xf6, 0x98, 0x0e, 0x65, 0xac, 0xe1, 0x13, + 0x00, 0xc2, 0xe6, 0xdf, 0xf2, 0x0f, 0x94, 0x63, 0xf3, 0x8e, 0xd8, 0xea, 0x66, 0x2c, 0x7d, 0x3e, + 0xa8, 0xdd, 0x98, 0xf4, 0x17, 0x49, 0x14, 0x0f, 0x7f, 0xec, 0x3b, 0x81, 0x4b, 0x92, 0x09, 0x28, + 0x05, 0x09, 0x7f, 0x0e, 0x40, 0x4f, 0xea, 0xdb, 0xf6, 0xaf, 0xa2, 0xe6, 0xfe, 0xc2, 0xdf, 0xda, + 0x8d, 0xe8, 0xdf, 0x1c, 0xe3, 0xa7, 0x01, 0xf6, 0xb8, 0xb8, 0x1f, 0xf2, 0xec, 0x3d, 0x8e, 0x51, + 0x50, 0x0a, 0xd1, 0x34, 0x9e, 0x3e, 0xab, 0xce, 0x7c, 0xf1, 0xac, 0x3a, 0xf3, 0xe5, 0xb3, 0xea, + 0xcc, 0xaf, 0x87, 0x55, 0xed, 0xe9, 0xb0, 0xaa, 0x7d, 0x31, 0xac, 0x6a, 0x5f, 0x0e, 0xab, 0xda, + 0x57, 0xc3, 0xaa, 0xf6, 0xf9, 0xd7, 0xd5, 0x99, 0x4f, 0x0b, 0x51, 0x5b, 0xf9, 0x5f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xdf, 0x1b, 0x03, 0x56, 0xd9, 0x1d, 0x00, 0x00, } func (m *BusConfig) Marshal() (dAtA []byte, err error) { @@ -1218,41 +1187,6 @@ func (m *KafkaBus) MarshalTo(dAtA []byte) (int, error) { } func (m *KafkaBus) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Exotic != nil { - { - size, err := m.Exotic.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *KafkaConfig) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *KafkaConfig) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1969,19 +1903,6 @@ func (m *JetStreamConfig) Size() (n int) { } func (m *KafkaBus) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Exotic != nil { - l = m.Exotic.Size() - n += 1 + l + sovGenerated(uint64(l)) - } - return n -} - -func (m *KafkaConfig) Size() (n int) { if m == nil { return 0 } @@ -2195,7 +2116,7 @@ func (this *BusConfig) String() string { s := strings.Join([]string{`&BusConfig{`, `NATS:` + strings.Replace(this.NATS.String(), "NATSConfig", "NATSConfig", 1) + `,`, `JetStream:` + strings.Replace(this.JetStream.String(), "JetStreamConfig", "JetStreamConfig", 1) + `,`, - `Kafka:` + strings.Replace(this.Kafka.String(), "KafkaConfig", "KafkaConfig", 1) + `,`, + `Kafka:` + strings.Replace(this.Kafka.String(), "KafkaBus", "KafkaBus", 1) + `,`, `}`, }, "") return s @@ -2328,16 +2249,6 @@ func (this *KafkaBus) String() string { return "nil" } s := strings.Join([]string{`&KafkaBus{`, - `Exotic:` + strings.Replace(this.Exotic.String(), "KafkaConfig", "KafkaConfig", 1) + `,`, - `}`, - }, "") - return s -} -func (this *KafkaConfig) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&KafkaConfig{`, `URL:` + fmt.Sprintf("%v", this.URL) + `,`, `Topic:` + fmt.Sprintf("%v", this.Topic) + `,`, `Version:` + fmt.Sprintf("%v", this.Version) + `,`, @@ -2587,7 +2498,7 @@ func (m *BusConfig) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Kafka == nil { - m.Kafka = &KafkaConfig{} + m.Kafka = &KafkaBus{} } if err := m.Kafka.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4248,92 +4159,6 @@ func (m *KafkaBus) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: KafkaBus: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Exotic", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Exotic == nil { - m.Exotic = &KafkaConfig{} - } - if err := m.Exotic.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *KafkaConfig) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: KafkaConfig: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: KafkaConfig: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { case 1: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field URL", wireType) diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto index 4cff74bb15..7320044cca 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.proto +++ b/pkg/apis/eventbus/v1alpha1/generated.proto @@ -39,7 +39,7 @@ message BusConfig { optional JetStreamConfig jetstream = 2; // +optional - optional KafkaConfig kafka = 3; + optional KafkaBus kafka = 3; } // ContainerTemplate defines customized spec for a container @@ -210,11 +210,6 @@ message JetStreamConfig { // KafkaBus holds the KafkaBus EventBus information message KafkaBus { - // Exotic holds an exotic Kafka config - optional KafkaConfig exotic = 1; -} - -message KafkaConfig { // URL to kafka cluster, multiple URLs separated by comma optional string url = 1; diff --git a/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go b/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go index 0231670893..fa4f754963 100644 --- a/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go +++ b/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go @@ -6,11 +6,6 @@ import ( // KafkaBus holds the KafkaBus EventBus information type KafkaBus struct { - // Exotic holds an exotic Kafka config - Exotic *KafkaConfig `json:"exotic,omitempty" protobuf:"bytes,1,opt,name=exotic"` -} - -type KafkaConfig struct { // URL to kafka cluster, multiple URLs separated by comma URL string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"` // Topic name, defaults to {namespace_name}-{eventbus_name} diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go index f23d3f592e..cb16259563 100644 --- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go +++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go @@ -39,7 +39,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamBus": schema_pkg_apis_eventbus_v1alpha1_JetStreamBus(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamConfig": schema_pkg_apis_eventbus_v1alpha1_JetStreamConfig(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaBus": schema_pkg_apis_eventbus_v1alpha1_KafkaBus(ref), - "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConfig": schema_pkg_apis_eventbus_v1alpha1_KafkaConfig(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConsumerGroup": schema_pkg_apis_eventbus_v1alpha1_KafkaConsumerGroup(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.NATSBus": schema_pkg_apis_eventbus_v1alpha1_NATSBus(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.NATSConfig": schema_pkg_apis_eventbus_v1alpha1_NATSConfig(ref), @@ -67,14 +66,14 @@ func schema_pkg_apis_eventbus_v1alpha1_BusConfig(ref common.ReferenceCallback) c }, "kafka": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConfig"), + Ref: ref("github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaBus"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamConfig", "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConfig", "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.NATSConfig"}, + "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamConfig", "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaBus", "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.NATSConfig"}, } } @@ -497,26 +496,6 @@ func schema_pkg_apis_eventbus_v1alpha1_KafkaBus(ref common.ReferenceCallback) co SchemaProps: spec.SchemaProps{ Description: "KafkaBus holds the KafkaBus EventBus information", Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "exotic": { - SchemaProps: spec.SchemaProps{ - Description: "Exotic holds an exotic Kafka config", - Ref: ref("github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConfig"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.KafkaConfig"}, - } -} - -func schema_pkg_apis_eventbus_v1alpha1_KafkaConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, Properties: map[string]spec.Schema{ "url": { SchemaProps: spec.SchemaProps{ diff --git a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go index 5de1df6f7c..61ce1b4ca9 100644 --- a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go @@ -42,7 +42,7 @@ func (in *BusConfig) DeepCopyInto(out *BusConfig) { } if in.Kafka != nil { in, out := &in.Kafka, &out.Kafka - *out = new(KafkaConfig) + *out = new(KafkaBus) (*in).DeepCopyInto(*out) } return @@ -313,27 +313,6 @@ func (in *JetStreamConfig) DeepCopy() *JetStreamConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KafkaBus) DeepCopyInto(out *KafkaBus) { - *out = *in - if in.Exotic != nil { - in, out := &in.Exotic, &out.Exotic - *out = new(KafkaConfig) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaBus. -func (in *KafkaBus) DeepCopy() *KafkaBus { - if in == nil { - return nil - } - out := new(KafkaBus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KafkaConfig) DeepCopyInto(out *KafkaConfig) { *out = *in if in.TLS != nil { in, out := &in.TLS, &out.TLS @@ -353,12 +332,12 @@ func (in *KafkaConfig) DeepCopyInto(out *KafkaConfig) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaConfig. -func (in *KafkaConfig) DeepCopy() *KafkaConfig { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaBus. +func (in *KafkaBus) DeepCopy() *KafkaBus { if in == nil { return nil } - out := new(KafkaConfig) + out := new(KafkaBus) in.DeepCopyInto(out) return out }