Eventmesh function admin (#4854)

* own * dependency * finish registry * init * 0419 * 0419 * more discovery and move gRPC * fix dependency
apache · Apr 22, 2024 · 02f6d44 · 02f6d44
1 parent 02bcd35
commit 02f6d44
Show file tree

Hide file tree

Showing 28 changed files with 2,608 additions and 94 deletions.
diff --git a/eventmesh-admin-server/build.gradle b/eventmesh-admin-server/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
 	implementation project(":eventmesh-spi")
 	implementation project(":eventmesh-common")
+	implementation project(":eventmesh-registry:eventmesh-registry-api")
+	implementation project(":eventmesh-registry:eventmesh-registry-nacos")
 	implementation "com.alibaba.nacos:nacos-client"
 	implementation ("org.springframework.boot:spring-boot-starter-web") {
 		exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"

diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java
@@ -1,22 +1,21 @@
 package com.apache.eventmesh.admin.server;
 
-import com.apache.eventmesh.admin.server.registry.EventMeshAdminServerRegisterInfo;
-import com.apache.eventmesh.admin.server.registry.RegistryService;
 import com.apache.eventmesh.admin.server.task.Task;
 import org.apache.eventmesh.common.utils.PagedList;
+import org.apache.eventmesh.registry.RegistryService;
 
 public class AdminServer implements Admin {
 
     private RegistryService registryService;
 
-    private EventMeshAdminServerRegisterInfo registerInfo;
+//    private EventMeshAdminServerRegisterInfo registerInfo;
 
-    public AdminServer(RegistryService registryService, EventMeshAdminServerRegisterInfo registerInfo) {
+    public AdminServer(RegistryService registryService) {
         this.registryService = registryService;
-        this.registerInfo = registerInfo;
+//        this.registerInfo = registerInfo;
     }
 
-    public static final String ConfigurationKey = "admin-server";
+
     @Override
     public boolean createOrUpdateTask(Task task) {
         return false;
@@ -44,13 +43,12 @@ public void reportHeartbeat(HeartBeat heartBeat) {
 
     @Override
     public void start() {
-
-        registryService.register(registerInfo);
+        registryService.register(null);
     }
 
     @Override
     public void destroy() {
-        registryService.unRegister(registerInfo);
+        registryService.unRegister(null);
         registryService.shutdown();
     }
 }
diff --git a/...ry/EventMeshAdminServerConfiguration.java → ...er/EventMeshAdminServerConfiguration.java b/...ry/EventMeshAdminServerConfiguration.java → ...er/EventMeshAdminServerConfiguration.java
@@ -1,4 +1,4 @@
-package com.apache.eventmesh.admin.server.registry;
+package com.apache.eventmesh.admin.server;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

diff --git a/...ain/java/com/apache/eventmesh/admin/server/registry/EventMeshAdminServerRegisterInfo.java b/...ain/java/com/apache/eventmesh/admin/server/registry/EventMeshAdminServerRegisterInfo.java
diff --git a/...dmin-server/src/main/java/com/apache/eventmesh/admin/server/registry/RegistryService.java b/...dmin-server/src/main/java/com/apache/eventmesh/admin/server/registry/RegistryService.java
diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java
@@ -1,7 +1,7 @@
 package com.apache.eventmesh.admin.server.web;
 
 import com.apache.eventmesh.admin.server.ComponentLifeCycle;
-import com.apache.eventmesh.admin.server.web.generated.AdminBiStreamServiceGrpc;
+import org.apache.eventmesh.common.protocol.grpc.adminserver.AdminBiStreamServiceGrpc;
 import org.springframework.stereotype.Controller;
 
 @Controller

diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
@@ -17,20 +17,17 @@
 
 package org.apache.eventmesh.common.config;
 
-import static org.apache.eventmesh.common.Constants.HTTP;
-
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.IPUtils;
-
-import org.apache.commons.collections4.CollectionUtils;
+import org.assertj.core.util.Strings;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.assertj.core.util.Strings;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import static org.apache.eventmesh.common.Constants.HTTP;
 
 @Data
 @NoArgsConstructor
@@ -115,6 +112,18 @@ public class CommonConfiguration {
     @ConfigFiled(field = "server.retry.plugin.type")
     private String eventMeshRetryPluginType = Constants.DEFAULT;
 
+    @ConfigFiled(field = "registry.plugin.server-addr", notEmpty = true)
+    private String registryAddr = "";
+
+    @ConfigFiled(field = "registry.plugin.type", notEmpty = true)
+    private String eventMeshRegistryPluginType = "nacos";
+
+    @ConfigFiled(field = "registry.plugin.username")
+    private String eventMeshRegistryPluginUsername = "";
+
+    @ConfigFiled(field = "registry.plugin.password")
+    private String eventMeshRegistryPluginPassword = "";
+
     public void reload() {
         this.eventMeshWebhookOrigin = "eventmesh." + eventMeshIDC;