Separating opts in ERS && fixing tests

This commit is contained in:
gezimbll
2023-06-23 09:21:55 -04:00
committed by Dan Christian Bogos
parent 620856f731
commit 01d3c5d0fa
30 changed files with 1623 additions and 1179 deletions

View File

@@ -46,9 +46,16 @@ func TestInitClient(t *testing.T) {
ee := &ElasticEE{
cfg: &config.EventExporterCfg{
ExportPath: "/\x00",
Opts: &config.EventExporterOpts{
Els: &config.ElsOpts{},
RPC: &config.RPCOpts{},
},
},
}
errExpect := `cannot create client: parse "/\x00": net/url: invalid control character in URL`
if err := ee.prepareOpts(); err != nil {
t.Error(err)
}
errExpect := `cannot create client: cannot parse url: parse "/\x00": net/url: invalid control character in URL`
if err := ee.Connect(); err == nil || err.Error() != errExpect {
t.Errorf("Expected %+v \n but got %+v", errExpect, err)
}
@@ -308,14 +315,17 @@ func TestElasticExportEvent3(t *testing.T) {
if err != nil {
t.Error(err)
}
if err := eEe.prepareOpts(); err != nil {
t.Error(err)
}
if err = eEe.Connect(); err != nil {
t.Error(err)
}
eEe.eClnt.Transport = new(mockClient)
// errExpect := `unsupported protocol scheme ""`
errExpect := `the client noticed that the server is not Elasticsearch and we do not support this unknown product`
cgrCfg.EEsCfg().Exporters[0].ComputeFields()
if err := eEe.ExportEvent([]byte{}, ""); err == nil {
t.Error(err)
if err := eEe.ExportEvent([]byte{}, ""); err == nil || err.Error() != errExpect {
t.Errorf("Expected %q but got %q", errExpect, err)
}
}

View File

@@ -46,6 +46,7 @@ func TestAddFldPost(t *testing.T) {
NATS: &config.NATSOpts{},
Kafka: &config.KafkaOpts{},
RPC: &config.RPCOpts{},
SQL: &config.SQLOpts{},
})
x, ok := failedPostCache.Get(utils.ConcatenatedKey("", "path1", "format1"))
if !ok {
@@ -70,6 +71,7 @@ func TestAddFldPost(t *testing.T) {
NATS: &config.NATSOpts{},
Kafka: &config.KafkaOpts{},
RPC: &config.RPCOpts{},
SQL: &config.SQLOpts{},
},
}
if !reflect.DeepEqual(eOut, failedPost) {
@@ -82,6 +84,7 @@ func TestAddFldPost(t *testing.T) {
NATS: &config.NATSOpts{},
Kafka: &config.KafkaOpts{},
RPC: &config.RPCOpts{},
SQL: &config.SQLOpts{},
})
AddFailedPost("", "path2", "format2", "3", &config.EventExporterOpts{
AWS: &config.AWSOpts{
@@ -92,6 +95,7 @@ func TestAddFldPost(t *testing.T) {
RPC: &config.RPCOpts{},
AMQP: &config.AMQPOpts{},
Els: &config.ElsOpts{},
SQL: &config.SQLOpts{},
})
x, ok = failedPostCache.Get(utils.ConcatenatedKey("", "path1", "format1"))
if !ok {
@@ -115,6 +119,7 @@ func TestAddFldPost(t *testing.T) {
NATS: &config.NATSOpts{},
Kafka: &config.KafkaOpts{},
RPC: &config.RPCOpts{},
SQL: &config.SQLOpts{},
},
}
if !reflect.DeepEqual(eOut, failedPost) {
@@ -136,6 +141,12 @@ func TestAddFldPost(t *testing.T) {
Format: "format2",
Events: []any{"3"},
Opts: &config.EventExporterOpts{
Els: &config.ElsOpts{},
NATS: &config.NATSOpts{},
SQL: &config.SQLOpts{},
AMQP: &config.AMQPOpts{},
RPC: &config.RPCOpts{},
Kafka: &config.KafkaOpts{},
AWS: &config.AWSOpts{
SQSQueueID: utils.StringPointer("qID")},
},