fix: let null password not fail health check

Lambert-Rao · Apr 18, 2024 · 32e4170 · 32e4170
1 parent 0a2a03c
commit 32e4170
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/RedisCheck.java b/...org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/RedisCheck.java
@@ -40,7 +40,7 @@
 @HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_REDIS)
 public class RedisCheck extends AbstractHealthCheckService {
 
- private CreateRedisConfig config;
+ private CreateRedisConfig sdkConfig;
 
  public RedisCheck(HealthCheckObjectConfig healthCheckObjectConfig) {
  super(healthCheckObjectConfig);
@@ -50,7 +50,7 @@ public RedisCheck(HealthCheckObjectConfig healthCheckObjectConfig) {
  public void doCheck(HealthCheckCallback callback) {
  try {
  StatefulRedisConnection<String, String> connection = (StatefulRedisConnection<String, String>) SDKManager.getInstance()
- .getClient(SDKTypeEnum.STORAGE_REDIS, config.getUniqueKey());
+ .getClient(SDKTypeEnum.STORAGE_REDIS, sdkConfig.getUniqueKey());
  RedisAsyncCommands<String, String> commands = connection.async();
  commands.ping().thenAccept(result -> {
  callback.onSuccess();
@@ -71,7 +71,7 @@ public void doCheck(HealthCheckCallback callback) {
  @Override
  public void init() {
  String redisUrl;
- config = new CreateRedisConfig();
+ sdkConfig = new CreateRedisConfig();
  if (Objects.nonNull(getConfig().getConnectUrl()) && !getConfig().getConnectUrl().isEmpty()) {
  redisUrl = getConfig().getConnectUrl();
  } else {
@@ -87,12 +87,12 @@ public void init() {
  }
  redisUrl = builder.build().toString();
  }
- config.setRedisUrl(redisUrl);
- SDKManager.getInstance().createClient(SDKTypeEnum.STORAGE_REDIS, config);
+ sdkConfig.setRedisUrl(redisUrl);
+ SDKManager.getInstance().createClient(SDKTypeEnum.STORAGE_REDIS, sdkConfig);
  }
 
  @Override
  public void destroy() {
- SDKManager.getInstance().deleteClient(SDKTypeEnum.STORAGE_REDIS, config.getUniqueKey());
+ SDKManager.getInstance().deleteClient(SDKTypeEnum.STORAGE_REDIS, sdkConfig.getUniqueKey());
  }
 }
diff --git a/...apache/eventmesh/dashboard/console/function/health/check/impl/storage/RedisCheckTest.java b/...apache/eventmesh/dashboard/console/function/health/check/impl/storage/RedisCheckTest.java
@@ -43,7 +43,8 @@ public void init() {
  .healthCheckResourceSubType("redis")
  .simpleClassName("RedisCheck")
  .clusterId(1L)
- .connectUrl("redis://127.0.0.1:6379")
+ .connectUrl("127.0.0.1:6379")
+ .password("")
  .build();
  redisCheck = new RedisCheck(config);
  } catch (RedisException e) {

diff --git a/...in/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/RedisSDKOperation.java b/...in/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/RedisSDKOperation.java
@@ -39,7 +39,7 @@ public SimpleEntry<String, StatefulRedisConnection<String, String>> createClient
  RedisURI redisURI = RedisURI.builder()
  .withHost(clientHost)
  .withPort(clientPort)
- .withPassword(redisConfig.getPassword())
+ .withPassword(redisConfig.getPassword() == null ? "" : redisConfig.getPassword())
  .withTimeout(Duration.ofSeconds(redisConfig.getTimeOut()))
  .build();
  RedisClient redisClient = RedisClient.create(redisURI);