This is an automated email from the ASF dual-hosted git repository. dyankiv pushed a commit to branch DATALAB-3075 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 9cd3bcf3a9200ae8a3a3a91bc60c00013264c65f Author: Denys Yankiv <[email protected]> AuthorDate: Tue Sep 27 12:35:25 2022 +0300 image audit changes --- .../backendapi/resources/ImageExploratoryResource.java | 3 +-- .../datalab/backendapi/service/ImageExploratoryService.java | 2 +- .../backendapi/service/impl/EnvironmentServiceImpl.java | 2 +- .../service/impl/ImageExploratoryServiceImpl.java | 4 ++-- .../backendapi/resources/ImageExploratoryResourceTest.java | 13 ++++++------- .../service/impl/ImageExploratoryServiceImplTest.java | 9 ++++----- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java index d18309bba..739ee934d 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java @@ -47,7 +47,6 @@ import java.util.List; @Produces(MediaType.APPLICATION_JSON) @Slf4j public class ImageExploratoryResource { - private static final String AUDIT_MESSAGE = "Create image: %s"; private final ImageExploratoryService imageExploratoryService; private final RequestId requestId; @@ -64,7 +63,7 @@ public class ImageExploratoryResource { @Context UriInfo uriInfo) { log.debug("Creating an image {} for user {}", formDTO, ui.getName()); String uuid = imageExploratoryService.createImage(ui, formDTO.getProjectName(), formDTO.getNotebookName(), - formDTO.getName(), formDTO.getDescription(), String.format(AUDIT_MESSAGE, formDTO.getName())); + formDTO.getName(), formDTO.getDescription()); requestId.put(ui.getName(), uuid); final URI imageUri = UriBuilder.fromUri(uriInfo.getRequestUri()) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java index b61f37e05..af4ad1bd3 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java @@ -28,7 +28,7 @@ import java.util.Set; public interface ImageExploratoryService { - String createImage(UserInfo user, String project, String exploratoryName, String imageName, String imageDescription, String info); + String createImage(UserInfo user, String project, String exploratoryName, String imageName, String imageDescription); void terminateImage(UserInfo user, String project, String endpoint, String imageName); diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java index 27cebe72c..822a0ee1e 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java @@ -109,7 +109,7 @@ public class EnvironmentServiceImpl implements EnvironmentService { @ProjectAdmin @Override public void createImage(@User UserInfo userInfo, String user, @Project String project, String exploratoryName, String imageName, String description) { - imageExploratoryService.createImage(securityService.getUserInfoOffline(user), project, exploratoryName, imageName, description, null); + imageExploratoryService.createImage(securityService.getUserInfoOffline(user), project, exploratoryName, imageName, description); } @ProjectAdmin diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java index 76acda01d..a0cb98ac7 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java @@ -106,7 +106,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService { @Audit(action = CREATE, type = IMAGE) @Override - public String createImage(@User UserInfo user, @Project String project, @ResourceName String exploratoryName, String imageName, String imageDescription, @Info String info) { + public String createImage(@User UserInfo user, @Project String project, String exploratoryName, @ResourceName String imageName, String imageDescription) { ProjectDTO projectDTO = projectService.get(project); UserInstanceDTO userInstance = exploratoryDAO.fetchRunningExploratoryFields(user.getName(), project, exploratoryName); @@ -147,7 +147,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService { @Audit(action = TERMINATE, type = IMAGE) @Override - public void terminateImage(@User UserInfo user, @Project String project, String endpoint, String imageName) { + public void terminateImage(@User UserInfo user, @Project String project, String endpoint, @ResourceName String imageName) { Optional<ImageInfoRecord> image = imageExploratoryDao.getImage(user.getName(), imageName, project, endpoint); if (image.isPresent()) { ImageInfoRecord imageInfoRecord = image.get(); diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java index 0bbdc4277..bc5026641 100644 --- a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java +++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java @@ -56,7 +56,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; public class ImageExploratoryResourceTest extends TestBase { - private final static String AUDIT_MESSAGE = "Create image: %s"; private static final String PROJECT = "projectName"; private ImageExploratoryService imageExploratoryService = mock(ImageExploratoryService.class); private RequestId requestId = mock(RequestId.class); @@ -72,7 +71,7 @@ public class ImageExploratoryResourceTest extends TestBase { @Test public void createImage() { - when(imageExploratoryService.createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString(), anyString())) + when(imageExploratoryService.createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString())) .thenReturn("someUuid"); when(requestId.put(anyString(), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() @@ -85,7 +84,7 @@ public class ImageExploratoryResourceTest extends TestBase { assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); verify(imageExploratoryService).createImage(getUserInfo(), PROJECT, "someNotebookName", - "someImageName", "someDescription", String.format(AUDIT_MESSAGE, "someImageName")); + "someImageName", "someDescription"); verify(requestId).put(USER.toLowerCase(), "someUuid"); verifyNoMoreInteractions(imageExploratoryService, requestId); } @@ -93,7 +92,7 @@ public class ImageExploratoryResourceTest extends TestBase { @Test public void createImageWithFailedAuth() throws AuthenticationException { authFailSetup(); - when(imageExploratoryService.createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString(), anyString())) + when(imageExploratoryService.createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString())) .thenReturn("someUuid"); when(requestId.put(anyString(), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() @@ -105,7 +104,7 @@ public class ImageExploratoryResourceTest extends TestBase { assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(imageExploratoryService).createImage(getUserInfo(), PROJECT, "someNotebookName", "someImageName", "someDescription", String.format(AUDIT_MESSAGE, "someImageName")); + verify(imageExploratoryService).createImage(getUserInfo(), PROJECT, "someNotebookName", "someImageName", "someDescription"); verify(requestId).put(USER.toLowerCase(), "someUuid"); verifyNoMoreInteractions(imageExploratoryService, requestId); @@ -114,7 +113,7 @@ public class ImageExploratoryResourceTest extends TestBase { @Test public void createImageWithException() { doThrow(new ResourceAlreadyExistException("Image with name is already exist")) - .when(imageExploratoryService).createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString(), anyString()); + .when(imageExploratoryService).createImage(any(UserInfo.class), anyString(), anyString(), anyString(), anyString()); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment/image") .request() @@ -124,7 +123,7 @@ public class ImageExploratoryResourceTest extends TestBase { assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(imageExploratoryService).createImage(getUserInfo(), PROJECT, "someNotebookName", "someImageName", "someDescription", String.format(AUDIT_MESSAGE, "someImageName")); + verify(imageExploratoryService).createImage(getUserInfo(), PROJECT, "someNotebookName", "someImageName", "someDescription"); verifyNoMoreInteractions(imageExploratoryService); verifyZeroInteractions(requestId); } diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java index 39bbf2afa..f554ee1ca 100644 --- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java @@ -73,7 +73,6 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ImageExploratoryServiceImplTest { - private final static String AUDIT_MESSAGE = "Image name: %s"; private final String USER = "test"; private final String TOKEN = "token"; private final String EXPLORATORY_NAME = "expName"; @@ -132,7 +131,7 @@ public class ImageExploratoryServiceImplTest { String imageName = "someImageName", imageDescription = "someDescription"; String actualUuid = imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, - imageName, imageDescription, String.format(AUDIT_MESSAGE, imageName)); + imageName, imageDescription); assertNotNull(actualUuid); assertEquals(expectedUuid, actualUuid); @@ -156,7 +155,7 @@ public class ImageExploratoryServiceImplTest { String imageName = "someImageName", imageDescription = "someDescription"; try { - imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription, String.format(AUDIT_MESSAGE, imageName)); + imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription); } catch (DatalabException e) { assertEquals("Running exploratory instance for user with name not found.", e.getMessage()); } @@ -173,7 +172,7 @@ public class ImageExploratoryServiceImplTest { expectedException.expectMessage("Image with name someImageName is already exist"); String imageName = "someImageName", imageDescription = "someDescription"; - imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription, String.format(AUDIT_MESSAGE, imageName)); + imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription); } @Test @@ -192,7 +191,7 @@ public class ImageExploratoryServiceImplTest { String imageName = "someImageName", imageDescription = "someDescription"; try { - imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription, String.format(AUDIT_MESSAGE, imageName)); + imageExploratoryService.createImage(userInfo, PROJECT, EXPLORATORY_NAME, imageName, imageDescription); } catch (DatalabException e) { assertEquals("Cannot create instance of resource class", e.getMessage()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
