From 0b904bb28b607a7037833e09de9dee659b6f03bc Mon Sep 17 00:00:00 2001
From: zhanghongtong <rory-z@outlook.com>
Date: Wed, 7 Apr 2021 06:19:46 +0000
Subject: [PATCH] chore(CI): add password for redis cluster in actions

---
 .ci/docker-compose-file/redis/redis-tls.conf | 1 +
 .ci/docker-compose-file/redis/redis.conf     | 1 +
 .ci/docker-compose-file/redis/redis.sh       | 2 +-
 .github/workflows/run_cts_tests.yaml         | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.ci/docker-compose-file/redis/redis-tls.conf b/.ci/docker-compose-file/redis/redis-tls.conf
index 46cddc518..8e146f9e7 100644
--- a/.ci/docker-compose-file/redis/redis-tls.conf
+++ b/.ci/docker-compose-file/redis/redis-tls.conf
@@ -4,3 +4,4 @@ logfile /var/log/redis-server.log
 tls-cert-file /tls/redis.crt
 tls-key-file /tls/redis.key
 tls-ca-cert-file /tls/ca.crt
+requirepass public
diff --git a/.ci/docker-compose-file/redis/redis.conf b/.ci/docker-compose-file/redis/redis.conf
index 71114329b..d6f158971 100644
--- a/.ci/docker-compose-file/redis/redis.conf
+++ b/.ci/docker-compose-file/redis/redis.conf
@@ -1,3 +1,4 @@
 daemonize yes
 bind 0.0.0.0 ::
 logfile /var/log/redis-server.log
+requirepass public
diff --git a/.ci/docker-compose-file/redis/redis.sh b/.ci/docker-compose-file/redis/redis.sh
index 53228eff5..b03eca7c6 100755
--- a/.ci/docker-compose-file/redis/redis.sh
+++ b/.ci/docker-compose-file/redis/redis.sh
@@ -80,7 +80,7 @@ do
         continue;
     fi
     if [ "${node}" = "cluster" ] ; then
-      yes "yes" | redis-cli --cluster create "$LOCAL_IP:7000" "$LOCAL_IP:7001" "$LOCAL_IP:7002";
+      yes "yes" | redis-cli --cluster create "$LOCAL_IP:7000" "$LOCAL_IP:7001" "$LOCAL_IP:7002" --pass public --no-auth-warning;
     elif [ "${node}" = "sentinel" ] ; then
       cp /data/conf/sentinel.conf /_sentinel.conf
       redis-server /_sentinel.conf --sentinel;
diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml
index 1652e1f0e..d72c36c34 100644
--- a/.github/workflows/run_cts_tests.yaml
+++ b/.github/workflows/run_cts_tests.yaml
@@ -351,7 +351,6 @@ jobs:
         if: matrix.node_type == 'single' && matrix.connect_type == 'tls'
         run: |
           cat <<-EOF >> "$GITHUB_ENV"
-          EMQX_AUTH__REIDS__PASSWORD=public
           EMQX_AUTH__REDIS__TYPE=single
           EMQX_AUTH__REDIS__SERVER=${redis_${{ matrix.network_type }}_address}:6380
           EOF
@@ -377,6 +376,7 @@ jobs:
       - name: run test cases
         run: |
           export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_
+          export EMQX_AUTH__REIDS__PASSWORD=public
           printenv > .env
           docker exec -i erlang sh -c "make ensure-rebar3"
           docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_redis"