Skip to content
This repository has been archived by the owner on Apr 11, 2024. It is now read-only.

fix: pass always Kafka proxy extra args config to the constructor #29

Merged
merged 2 commits into from
Aug 27, 2021
Merged

fix: pass always Kafka proxy extra args config to the constructor #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26123a
fix: pass always Kafka proxy extra args config to the constructor
smoya Aug 27, 2021
b4bb1c9
remove extra line
smoya Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions config/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (c *KafkaProxy) ProxyConfig(doc []byte, debug bool, messageHandlers ...kafk
var kafkaProxyConfig *kafka.ProxyConfig
var err error
if len(doc) > 0 {
kafkaProxyConfig, err = c.configFromDoc(doc)
kafkaProxyConfig, err = c.configFromDoc(doc, kafka.WithExtra(c.ExtraFlags.Values))
} else {
kafkaProxyConfig, err = kafka.NewProxyConfig(c.BrokersMapping.Values, kafka.WithDialAddressMapping(c.BrokersDialMapping.Values), kafka.WithExtra(c.ExtraFlags.Values))
}
Expand All @@ -70,13 +70,12 @@ func (c *KafkaProxy) ProxyConfig(doc []byte, debug bool, messageHandlers ...kafk
return kafkaProxyConfig, nil
}

func (c *KafkaProxy) configFromDoc(d []byte) (*kafka.ProxyConfig, error) {
func (c *KafkaProxy) configFromDoc(d []byte, opts ...kafka.Option) (*kafka.ProxyConfig, error) {
doc := new(v2.Document)
if err := v2.Decode(d, doc); err != nil {
return nil, errors.Wrap(err, "error decoding AsyncAPI json doc to Document struct")
}

var opts []kafka.Option
if c.MessageValidation.Enabled {
validator, err := v2.FromDocJSONSchemaMessageValidator(doc)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions config/kafka_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ func TestKafkaProxy_ProxyConfig(t *testing.T) {
name: "Valid config. Only one broker from doc",
config: &KafkaProxy{
BrokerFromServer: "test",
// Also testing extra flags.
ExtraFlags: pipeSeparatedValues{Values: []string{"arg1=arg1value", "arg2=arg2value"}},
},
expectedProxyConfig: func(_ *testing.T, _ *kafka.ProxyConfig) *kafka.ProxyConfig {
return &kafka.ProxyConfig{
BrokersMapping: []string{"broker.mybrokers.org:9092,:9092"},
ExtraConfig: []string{"arg1=arg1value", "arg2=arg2value"},
}
},
doc: []byte(`testdata/simple-kafka.yaml`),
Expand Down