diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 46ce8e562..dc4851cc0 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -66,10 +66,10 @@ var ( "The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state") dbQueryTimeout = cgrLoaderFlags.String(utils.MongoQueryTimeoutCfg, utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg]), "The timeout for queries") - dbRedisTls = cgrLoaderFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis") - dbRedisClientCertificate = cgrLoaderFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate") - dbRedisClientKey = cgrLoaderFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key") - dbRedisCACertificate = cgrLoaderFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate") + dbRedisTls = cgrLoaderFlags.Bool(utils.RedisTLSCfg, false, "Enable TLS when connecting to Redis") + dbRedisClientCertificate = cgrLoaderFlags.String(utils.RedisClientCertificateCfg, utils.EmptyString, "Path to the client certificate") + dbRedisClientKey = cgrLoaderFlags.String(utils.RedisClientKeyCfg, utils.EmptyString, "Path to the client key") + dbRedisCACertificate = cgrLoaderFlags.String(utils.RedisCACertificateCfg, utils.EmptyString, "Path to the CA certificate") storDBType = cgrLoaderFlags.String(utils.StorDBTypeCgr, dfltCfg.StorDbCfg().Type, "The type of the storDb database <*mysql|*postgres|*mongo>") diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index dffeba303..be40f2f86 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -83,10 +83,10 @@ func TestLoadConfig(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterOnDownDelayCfg: "0", utils.RedisClusterCfg: false, - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index 40f686a27..3c190ebb1 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -75,10 +75,10 @@ var ( "The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state") dbQueryTimeout = cgrMigratorFlags.String(utils.MongoQueryTimeoutCfg, utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg]), "The timeout for queries") - dbRedisTls = cgrMigratorFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis") - dbRedisClientCertificate = cgrMigratorFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate") - dbRedisClientKey = cgrMigratorFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key") - dbRedisCACertificate = cgrMigratorFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate") + dbRedisTls = cgrMigratorFlags.Bool(utils.RedisTLSCfg, false, "Enable TLS when connecting to Redis") + dbRedisClientCertificate = cgrMigratorFlags.String(utils.RedisClientCertificateCfg, utils.EmptyString, "Path to the client certificate") + dbRedisClientKey = cgrMigratorFlags.String(utils.RedisClientKeyCfg, utils.EmptyString, "Path to the client key") + dbRedisCACertificate = cgrMigratorFlags.String(utils.RedisCACertificateCfg, utils.EmptyString, "Path to the CA certificate") outDataDBType = cgrMigratorFlags.String(utils.OutDataDBTypeCfg, utils.MetaDataDB, "output DataDB type <*redis|*mongo>") diff --git a/config/config_json_test.go b/config/config_json_test.go index 77ffb0968..366dcd285 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -319,10 +319,10 @@ func TestDfDataDbJsonCfg(t *testing.T) { utils.RedisClusterCfg: false, utils.RedisClusterOnDownDelayCfg: "0", utils.RedisClusterSyncCfg: "5s", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, Items: map[string]*ItemOptJson{ utils.MetaAccounts: { @@ -1830,10 +1830,10 @@ func TestDfMigratorCfg(t *testing.T) { utils.RedisClusterCfg: false, utils.RedisClusterSyncCfg: "5s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, } dfCgrJSONCfg, err := NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON)) diff --git a/config/config_test.go b/config/config_test.go index 79eb0086c..4ffd2aeed 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -3628,10 +3628,10 @@ func TestCgrMigratorCfgDefault(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, OutStorDBOpts: make(map[string]interface{}), } @@ -4732,10 +4732,10 @@ func TestV1GetConfigSectionMigrator(t *testing.T) { utils.RedisClusterCfg: false, utils.RedisClusterSyncCfg: "5s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, }, } diff --git a/config/configdbcfg.go b/config/configdbcfg.go index cbf533a1a..48d85ebb8 100644 --- a/config/configdbcfg.go +++ b/config/configdbcfg.go @@ -107,10 +107,10 @@ func (dbcfg ConfigDBCfg) AsMapInterface(string) interface{} { utils.RedisClusterSyncCfg: dbcfg.Opts.RedisClusterSync.String(), utils.RedisClusterOnDownDelayCfg: dbcfg.Opts.RedisClusterOndownDelay.String(), utils.MongoQueryTimeoutCfg: dbcfg.Opts.MongoQueryTimeout.String(), - utils.RedisTLS: dbcfg.Opts.RedisTLS, - utils.RedisClientCertificate: dbcfg.Opts.RedisClientCertificate, - utils.RedisClientKey: dbcfg.Opts.RedisClientKey, - utils.RedisCACertificate: dbcfg.Opts.RedisCACertificate, + utils.RedisTLSCfg: dbcfg.Opts.RedisTLS, + utils.RedisClientCertificateCfg: dbcfg.Opts.RedisClientCertificate, + utils.RedisClientKeyCfg: dbcfg.Opts.RedisClientKey, + utils.RedisCACertificateCfg: dbcfg.Opts.RedisCACertificate, } mp := map[string]interface{}{ utils.DataDbTypeCfg: utils.Meta + dbcfg.Type, diff --git a/config/datadbcfg.go b/config/datadbcfg.go index ac951b244..c2701ccd8 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -249,10 +249,10 @@ func (dbcfg DataDbCfg) AsMapInterface(string) interface{} { utils.RedisClusterSyncCfg: dbcfg.Opts.RedisClusterSync.String(), utils.RedisClusterOnDownDelayCfg: dbcfg.Opts.RedisClusterOndownDelay.String(), utils.MongoQueryTimeoutCfg: dbcfg.Opts.MongoQueryTimeout.String(), - utils.RedisTLS: dbcfg.Opts.RedisTLS, - utils.RedisClientCertificate: dbcfg.Opts.RedisClientCertificate, - utils.RedisClientKey: dbcfg.Opts.RedisClientKey, - utils.RedisCACertificate: dbcfg.Opts.RedisCACertificate, + utils.RedisTLSCfg: dbcfg.Opts.RedisTLS, + utils.RedisClientCertificateCfg: dbcfg.Opts.RedisClientCertificate, + utils.RedisClientKeyCfg: dbcfg.Opts.RedisClientKey, + utils.RedisCACertificateCfg: dbcfg.Opts.RedisCACertificate, } mp := map[string]interface{}{ utils.DataDbTypeCfg: utils.Meta + dbcfg.Type, diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index d4423c91b..6c14379d3 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -66,10 +66,10 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { utils.RedisClusterCfg: true, utils.RedisClusterSyncCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, OutStorDBOpts: map[string]interface{}{ utils.RedisSentinelNameCfg: utils.EmptyString, @@ -125,10 +125,10 @@ func TestMigratorCgrCfgAsMapInterface(t *testing.T) { utils.RedisClusterCfg: true, utils.RedisClusterSyncCfg: "2s", utils.RedisClusterOnDownDelayCfg: "1", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, } if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { @@ -168,10 +168,10 @@ func TestMigratorCgrCfgAsMapInterface1(t *testing.T) { utils.RedisClusterCfg: false, utils.RedisClusterSyncCfg: "5s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, } if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { @@ -206,10 +206,10 @@ func TestMigratorCgrCfgAsMapInterface2(t *testing.T) { utils.RedisClusterCfg: false, utils.RedisClusterSyncCfg: "5s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, } if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { @@ -241,10 +241,10 @@ func TestMigratorCgrCfgClone(t *testing.T) { utils.RedisClusterCfg: true, utils.RedisClusterSyncCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, OutStorDBOpts: map[string]interface{}{ utils.RedisSentinelNameCfg: utils.EmptyString, diff --git a/engine/storage_utils.go b/engine/storage_utils.go index 70fe8fcfb..788996c9c 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -55,15 +55,15 @@ func NewDataDBConn(dbType, host, port, name, user, return } var hasTLSConn bool - if hasTLSConn, err = utils.IfaceAsBool(opts[utils.RedisTLS]); err != nil { + if hasTLSConn, err = utils.IfaceAsBool(opts[utils.RedisTLSCfg]); err != nil { return } d, err = NewRedisStorage(host, dbNo, user, pass, marshaler, utils.RedisMaxConns, utils.RedisMaxAttempts, utils.IfaceAsString(opts[utils.RedisSentinelNameCfg]), isCluster, clusterSync, clusterOnDownDelay, hasTLSConn, - utils.IfaceAsString(opts[utils.RedisClientCertificate]), - utils.IfaceAsString(opts[utils.RedisClientKey]), - utils.IfaceAsString(opts[utils.RedisCACertificate])) + utils.IfaceAsString(opts[utils.RedisClientCertificateCfg]), + utils.IfaceAsString(opts[utils.RedisClientKeyCfg]), + utils.IfaceAsString(opts[utils.RedisCACertificateCfg])) case utils.Mongo: var ttl time.Duration if ttl, err = utils.IfaceAsDuration(opts[utils.MongoQueryTimeoutCfg]); err != nil { diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 727c3518f..60ae14b50 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -91,10 +91,10 @@ func TestDataDBReload(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, @@ -231,10 +231,10 @@ func TestDataDBReloadBadType(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, @@ -336,10 +336,10 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, @@ -523,10 +523,10 @@ func TestDataDBReloadCastError(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, @@ -659,10 +659,10 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, @@ -786,10 +786,10 @@ func TestDataDBReloadError(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, diff --git a/services/datadb_test.go b/services/datadb_test.go index 8e31852d6..b14a5a072 100644 --- a/services/datadb_test.go +++ b/services/datadb_test.go @@ -58,10 +58,10 @@ func TestDataDBCoverage(t *testing.T) { utils.RedisClusterSyncCfg: "5s", utils.RedisClusterCfg: false, utils.RedisSentinelNameCfg: "", - utils.RedisTLS: false, - utils.RedisClientCertificate: "", - utils.RedisClientKey: "", - utils.RedisCACertificate: "", + utils.RedisTLSCfg: false, + utils.RedisClientCertificateCfg: "", + utils.RedisClientKeyCfg: "", + utils.RedisCACertificateCfg: "", }, RmtConns: []string{}, RplConns: []string{}, diff --git a/utils/consts.go b/utils/consts.go index 4ce6652e3..5c8c1a106 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -1730,10 +1730,10 @@ const ( RedisClusterCfg = "redisCluster" RedisClusterSyncCfg = "redisClusterSync" RedisClusterOnDownDelayCfg = "redisClusterOndownDelay" - RedisTLS = "redisTLS" - RedisClientCertificate = "redisClientCertificate" - RedisClientKey = "redisClientKey" - RedisCACertificate = "redisCACertificate" + RedisTLSCfg = "redisTLS" + RedisClientCertificateCfg = "redisClientCertificate" + RedisClientKeyCfg = "redisClientKey" + RedisCACertificateCfg = "redisCACertificate" ReplicationFilteredCfg = "replication_filtered" ReplicationCache = "replication_cache" RemoteConnIDCfg = "remote_conn_id"