[incubator-dlab] branch develop updated: [DLAB-1378] Fixed issue with roles for computational resources

[ofuks]

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

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6ec542e  [DLAB-1378] Fixed issue with roles for computational resources
     new 30c0450  Merge remote-tracking branch 'origin/develop' into develop
6ec542e is described below

commit 6ec542e89aa780746c6bddfe0e66c261a3048d42
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Tue Feb 4 17:22:49 2020 +0200

    [DLAB-1378] Fixed issue with roles for computational resources
---
 .../service/impl/InfrastructureTemplateServiceImpl.java          | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index ca718d4..31f73f3 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -25,7 +25,6 @@ import com.epam.dlab.backendapi.dao.ProjectDAO;
 import com.epam.dlab.backendapi.dao.SettingsDAO;
 import com.epam.dlab.backendapi.dao.UserGroupDao;
 import com.epam.dlab.backendapi.domain.EndpointDTO;
-import com.epam.dlab.backendapi.domain.ProjectDTO;
 import com.epam.dlab.backendapi.resources.dto.SparkStandaloneConfiguration;
 import com.epam.dlab.backendapi.resources.dto.aws.AwsEmrConfiguration;
 import com.epam.dlab.backendapi.resources.dto.gcp.GcpDataprocConfiguration;
@@ -126,7 +125,7 @@ public class InfrastructureTemplateServiceImpl implements 
InfrastructureTemplate
                                                        user.getAccessToken(), 
ComputationalMetadataDTO[]
                                                                        .class);
 
-                       final Set<String> roles = getRoles(user, project);
+                       final Set<String> roles = 
userGroupDao.getUserGroups(user.getName());
 
                        return Arrays.stream(array)
                                        .peek(e -> 
e.setImage(getSimpleImageName(e.getImage())))
@@ -142,12 +141,6 @@ public class InfrastructureTemplateServiceImpl implements 
InfrastructureTemplate
                }
        }
 
-       private Set<String> getRoles(UserInfo user, String project) {
-               return projectDAO.get(project)
-                               .map(ProjectDTO::getGroups)
-                               .orElse(user.getRoles());
-       }
-
        /**
         * Temporary filter for creation of exploratory env due to Azure issues
         */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org