INS-12991: Redis authentication support

shotover-proxy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shotover-proxy"
-version = "0.0.21"
+version = "0.0.23"
 authors = ["Ben <ben@instaclustr.com>"]
 edition = "2018"
 

shotover-proxy/examples/redis-cluster-auth/docker-compose.yml

@@ -4,8 +4,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2230:6379"
- volumes:
- - redis-cluster_data-0:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -14,8 +12,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2231:6379"
- volumes:
- - redis-cluster_data-1:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -24,8 +20,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2232:6379"
- volumes:
- - redis-cluster_data-2:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -34,8 +28,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2233:6379"
- volumes:
- - redis-cluster_data-3:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -44,8 +36,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2234:6379"
- volumes:
- - redis-cluster_data-4:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -54,8 +44,6 @@ services:
  image: docker.io/bitnami/redis-cluster:6.0-debian-10
  ports:
  - "2235:6379"
- volumes:
- - redis-cluster_data-5:/bitnami/redis/data
  environment:
  - 'REDIS_PASSWORD=shotover'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
@@ -75,17 +63,3 @@ services:
  - 'REDIS_CLUSTER_REPLICAS=1'
  - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
  - 'REDIS_CLUSTER_CREATOR=yes'
-
-volumes:
- redis-cluster_data-0:
- driver: local
- redis-cluster_data-1:
- driver: local
- redis-cluster_data-2:
- driver: local
- redis-cluster_data-3:
- driver: local
- redis-cluster_data-4:
- driver: local
- redis-cluster_data-5:
- driver: local

shotover-proxy/examples/redis-cluster-auth/topology.yaml

@@ -7,8 +7,14 @@ sources:
 chain_config:
  redis_chain:
  - RedisCluster:
- first_contact_points: ["redis://127.0.0.1:2230/", "redis://127.0.0.1:2231/", "redis://127.0.0.1:2232/", "redis://127.0.0.1:2233/", "redis://127.0.0.1:2234/", "redis://127.0.0.1:2235/"]
-named_topics:
- testtopic: 5
+ first_contact_points:
+ [
+ "127.0.0.1:2230",
+ "127.0.0.1:2231",
+ "127.0.0.1:2232",
+ "127.0.0.1:2233",
+ "127.0.0.1:2234",
+ "127.0.0.1:2235",
+ ]
 source_to_chain_mapping:
- redis_prod: redis_chain
+ redis_prod: redis_chain

shotover-proxy/src/transforms/redis_transforms/mod.rs

@@ -1,6 +1,5 @@
 use std::io;
 
-use crate::transforms::util::cluster_connection_pool::NoopError;
 use crate::transforms::util::ConnectionError;
 
 pub mod redis_cache;
@@ -69,12 +68,3 @@ impl From<ConnectionError<TransformError>> for TransformError {
  }
  }
 }
-
-impl From<ConnectionError<NoopError>> for TransformError {
- fn from(error: ConnectionError<NoopError>) -> Self {
- match error {
- ConnectionError::IO(e) => TransformError::IO(e),
- ConnectionError::Authenticator(_) => unimplemented!(),
- }
- }
-}