test: config tests and mongodb connection timeout

internal/config/cache.go

@@ -8,6 +8,7 @@ var CacheType = Create(&ViperConfigKey{
 var CacheUri = Create(&ViperConfigKey{
 	Key:     "cache.uri",
 	Aliases: []string{"redis.uri"},
+	Default: nil,
 })
 
 var CacheConnectionRetryEnabled = Create(&ViperConfigKey{

internal/config/storage.go

@@ -10,7 +10,7 @@ var StorageType = Create(&ViperConfigKey{
 var StorageUri = Create(&ViperConfigKey{
 	Key:     "storage.uri",
 	Aliases: []string{"mongo.uri", "mongodb.uri"},
-	Default: "",
+	Default: nil,
 })
 
 var StorageConnectionRetryEnabled = Create(&ViperConfigKey{

internal/config/viper_config.go

@@ -44,6 +44,10 @@ func (config *ViperConfigKey) Get() string {
 		}
 	}
 
+	if val, ok := config.GetDefault().(string); ok {
+		return val
+	}
+
 	return ""
 }
 
@@ -59,6 +63,12 @@ func (config *ViperConfigKey) GetDuration() time.Duration {
 		}
 	}
 
+	if val, ok := config.GetDefault().(string); ok {
+		duration, _ := time.ParseDuration(val)
+
+		return duration
+	}
+
 	return 0
 }
 
@@ -74,6 +84,10 @@ func (config *ViperConfigKey) GetBool() bool {
 		}
 	}
 
+	if val, ok := config.GetDefault().(bool); ok {
+		return val
+	}
+
 	return false
 }
 
@@ -89,5 +103,9 @@ func (config *ViperConfigKey) GetInt() int {
 		}
 	}
 
+	if val, ok := config.GetDefault().(int); ok {
+		return val
+	}
+
 	return 0
 }

internal/messagepool/storage/mongo_storage.go

@@ -118,6 +118,12 @@ func waitForClient(ctx context.Context, opts *options.ClientOptions) (*mongo.Cli
 	var client *mongo.Client
 
 	for i := 1; i <= config.StorageConnectionRetryAttempts.GetInt(); i++ {
+		var cancelFunc context.CancelFunc = func() {}
+		if opts.ConnectTimeout != nil {
+			ctx, cancelFunc = context.WithTimeout(ctx, *opts.ConnectTimeout)
+		}
+		defer cancelFunc()
+
 		client, err = createClient(ctx, opts)
 
 		if err == nil || !config.StorageConnectionRetryEnabled.GetBool() {

internal/messagepool/storage/mongo_storage_test.go

@@ -70,8 +70,7 @@ func TestNewStorageWithoutServerShouldErrorIntegration(t *testing.T) {
 
 	defer viper.Reset()
 	config.StorageConnectionRetryEnabled.Set(false)
-	config.MongoAddresses.Set("localhost:41343")
-	config.MongoDatabase.Set("unit_test")
+	config.StorageUri.Set("mongodb://localhost:41343/unit_test?connectTimeoutMS=200&socketTimeoutMS=200")
 
 	_, err := NewMongoStorage(context.Background())