From eca86f32ffa3fbf949e4666a9dd97df3bdb2f95b Mon Sep 17 00:00:00 2001 From: Pil0tXia Date: Sat, 20 Apr 2024 00:06:40 +0800 Subject: [PATCH] Optimize nacos tests --- .../check/impl/meta/NacosConfigCheckTest.java | 4 +--- .../SDK/config/CreateNacosConfig.java | 12 ++++++++++- .../operation/NacosConfigSDKOperation.java | 5 +++++ .../operation/NacosNamingSDKOperation.java | 5 +++++ .../NacosNamingSDKOperationTest.java | 20 ++++++++++--------- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheckTest.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheckTest.java index 8df1efc2..7915bd0d 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheckTest.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/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/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateNacosConfig.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateNacosConfig.java index 71a1c61b..7d7effaa 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateNacosConfig.java +++ b/eventmesh-dashboard-core/src/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/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java index 982a6ee7..b7a6769c 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosConfigSDKOperation.java @@ -41,6 +41,11 @@ public SimpleEntry 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/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java index 28431f96..ca2d7221 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperation.java @@ -42,6 +42,11 @@ public SimpleEntry 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/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperationTest.java b/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperationTest.java index 300de4e0..54ae2a96 100644 --- a/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/function/SDK/operation/NacosNamingSDKOperationTest.java +++ b/eventmesh-dashboard-core/src/test/java/org/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); } }