You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/07/25 16:08:13 UTC
[incubator-datalab] 01/01: change image status from created to active
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2939
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 993dda8e70fb599b35d58b48dd333e72e3b6b0c0
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Mon Jul 25 19:07:46 2022 +0300
change image status from created to active
---
.../java/com/epam/datalab/dto/exploratory/ImageStatus.java | 2 +-
.../backendapi/service/impl/ImageExploratoryServiceImpl.java | 11 ++++-------
.../backendapi/resources/ImageExploratoryResourceTest.java | 3 +--
.../backendapi/service/impl/BillingServiceImplTest.java | 3 +--
.../service/impl/ImageExploratoryServiceImplTest.java | 5 ++---
5 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/exploratory/ImageStatus.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/exploratory/ImageStatus.java
index 90e3edfc0..fb2133aaf 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/exploratory/ImageStatus.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/exploratory/ImageStatus.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
public enum ImageStatus {
CREATING,
- CREATED,
+ ACTIVE,
FAILED;
@JsonCreator
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 b49dccf42..820cb28f0 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
@@ -38,7 +38,6 @@ import com.epam.datalab.backendapi.service.EndpointService;
import com.epam.datalab.backendapi.service.ImageExploratoryService;
import com.epam.datalab.backendapi.service.ProjectService;
import com.epam.datalab.backendapi.util.RequestBuilder;
-import com.epam.datalab.cloud.CloudProvider;
import com.epam.datalab.constants.ServiceConsts;
import com.epam.datalab.dto.UserInstanceDTO;
import com.epam.datalab.dto.UserInstanceStatus;
@@ -62,11 +61,9 @@ import org.apache.commons.collections4.CollectionUtils;
import java.io.IOException;
import java.io.InputStream;
-import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import static com.epam.datalab.backendapi.domain.AuditActionEnum.CREATE;
import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.IMAGE;
@@ -172,7 +169,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService {
@Override
public List<ImageInfoRecord> getNotFailedImages(UserInfo user, String dockerImage, String project, String endpoint) {
- List<ImageInfoRecord> images = imageExploratoryDao.getImages(user.getName(), dockerImage, project, endpoint, ImageStatus.CREATED, ImageStatus.CREATING);
+ List<ImageInfoRecord> images = imageExploratoryDao.getImages(user.getName(), dockerImage, project, endpoint, ImageStatus.ACTIVE, ImageStatus.CREATING);
images.addAll(getSharedImages(user,dockerImage,project,endpoint));
return images;
}
@@ -286,7 +283,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService {
public List<ImageInfoRecord> getSharedImages(UserInfo userInfo, String dockerImage, String project, String endpoint) {
List<ImageInfoRecord> sharedImages = imageExploratoryDao.getAllImages().stream()
- .filter(img -> img.getStatus().equals(ImageStatus.CREATED))
+ .filter(img -> img.getStatus().equals(ImageStatus.ACTIVE))
.filter(img -> !img.getUser().equals(userInfo.getName()))
.filter(img -> img.getDockerImage().equals(dockerImage) && img.getProject().equals(project) && img.getEndpoint().equals(endpoint))
.filter(img -> UserRoles.checkAccess(userInfo, RoleType.IMAGE,
@@ -300,7 +297,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService {
public List<ImageInfoRecord> getSharedImages(UserInfo userInfo, String project){
List<ImageInfoRecord> sharedImages = imageExploratoryDao.getAllImages().stream()
- .filter(img -> img.getStatus().equals(ImageStatus.CREATED))
+ .filter(img -> img.getStatus().equals(ImageStatus.ACTIVE))
.filter(img -> !img.getUser().equals(userInfo.getName()))
.filter(img -> img.getProject().equals(project) )
.filter(img -> UserRoles.checkAccess(userInfo, RoleType.IMAGE,
@@ -328,7 +325,7 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService {
}
private void createImageRole(Image image, String exploratoryName){
- if (image.getStatus().equals(ImageStatus.CREATED)){
+ if (image.getStatus().equals(ImageStatus.ACTIVE)){
List<UserRoleDTO> imageRoles = getUserImageRoleFromFile();
imageRoles.stream().forEach(role -> {
role.setId(String.format(role.getId(), image.getProject(), image.getEndpoint(), exploratoryName ,image.getName()));
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 0e84737f6..7604019d4 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
@@ -40,7 +40,6 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -290,7 +289,7 @@ public class ImageExploratoryResourceTest extends TestBase {
CloudProvider.AWS,
"someDockerImage",
"someFullName",
- ImageStatus.CREATED,
+ ImageStatus.ACTIVE,
null,
null,
null,
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
index 67aaf5f46..bf09c7488 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
@@ -56,7 +56,6 @@ import org.mockito.runners.MockitoJUnitRunner;
import javax.ws.rs.core.GenericType;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.*;
import static org.junit.Assert.assertEquals;
@@ -753,7 +752,7 @@ public class BillingServiceImplTest extends TestBase {
CloudProvider.GENERAL,
"dockerImage",
IMAGE_FULL_NAME,
- ImageStatus.CREATED,
+ ImageStatus.ACTIVE,
null,
null,
null,
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 c5320ffbe..26844ad66 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
@@ -52,7 +52,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -272,7 +271,7 @@ public class ImageExploratoryServiceImplTest {
assertEquals(1, actualRecordList.size());
assertEquals(expectedRecordList, actualRecordList);
- verify(imageExploratoryDao).getImages(USER, "someImage", "someProject", "someEndpoint", ImageStatus.CREATED, ImageStatus.CREATING);
+ verify(imageExploratoryDao).getImages(USER, "someImage", "someProject", "someEndpoint", ImageStatus.ACTIVE, ImageStatus.CREATING);
//verifyNoMoreInteractions(imageExploratoryDao);
}
@@ -322,7 +321,7 @@ public class ImageExploratoryServiceImplTest {
CloudProvider.GENERAL,
"someDockerImage",
"someFullName",
- ImageStatus.CREATED,
+ ImageStatus.ACTIVE,
null,
null,
null,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org