Fix all compilation errors related to ers after making ees opts of type struct

This commit is contained in:
ionutboangiu
2021-11-25 17:20:33 +02:00
committed by Dan Christian Bogos
parent aa0ae292a2
commit 40eb832060
27 changed files with 355 additions and 459 deletions

View File

@@ -46,9 +46,9 @@ func TestSqlGetMetrics(t *testing.T) {
func TestNewSQLeUrl(t *testing.T) {
cgrCfg := config.NewDefaultCGRConfig()
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLTableNameOpt] = "expTable"
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLDBNameOpt] = "postgres"
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SSLModeCfg] = "test"
cgrCfg.EEsCfg().Exporters[0].Opts.SQLTableName = utils.StringPointer("expTable")
cgrCfg.EEsCfg().Exporters[0].Opts.SQLDBName = utils.StringPointer("postgres")
cgrCfg.EEsCfg().Exporters[0].Opts.SSLMode = utils.StringPointer("test")
sqlEe := &SQLEe{
cfg: cgrCfg.EEsCfg().Exporters[0],
reqs: newConcReq(0),
@@ -61,8 +61,8 @@ func TestNewSQLeUrl(t *testing.T) {
func TestNewSQLeUrlSQL(t *testing.T) {
cgrCfg := config.NewDefaultCGRConfig()
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLTableNameOpt] = "expTable"
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLDBNameOpt] = "mysql"
cgrCfg.EEsCfg().Exporters[0].Opts.SQLTableName = utils.StringPointer("expTable")
cgrCfg.EEsCfg().Exporters[0].Opts.SQLDBName = utils.StringPointer("mysql")
cgrCfg.EEsCfg().Exporters[0].ExportPath = `mysql://cgrates:CGRateS.org@127.0.0.1:3306`
sqlEe := &SQLEe{
cfg: cgrCfg.EEsCfg().Exporters[0],
@@ -79,8 +79,8 @@ func TestNewSQLeUrlSQL(t *testing.T) {
func TestNewSQLeUrlPostgres(t *testing.T) {
cgrCfg := config.NewDefaultCGRConfig()
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLTableNameOpt] = "expTable"
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLDBNameOpt] = "postgres"
cgrCfg.EEsCfg().Exporters[0].Opts.SQLTableName = utils.StringPointer("expTable")
cgrCfg.EEsCfg().Exporters[0].Opts.SQLDBName = utils.StringPointer("postgres")
cgrCfg.EEsCfg().Exporters[0].ExportPath = `postgres://cgrates:CGRateS.org@127.0.0.1:3306`
sqlEe := &SQLEe{
cfg: cgrCfg.EEsCfg().Exporters[0],
@@ -97,8 +97,8 @@ func TestNewSQLeUrlPostgres(t *testing.T) {
func TestNewSQLeExportPathError(t *testing.T) {
cgrCfg := config.NewDefaultCGRConfig()
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLTableNameOpt] = "expTable"
cgrCfg.EEsCfg().Exporters[0].Opts[utils.SQLDBNameOpt] = "postgres"
cgrCfg.EEsCfg().Exporters[0].Opts.SQLTableName = utils.StringPointer("expTable")
cgrCfg.EEsCfg().Exporters[0].Opts.SQLDBName = utils.StringPointer("postgres")
cgrCfg.EEsCfg().Exporters[0].ExportPath = ":foo"
sqlEe := &SQLEe{
cfg: cgrCfg.EEsCfg().Exporters[0],
@@ -120,7 +120,7 @@ func TestOpenDBError2(t *testing.T) {
tmp := logger.Default
logger.Default = logger.Default.LogMode(logger.Silent)
mckDialect := new(mockDialect2)
_, _, err := openDB(mckDialect, make(map[string]interface{}))
_, _, err := openDB(mckDialect, &config.EventExporterOpts{})
errExpect := "invalid db"
if err == nil || err.Error() != errExpect {
t.Errorf("Expected %v but received %v", errExpect, err)
@@ -140,7 +140,7 @@ func TestOpenDBError3(t *testing.T) {
tmp := logger.Default
logger.Default = logger.Default.LogMode(logger.Silent)
mckDialect := new(mockDialectErr)
_, _, err := openDB(mckDialect, make(map[string]interface{}))
_, _, err := openDB(mckDialect, &config.EventExporterOpts{})
errExpect := "NOT_FOUND"
if err == nil || err.Error() != errExpect {
t.Errorf("Expected %v but received %v", errExpect, err)