From 40d3f5f196587b17318096326c97e1d96c15fefc Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 28 May 2021 13:01:28 +0300 Subject: [PATCH] Updated check config sanity. Fixes #3008 --- config/config.go | 3 ++- ers/amqp_it_test.go | 4 ++++ ers/amqpv1_it_test.go | 4 ++++ ers/kafka_it_test.go | 5 ++++- ers/s3_it_test.go | 5 ++++- ers/sql_it_test.go | 4 ++++ ers/sqs_it_test.go | 5 ++++- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/config/config.go b/config/config.go index 8054643a3..fcadefd5d 100644 --- a/config/config.go +++ b/config/config.go @@ -320,7 +320,8 @@ var posibleLoaderTypes = utils.NewStringSet([]string{utils.MetaAttributes, var possibleReaderTypes = utils.NewStringSet([]string{utils.MetaFileCSV, utils.MetaKafkajsonMap, utils.MetaFileXML, utils.MetaSQL, utils.MetaFileFWV, - utils.MetaFileJSON, utils.MetaNone}) + utils.MetaFileJSON, utils.MetaNone, utils.MetaAMQPjsonMap, utils.MetaS3jsonMap, + utils.MetaSQSjsonMap, utils.MetaAMQPV1jsonMap}) var possibleExporterTypes = utils.NewStringSet([]string{utils.MetaFileCSV, utils.MetaNone, utils.MetaFileFWV, utils.MetaHTTPPost, utils.MetaHTTPjsonMap, utils.MetaAMQPjsonMap, utils.MetaAMQPV1jsonMap, utils.MetaSQSjsonMap, diff --git a/ers/amqp_it_test.go b/ers/amqp_it_test.go index dfab82caf..239527011 100644 --- a/ers/amqp_it_test.go +++ b/ers/amqp_it_test.go @@ -36,6 +36,7 @@ func TestAMQPER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "amqp", // identifier of the EventReader profile @@ -64,6 +65,9 @@ func TestAMQPER(t *testing.T) { if err != nil { t.Fatal(err) } + if err := cfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) diff --git a/ers/amqpv1_it_test.go b/ers/amqpv1_it_test.go index d1ff786bd..1a098f07d 100644 --- a/ers/amqpv1_it_test.go +++ b/ers/amqpv1_it_test.go @@ -45,6 +45,7 @@ func TestAMQPERv1(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "amqpv1", // identifier of the EventReader profile @@ -69,6 +70,9 @@ func TestAMQPERv1(t *testing.T) { if err != nil { t.Fatal(err) } + if err := cfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) diff --git a/ers/kafka_it_test.go b/ers/kafka_it_test.go index dd6ce2cb7..efbe2bc94 100644 --- a/ers/kafka_it_test.go +++ b/ers/kafka_it_test.go @@ -44,6 +44,7 @@ func TestKafkaER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "kafka", // identifier of the EventReader profile @@ -65,7 +66,9 @@ func TestKafkaER(t *testing.T) { if err != nil { t.Fatal(err) } - + if err := cfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } rdrEvents = make(chan *erEvent, 1) rdrErr = make(chan error, 1) rdrExit = make(chan struct{}, 1) diff --git a/ers/s3_it_test.go b/ers/s3_it_test.go index c3489afdf..56d2140c6 100644 --- a/ers/s3_it_test.go +++ b/ers/s3_it_test.go @@ -48,6 +48,7 @@ func TestS3ER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "s3", // identifier of the EventReader profile @@ -76,7 +77,9 @@ func TestS3ER(t *testing.T) { if err != nil { t.Fatal(err) } - + if err := cfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } rdrEvents = make(chan *erEvent, 1) rdrErr = make(chan error, 1) rdrExit = make(chan struct{}, 1) diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go index c4bf0afc4..37f54cc00 100644 --- a/ers/sql_it_test.go +++ b/ers/sql_it_test.go @@ -90,6 +90,7 @@ func testSQLInitConfig(t *testing.T) { }, "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "mysql", // identifier of the EventReader profile @@ -115,6 +116,9 @@ func testSQLInitConfig(t *testing.T) { }`); err != nil { t.Fatal(err) } + if err := sqlCfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, sqlCfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) } diff --git a/ers/sqs_it_test.go b/ers/sqs_it_test.go index 397ab1ec7..eb3f884ad 100644 --- a/ers/sqs_it_test.go +++ b/ers/sqs_it_test.go @@ -47,6 +47,7 @@ func TestSQSER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService "enabled": true, // starts the EventReader service: + "sessions_conns":["*localhost"], "readers": [ { "id": "sqs", // identifier of the EventReader profile @@ -75,7 +76,9 @@ func TestSQSER(t *testing.T) { if err != nil { t.Fatal(err) } - + if err := cfg.CheckConfigSanity(); err != nil { + t.Fatal(err) + } rdrEvents = make(chan *erEvent, 1) rdrErr = make(chan error, 1) rdrExit = make(chan struct{}, 1)