Optimize nacos tests

Pil0tXia · Apr 19, 2024 · eca86f3 · eca86f3
1 parent 84ea4af
commit eca86f3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/...che/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheckTest.java b/...che/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheckTest.java
@@ -28,8 +28,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-import com.alibaba.nacos.api.exception.NacosException;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -70,7 +68,7 @@ public void onSuccess() {
  @Override
  public void onFail(Exception e) {
  latch.countDown();
- log.error("{}, failed for reason {}", this.getClass().getSimpleName(), e);
+ log.error("{}, failed", this.getClass().getSimpleName(), e);
  }
  });
  latch.await(2, TimeUnit.SECONDS);

diff --git a/.../main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateNacosConfig.java b/.../main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateNacosConfig.java
@@ -28,7 +28,17 @@
 @NoArgsConstructor
 public class CreateNacosConfig implements CreateSDKConfig {
 
- private String serverAddress;
+ private String serverAddress = "127.0.0.1:8848";
+
+ private String namespace = "";
+
+ private String username = "nacos";
+
+ private String password = "nacos";
+
+ private String accessKey = "";
+
+ private String secretKey = "";
 
  @Override
  public String getUniqueKey() {

diff --git a/...a/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java b/...a/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java
@@ -41,6 +41,11 @@ public SimpleEntry<String, ConfigService> createClient(CreateSDKConfig clientCon
  try {
  Properties properties = new Properties();
  properties.put(PropertyKeyConst.SERVER_ADDR, config.getServerAddress());
+ properties.put(PropertyKeyConst.NAMESPACE, config.getNamespace());
+ properties.put(PropertyKeyConst.USERNAME, config.getUsername());
+ properties.put(PropertyKeyConst.PASSWORD, config.getPassword());
+ properties.put(PropertyKeyConst.ACCESS_KEY, config.getAccessKey());
+ properties.put(PropertyKeyConst.SECRET_KEY, config.getSecretKey());
  configService = NacosFactory.createConfigService(properties);
  } catch (NacosException e) {
  log.error("NacosCheck init failed caused by {}", e.getErrMsg());

diff --git a/...a/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java b/...a/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java
@@ -42,6 +42,11 @@ public SimpleEntry<String, NamingService> createClient(CreateSDKConfig clientCon
  try {
  Properties properties = new Properties();
  properties.put(PropertyKeyConst.SERVER_ADDR, config.getServerAddress());
+ properties.put(PropertyKeyConst.NAMESPACE, config.getNamespace());
+ properties.put(PropertyKeyConst.USERNAME, config.getUsername());
+ properties.put(PropertyKeyConst.PASSWORD, config.getPassword());
+ properties.put(PropertyKeyConst.ACCESS_KEY, config.getAccessKey());
+ properties.put(PropertyKeyConst.SECRET_KEY, config.getSecretKey());
  namingService = NacosFactory.createNamingService(properties);
  } catch (NacosException e) {
  log.error("NacosCheck init failed caused by {}", e.getErrMsg());

diff --git a/...g/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperationTest.java b/...g/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperationTest.java
@@ -38,15 +38,17 @@ class NacosNamingSDKOperationTest {
  @Test
  public void testCreateNamingService() throws NacosException, InterruptedException {
  try {
- CreateNacosConfig createClientConfig = new CreateNacosConfig();
- createClientConfig.setServerAddress("127.0.0.1:8848");
- NamingService namingService = (NamingService) SDKManager.getInstance().createClient(SDKTypeEnum.META_NACOS_NAMING, createClientConfig)
- .getValue();
- namingService.registerInstance("eventmesh-dashboard-sdk-nacos-test", "11.11.11.11", 8888, "eventmesh-dashboard-sdk-nacos-test-cluster-name");
-
- namingService.deregisterInstance("eventmesh-dashboard-sdk-nacos-test", "11.11.11.11", 8888,
- "eventmesh-dashboard-sdk-nacos-test-cluster-name");}
- catch (Exception e){
+ CreateNacosConfig createClientConfig = new CreateNacosConfig();
+ createClientConfig.setServerAddress("127.0.0.1:8848");
+ createClientConfig.setUsername("nacos");
+ createClientConfig.setPassword("nacos");
+ NamingService namingService = (NamingService) SDKManager.getInstance().createClient(SDKTypeEnum.META_NACOS_NAMING, createClientConfig)
+ .getValue();
+ namingService.registerInstance("eventmesh-dashboard-sdk-nacos-test", "192.168.11.11", 8888,
+ "eventmesh-dashboard-sdk-nacos-test-cluster-name");
+ namingService.deregisterInstance("eventmesh-dashboard-sdk-nacos-test", "192.168.11.11", 8888,
+ "eventmesh-dashboard-sdk-nacos-test-cluster-name");
+ } catch (Exception e) {
  log.error("create nacos naming service failed", e);
  }
  }