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 d425183 [DLAB-1373] Fixed issue with permissions for user during instances creation d425183 is described below commit d425183955f8862acf4cfc25a6ab5e4e1b1b3f77 Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Mon Dec 9 13:17:11 2019 +0200 [DLAB-1373] Fixed issue with permissions for user during instances creation --- .../service/impl/InfrastructureTemplateServiceBase.java | 6 ++++-- .../service/impl/InfrastructureTemplateServiceBaseTest.java | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java index c3268f1..25fa56b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java @@ -23,6 +23,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration; 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.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.SparkStandaloneConfiguration; import com.epam.dlab.backendapi.roles.RoleType; @@ -57,13 +58,14 @@ public abstract class InfrastructureTemplateServiceBase implements Infrastructur @Inject private SelfServiceApplicationConfiguration configuration; - @Inject private SettingsDAO settingsDAO; @Inject private ProjectDAO projectDAO; @Inject private EndpointService endpointService; + @Inject + private UserGroupDao userGroupDao; @Inject @@ -80,7 +82,7 @@ public abstract class InfrastructureTemplateServiceBase implements Infrastructur user.getAccessToken(), ExploratoryMetadataDTO[].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()))) .filter(e -> exploratoryGpuIssuesAzureFilter(e) && diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java index fdbacab..ab5e493 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java @@ -22,6 +22,7 @@ package com.epam.dlab.backendapi.service.impl; import com.epam.dlab.auth.UserInfo; 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.service.EndpointService; @@ -55,6 +56,8 @@ public class InfrastructureTemplateServiceBaseTest { private ProjectDAO projectDAO; @Mock private EndpointService endpointService; + @Mock + private UserGroupDao userGroupDao; @InjectMocks private InfrastructureTemplateServiceBaseChild infrastructureTemplateServiceBaseChild = @@ -81,8 +84,7 @@ public class InfrastructureTemplateServiceBaseTest { "someRam2", 6))); emDto2.setExploratoryEnvironmentShapes(shapes2); List<ExploratoryMetadataDTO> expectedEmdDtoList = Arrays.asList(emDto1, emDto2); - when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - null, null, null, null))); + when(userGroupDao.getUserGroups(anyString())).thenReturn(Collections.emptySet()); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedEmdDtoList.toArray()); when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); @@ -94,7 +96,8 @@ public class InfrastructureTemplateServiceBaseTest { verify(provisioningService).get(endpointDTO().getUrl() + "docker/exploratory", "token", ExploratoryMetadataDTO[].class); verify(settingsDAO, times(2)).getConfOsFamily(); - verifyNoMoreInteractions(provisioningService, settingsDAO); + verify(userGroupDao).getUserGroups("test"); + verifyNoMoreInteractions(provisioningService, settingsDAO, userGroupDao); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org