This is an automated email from the ASF dual-hosted git repository. xuanwo pushed a commit to branch redis-rustls in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 13199353fb6ed34f57e1bf30618b7ec1d94ce644 Author: Xuanwo <[email protected]> AuthorDate: Fri Nov 3 12:11:32 2023 +0800 refactor(services/redis): Enable rustls support by default for redis Signed-off-by: Xuanwo <[email protected]> --- .github/workflows/ci.yml | 1 - .github/workflows/service_test_redis.yml | 4 ++-- bindings/java/Cargo.toml | 2 -- bindings/nodejs/Cargo.toml | 2 -- bindings/python/Cargo.toml | 2 -- core/Cargo.toml | 3 +-- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff0489b26..79fc2bd0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -232,7 +232,6 @@ jobs: services-postgresql services-redb services-redis - services-redis-rustls # TODO: we need to find ways to using pre-install rocksdb library # services-rocksdb services-s3 diff --git a/.github/workflows/service_test_redis.yml b/.github/workflows/service_test_redis.yml index 96845b0cf..89eaeb44a 100644 --- a/.github/workflows/service_test_redis.yml +++ b/.github/workflows/service_test_redis.yml @@ -61,7 +61,7 @@ jobs: - name: Test shell: bash working-directory: core - run: cargo nextest run behavior --features tests,services-redis-rustls + run: cargo nextest run behavior --features tests,services-redis env: OPENDAL_TEST: redis OPENDAL_REDIS_ENDPOINT: rediss://localhost:6379 @@ -94,7 +94,7 @@ jobs: - name: Test shell: bash working-directory: core - run: cargo nextest run behavior --features tests,services-redis-rustls + run: cargo nextest run behavior --features tests,services-redis env: OPENDAL_TEST: redis OPENDAL_REDIS_CLUSTER_ENDPOINTS: rediss://127.0.0.1:6380/,rediss://127.0.0.1:6381/,rediss://127.0.0.1:6382/,rediss://127.0.0.1:6383/,rediss://127.0.0.1:6384/,rediss://127.0.0.1:6385/ diff --git a/bindings/java/Cargo.toml b/bindings/java/Cargo.toml index 15bf36620..2553712f3 100644 --- a/bindings/java/Cargo.toml +++ b/bindings/java/Cargo.toml @@ -73,7 +73,6 @@ services-all = [ "services-mysql", "services-redb", "services-redis", - "services-redis-rustls", "services-rocksdb", "services-sled", "services-supabase", @@ -122,7 +121,6 @@ services-persy = ["opendal/services-persy"] services-postgresql = ["opendal/services-postgresql"] services-redb = ["opendal/services-redb"] services-redis = ["opendal/services-redis"] -services-redis-rustls = ["opendal/services-redis-rustls"] services-rocksdb = ["opendal/services-rocksdb"] services-sftp = ["opendal/services-sftp"] services-sled = ["opendal/services-sled"] diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index 3a9848aad..4024a9f5e 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -70,7 +70,6 @@ services-all = [ "services-mysql", "services-redb", "services-redis", - "services-redis-rustls", "services-rocksdb", "services-sled", "services-supabase", @@ -118,7 +117,6 @@ services-persy = ["opendal/services-persy"] services-postgresql = ["opendal/services-postgresql"] services-redb = ["opendal/services-redb"] services-redis = ["opendal/services-redis"] -services-redis-rustls = ["opendal/services-redis-rustls"] services-rocksdb = ["opendal/services-rocksdb"] services-sftp = ["opendal/services-sftp"] services-sled = ["opendal/services-sled"] diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml index d16bea025..c5f778dd9 100644 --- a/bindings/python/Cargo.toml +++ b/bindings/python/Cargo.toml @@ -70,7 +70,6 @@ services-all = [ "services-mysql", "services-redb", "services-redis", - "services-redis-rustls", "services-rocksdb", "services-sled", "services-supabase", @@ -118,7 +117,6 @@ services-persy = ["opendal/services-persy"] services-postgresql = ["opendal/services-postgresql"] services-redb = ["opendal/services-redb"] services-redis = ["opendal/services-redis"] -services-redis-rustls = ["opendal/services-redis-rustls"] services-rocksdb = ["opendal/services-rocksdb"] services-sftp = ["opendal/services-sftp"] services-sled = ["opendal/services-sled"] diff --git a/core/Cargo.toml b/core/Cargo.toml index dd129dbba..b7f44a86d 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -171,9 +171,8 @@ services-oss = [ services-persy = ["dep:persy"] services-postgresql = ["dep:tokio-postgres", "dep:bb8", "dep:bb8-postgres"] services-redb = ["dep:redb"] -services-redis = ["dep:redis"] +services-redis = ["dep:redis", "redis?/tokio-rustls-comp"] services-redis-native-tls = ["services-redis", "redis?/tokio-native-tls-comp"] -services-redis-rustls = ["services-redis", "redis?/tokio-rustls-comp"] services-rocksdb = ["dep:rocksdb"] services-s3 = [ "dep:reqsign",
