Rename redisclusterunpooled to rediscluster

This is now our only clustered cache type, so simplify
the name to match our prior clustered cache variant.

Author: jaymell

server/run-tests.sh

@@ -50,7 +50,7 @@ echo "*********** RUN 3 ***********"
 echo "*********** RUN 4 ***********"
 (
     export SVIX_QUEUE_TYPE="rediscluster"
-    export SVIX_CACHE_TYPE="redisclusterunpooled"
+    export SVIX_CACHE_TYPE="rediscluster"
     export SVIX_REDIS_DSN="redis://localhost:6380"
     ${TEST_COMMAND}
     ${TEST_COMMAND} -- --ignored redis

server/svix-server/src/cfg.rs

@@ -193,7 +193,7 @@ pub struct ConfigurationInner {
 fn validate_config_complete(config: &ConfigurationInner) -> Result<(), ValidationError> {
     match config.cache_type {
         CacheType::None | CacheType::Memory => {}
-        CacheType::Redis | CacheType::RedisClusterUnpooled => {
+        CacheType::Redis | CacheType::RedisCluster => {
             if config.cache_dsn().is_none() {
                 return Err(ValidationError {
                     code: Cow::from("missing field"),
@@ -266,9 +266,7 @@ impl ConfigurationInner {
             CacheType::None => CacheBackend::None,
             CacheType::Memory => CacheBackend::Memory,
             CacheType::Redis => CacheBackend::Redis(self.cache_dsn().expect(err)),
-            CacheType::RedisClusterUnpooled => {
-                CacheBackend::RedisClusterUnpooled(self.cache_dsn().expect(err))
-            }
+            CacheType::RedisCluster => CacheBackend::RedisCluster(self.cache_dsn().expect(err)),
         }
     }
 }
@@ -305,7 +303,7 @@ pub enum CacheBackend<'a> {
     None,
     Memory,
     Redis(&'a str),
-    RedisClusterUnpooled(&'a str),
+    RedisCluster(&'a str),
 }
 
 #[derive(Clone, Debug, Deserialize)]
@@ -337,7 +335,7 @@ pub enum QueueType {
 pub enum CacheType {
     Memory,
     Redis,
-    RedisClusterUnpooled,
+    RedisCluster,
     None,
 }
 

server/svix-server/src/core/cache/redis.rs

@@ -114,9 +114,7 @@ mod tests {
 
     async fn get_pool(redis_dsn: &str, cfg: &crate::cfg::Configuration) -> RedisPool {
         match cfg.cache_type {
-            CacheType::RedisClusterUnpooled => {
-                crate::redis::new_redis_clustered_unpooled(redis_dsn).await
-            }
+            CacheType::RedisCluster => crate::redis::new_redis_clustered_unpooled(redis_dsn).await,
             CacheType::Redis => crate::redis::new_redis_pool(redis_dsn, cfg).await,
             _ => panic!(
                 "This test should only be run when redis is configured as the cache provider"

server/svix-server/src/lib.rs

@@ -113,7 +113,7 @@ pub async fn run_with_prefix(
             let mgr = crate::redis::new_redis_pool(dsn, &cfg).await;
             cache::redis::new(mgr)
         }
-        CacheBackend::RedisClusterUnpooled(dsn) => {
+        CacheBackend::RedisCluster(dsn) => {
             let mgr = crate::redis::new_redis_clustered_unpooled(dsn).await;
             cache::redis::new(mgr)
         }

server/svix-server/src/redis/mod.rs

@@ -245,7 +245,7 @@ mod tests {
 
     async fn get_pool(redis_dsn: &str, cfg: &Configuration) -> RedisPool {
         match cfg.cache_type {
-            CacheType::RedisClusterUnpooled => super::new_redis_clustered_unpooled(redis_dsn).await,
+            CacheType::RedisCluster => super::new_redis_clustered_unpooled(redis_dsn).await,
             CacheType::Redis => super::new_redis_pool(redis_dsn, cfg).await,
             _ => panic!(
                 "This test should only be run when redis is configured as the cache provider"

server/svix-server/tests/it/message_app.rs

@@ -69,7 +69,7 @@ async fn test_app_deletion() {
             let mgr = new_redis_pool(dsn, &cfg).await;
             cache::redis::new(mgr)
         }
-        CacheBackend::RedisClusterUnpooled(dsn) => {
+        CacheBackend::RedisCluster(dsn) => {
             let mgr = new_redis_clustered_unpooled(dsn).await;
             cache::redis::new(mgr)
         }
@@ -153,7 +153,7 @@ async fn test_endp_deletion() {
             let mgr = new_redis_pool(dsn, &cfg).await;
             cache::redis::new(mgr)
         }
-        CacheBackend::RedisClusterUnpooled(dsn) => {
+        CacheBackend::RedisCluster(dsn) => {
             let mgr = new_redis_clustered_unpooled(dsn).await;
             cache::redis::new(mgr)
         }