From c72675bf222502dcd0499fc26dcbe93013028294 Mon Sep 17 00:00:00 2001
From: fuwenkai <834260992@qq.com>
Date: Wed, 22 Nov 2023 16:59:23 +0800
Subject: [PATCH 1/2] [INLONG-9318][Manager] ManagerClient supports pulling
clusters based on tenant roles
---
.../api/inner/client/InlongClusterClient.java | 13 +++++++++++++
.../client/api/service/InlongClusterApi.java | 4 +++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongClusterClient.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongClusterClient.java
index ccae50d6cc6..a4558b43add 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongClusterClient.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongClusterClient.java
@@ -154,6 +154,19 @@ public PageResult<ClusterInfo> list(ClusterPageRequest request) {
return response.getData();
}
+ /**
+ * Paging query clusters according to tenant role.
+ *
+ * @param request query conditions
+ * @return cluster list
+ */
+ public PageResult<ClusterInfo> listByTenantRole(ClusterPageRequest request) {
+ Response<PageResult<ClusterInfo>> response =
+ ClientUtils.executeHttpCall(inlongClusterApi.listByTenantRole(request));
+ ClientUtils.assertRespSuccess(response);
+ return response.getData();
+ }
+
/**
* Update cluster information.
*
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
index a83a6a0f2af..7b3aa8d7230 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
@@ -29,7 +29,6 @@
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.common.Response;
import org.apache.inlong.manager.pojo.common.UpdateResult;
-
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.DELETE;
@@ -66,6 +65,9 @@ public interface InlongClusterApi {
@POST("cluster/list")
Call<Response<PageResult<ClusterInfo>>> list(@Body ClusterPageRequest request);
+ @POST("cluster/listByTenantRole")
+ Call<Response<PageResult<ClusterInfo>>> listByTenantRole(@Body ClusterPageRequest request);
+
@POST("cluster/update")
Call<Response<Boolean>> update(@Body ClusterRequest request);
From b51fb63cacffa33cbf42b85f55850d7e1fc1b3ba Mon Sep 17 00:00:00 2001
From: fuwenkai <834260992@qq.com>
Date: Wed, 22 Nov 2023 17:02:40 +0800
Subject: [PATCH 2/2] [INLONG-9318][Manager] Fix code style
---
.../inlong/manager/client/api/service/InlongClusterApi.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
index 7b3aa8d7230..5be602cc3b1 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
@@ -29,6 +29,7 @@
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.common.Response;
import org.apache.inlong.manager.pojo.common.UpdateResult;
+
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.DELETE;