From 1675ddce0d6fc168a632fc3d7e73db8b3587f92c Mon Sep 17 00:00:00 2001 From: Oleg Avdeev Date: Thu, 22 Oct 2020 17:42:11 +0300 Subject: [PATCH 1/2] support redis ssl in feast-serving Signed-off-by: Oleg Avdeev --- infra/terraform/aws/helm.tf | 1 + protos/feast/core/Store.proto | 2 ++ .../connectors/redis/retriever/RedisClient.java | 10 +++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/infra/terraform/aws/helm.tf b/infra/terraform/aws/helm.tf index f38f6d2c45a..8a13fe8d407 100644 --- a/infra/terraform/aws/helm.tf +++ b/infra/terraform/aws/helm.tf @@ -62,6 +62,7 @@ locals { config = { host = module.redis.endpoint port = 6379 + ssl = true } subscriptions = [ { diff --git a/protos/feast/core/Store.proto b/protos/feast/core/Store.proto index 3ce0583b2c5..53b258d264a 100644 --- a/protos/feast/core/Store.proto +++ b/protos/feast/core/Store.proto @@ -110,6 +110,8 @@ message Store { int32 max_retries = 4; // Optional. How often flush data to redis int32 flush_frequency_seconds = 5; + // Optional. Connect over SSL. + bool ssl = 6; } message BigQueryConfig { diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClient.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClient.java index fdf26b98bc0..15de0e23278 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClient.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClient.java @@ -47,10 +47,14 @@ private RedisClient(StatefulRedisConnection connection) { } public static RedisClientAdapter create(Map config) { + + RedisURI uri = RedisURI.create(config.get("host"), Integer.parseInt(config.get("port"))); + + if (Boolean.parseBoolean(config.get("ssl"))) { + uri.setSsl(true); + } StatefulRedisConnection connection = - io.lettuce.core.RedisClient.create( - RedisURI.create(config.get("host"), Integer.parseInt(config.get("port")))) - .connect(new ByteArrayCodec()); + io.lettuce.core.RedisClient.create(uri).connect(new ByteArrayCodec()); return new RedisClient(connection); } From d72086707bd20445522378f753c128205b06d11d Mon Sep 17 00:00:00 2001 From: Oleg Avdeev Date: Fri, 23 Oct 2020 11:01:38 +0300 Subject: [PATCH 2/2] maybe fix e2e test deps Signed-off-by: Oleg Avdeev --- sdk/python/requirements-ci.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/python/requirements-ci.txt b/sdk/python/requirements-ci.txt index 6d9c8b2496f..2b0b87bd814 100644 --- a/sdk/python/requirements-ci.txt +++ b/sdk/python/requirements-ci.txt @@ -18,4 +18,5 @@ mypy mypy-protobuf avro==1.10.0 confluent_kafka -gcsfs \ No newline at end of file +gcsfs +urllib3>=1.25.4 \ No newline at end of file