[incubator-inlong] branch master updated: [INLONG-2979] Tubemq cluster delete provides token code (#2981)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 538956b  [INLONG-2979] Tubemq cluster delete provides token code 
(#2981)
538956b is described below

commit 538956bfb3cc9db4c7f0cbee2bfd5bfcfe1f03dd
Author: bluewang <88174078+bluew...@users.noreply.github.com>
AuthorDate: Tue Mar 8 09:08:40 2022 +0800

    [INLONG-2979] Tubemq cluster delete provides token code (#2981)
    
    Co-authored-by: v_lizhwang <v_lizhw...@tencent.com>
---
 .../tubemq/manager/controller/cluster/ClusterController.java      | 8 ++++++--
 .../manager/controller/cluster/request/DeleteClusterReq.java      | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/ClusterController.java
 
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/ClusterController.java
index 59c30d1..e15cc1e 100644
--- 
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/ClusterController.java
+++ 
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/ClusterController.java
@@ -160,10 +160,14 @@ public class ClusterController {
      */
     public TubeMQResult deleteCluster(DeleteClusterReq req) {
         // 1. validate params
-        if (req.getClusterId() == null || 
StringUtils.isEmpty(req.getModifyUser())) {
-            return TubeMQResult.errorResult("please input clusterId and 
modifyUser");
+        if (req.getClusterId() == null || StringUtils.isEmpty(req.getToken())) 
{
+            return TubeMQResult.errorResult("please input clusterId and 
token");
         }
         // 2. delete cluster
+        MasterEntry masterNode = 
masterService.getMasterNode(req.getClusterId());
+        if (!req.getToken().equals(masterNode.getToken())) {
+            return TubeMQResult.errorResult("please enter the correct token");
+        }
         clusterService.deleteCluster(req.getClusterId());
         return new TubeMQResult();
     }
diff --git 
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/request/DeleteClusterReq.java
 
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/request/DeleteClusterReq.java
index fb4bb43..869af71 100644
--- 
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/request/DeleteClusterReq.java
+++ 
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/cluster/request/DeleteClusterReq.java
@@ -23,4 +23,5 @@ import lombok.Data;
 public class DeleteClusterReq {
     private Long clusterId;
     private String modifyUser;
+    private String token;
 }