test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 12:17:43 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[improvement]Add Set cluster name (#12058)

Browse Source 
* Add Set cluster name

* add unit test

Co-authored-by: fanwanlong <fanwanlong@kezaihui.com>
This commit is contained in:
jackfanwan 2022-09-20 21:26:05 +08:00 committed by GitHub
parent 955e8ebe0f
commit 0bf639b851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
View File

@ -32,6 +32,7 @@ import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
@ -40,6 +41,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -439,10 +441,31 @@ public class K8SNamespaceServiceImpl extends BaseServiceImpl implements K8sNames
*/
@Override
public List<K8sNamespace> queryNamespaceAvailable(User loginUser) {
List<K8sNamespace> k8sNamespaces;
if (isAdmin(loginUser)) {
return k8sNamespaceMapper.selectList(null);
k8sNamespaces = k8sNamespaceMapper.selectList(null);
} else {
return k8sNamespaceMapper.queryNamespaceAvailable(loginUser.getId());
k8sNamespaces = k8sNamespaceMapper.queryNamespaceAvailable(loginUser.getId());
}
setClusterName(k8sNamespaces);
return k8sNamespaces;
}
/**
* set cluster_name
* @param k8sNamespaces source data
*/
private void setClusterName(List<K8sNamespace> k8sNamespaces) {
if (CollectionUtils.isNotEmpty(k8sNamespaces)) {
List<Cluster> clusters = clusterMapper.queryAllClusterList();
if (CollectionUtils.isNotEmpty(clusters)) {
Map<Long, String> codeNameMap = clusters.stream()
.collect(Collectors.toMap(Cluster::getCode, Cluster::getName, (a, b) -> a));
for (K8sNamespace k8sNamespace : k8sNamespaces) {
String clusterName = codeNameMap.get(k8sNamespace.getClusterCode());
k8sNamespace.setClusterName(clusterName);
}
}
}
}

19
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/K8SNamespaceServiceTest.java
View File

@ -221,6 +221,25 @@ public class K8SNamespaceServiceTest {
Assert.assertTrue(CollectionUtils.isEmpty(namespaces));
}
@Test
public void testQueryNamespaceAvailable() {
List<K8sNamespace> k8sNamespaces = new ArrayList<>();
K8sNamespace k8sNamespace = new K8sNamespace();
k8sNamespace.setClusterCode(1L);
k8sNamespaces.add(k8sNamespace);
List<Cluster> clusters = new ArrayList<>();
Cluster cluster = new Cluster();
cluster.setCode(1L);
cluster.setName("test");
clusters.add(cluster);
Mockito.when(k8sNamespaceMapper.selectList(Mockito.any())).thenReturn(k8sNamespaces);
Mockito.when(clusterMapper.queryAllClusterList()).thenReturn(clusters);
List<K8sNamespace> result = k8sNamespaceService.queryNamespaceAvailable(getLoginUser());
Assert.assertEquals(result.get(0).getClusterName(), cluster.getName());
}
private User getLoginUser() {
User loginUser = new User();