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/09/19 13:43:55 UTC
[incubator-datalab] 01/01: rename notebook to instance in audit
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-3014
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 144e14cbd5548232d52304d846b9099e27926cf8
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Mon Sep 19 16:43:13 2022 +0300
rename notebook to instance in audit
---
.../backendapi/domain/AuditResourceTypeEnum.java | 2 +-
.../backendapi/service/impl/EnvironmentServiceImpl.java | 3 ---
.../backendapi/service/impl/ExploratoryServiceImpl.java | 17 ++++++++---------
.../backendapi/service/impl/LibraryServiceImpl.java | 4 ++--
.../service/impl/SchedulerJobServiceImpl.java | 4 ++--
5 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditResourceTypeEnum.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditResourceTypeEnum.java
index 1ca0fdf85..6ac2ef5e6 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditResourceTypeEnum.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditResourceTypeEnum.java
@@ -20,5 +20,5 @@
package com.epam.datalab.backendapi.domain;
public enum AuditResourceTypeEnum {
- PROJECT, EDGE_NODE, NOTEBOOK, COMPUTE, BUCKET, ENDPOINT, GROUP, IMAGE, GIT_ACCOUNT, LOG_IN, WEB_TERMINAL
+ PROJECT, EDGE_NODE, INSTANCE, COMPUTE, BUCKET, ENDPOINT, GROUP, IMAGE, GIT_ACCOUNT, LOG_IN, WEB_TERMINAL
}
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 e7506ca55..27cebe72c 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
@@ -43,13 +43,10 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static com.epam.datalab.backendapi.domain.AuditActionEnum.START;
-import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.NOTEBOOK;
import static com.epam.datalab.backendapi.resources.dto.UserDTO.Status.ACTIVE;
import static com.epam.datalab.backendapi.resources.dto.UserDTO.Status.NOT_ACTIVE;
import static com.epam.datalab.dto.UserInstanceStatus.*;
import static com.epam.datalab.rest.contracts.ComputationalAPI.AUDIT_MESSAGE;
-import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_START;
@Singleton
@Slf4j
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
index 0626df997..d20dfae4f 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -27,7 +27,6 @@ import com.epam.datalab.backendapi.dao.ExploratoryDAO;
import com.epam.datalab.backendapi.dao.GitCredsDAO;
import com.epam.datalab.backendapi.dao.ImageExploratoryDAO;
import com.epam.datalab.backendapi.domain.*;
-import com.epam.datalab.backendapi.resources.dto.ExploratoryCreateFormDTO;
import com.epam.datalab.backendapi.resources.dto.ExploratoryCreatePopUp;
import com.epam.datalab.backendapi.service.*;
import com.epam.datalab.backendapi.util.RequestBuilder;
@@ -53,7 +52,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.epam.datalab.backendapi.domain.AuditActionEnum.*;
-import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.NOTEBOOK;
+import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.INSTANCE;
import static com.epam.datalab.dto.UserInstanceStatus.*;
import static com.epam.datalab.rest.contracts.ExploratoryAPI.*;
@@ -93,26 +92,26 @@ public class ExploratoryServiceImpl implements ExploratoryService {
}
@BudgetLimited
- @Audit(action = START, type = NOTEBOOK)
+ @Audit(action = START, type = INSTANCE)
@Override
public String start(@User UserInfo userInfo, @ResourceName String exploratoryName, @Project String project, @Info String auditInfo) {
return action(userInfo, userInfo.getName(), project, exploratoryName, EXPLORATORY_START, STARTING);
}
- @Audit(action = STOP, type = NOTEBOOK)
+ @Audit(action = STOP, type = INSTANCE)
@Override
public String stop(@User UserInfo userInfo, String resourceCreator, @Project String project, @ResourceName String exploratoryName, @Info String auditInfo) {
return action(userInfo, resourceCreator, project, exploratoryName, EXPLORATORY_STOP, STOPPING);
}
- @Audit(action = TERMINATE, type = NOTEBOOK)
+ @Audit(action = TERMINATE, type = INSTANCE)
@Override
public String terminate(@User UserInfo userInfo, String resourceCreator, @Project String project, @ResourceName String exploratoryName, @Info String auditInfo) {
return action(userInfo, resourceCreator, project, exploratoryName, EXPLORATORY_TERMINATE, TERMINATING);
}
@BudgetLimited
- @Audit(action = CREATE, type = NOTEBOOK)
+ @Audit(action = CREATE, type = INSTANCE)
@Override
public String create(@User UserInfo userInfo, Exploratory exploratory, @Project String project, @ResourceName String exploratoryName) {
boolean isAdded = false;
@@ -171,7 +170,7 @@ public class ExploratoryServiceImpl implements ExploratoryService {
});
}
- @Audit(action = RECONFIGURE, type = NOTEBOOK)
+ @Audit(action = RECONFIGURE, type = INSTANCE)
@Override
public void updateClusterConfig(@User UserInfo userInfo, @Project String project, @ResourceName String exploratoryName, List<ClusterConfig> config) {
final String userName = userInfo.getName();
@@ -247,7 +246,7 @@ public class ExploratoryServiceImpl implements ExploratoryService {
return new ExploratoryCreatePopUp(userProjects, collect);
}
- @Audit(action = UPDATE, type = NOTEBOOK)
+ @Audit(action = UPDATE, type = INSTANCE)
@Override
public void updateAfterStatusCheck(@User UserInfo userInfo, @Project String project, String endpoint, @ResourceName String name,
String instanceID, UserInstanceStatus status, @Info String auditInfo) {
@@ -293,7 +292,7 @@ public class ExploratoryServiceImpl implements ExploratoryService {
}
}
- @Audit(action = TERMINATE, type = NOTEBOOK)
+ @Audit(action = TERMINATE, type = INSTANCE)
public void updateExploratoryComputeStatuses(@User UserInfo userInfo, @Project String project, @ResourceName String exploratoryName, UserInstanceStatus status, String resourceCreator) {
updateExploratoryStatus(resourceCreator, project, exploratoryName, status);
updateComputationalStatuses(userInfo.getName(), resourceCreator, project, exploratoryName, status);
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
index 660740af3..cf64084ff 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
@@ -60,7 +60,7 @@ import java.util.stream.Stream;
import static com.epam.datalab.backendapi.domain.AuditActionEnum.INSTALL_LIBS;
import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.COMPUTE;
-import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.NOTEBOOK;
+import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.INSTANCE;
import static com.epam.datalab.backendapi.domain.NotebookTemplate.*;
import static com.epam.datalab.dto.LibraryGroups.*;
@@ -142,7 +142,7 @@ public class LibraryServiceImpl implements LibraryService {
return uuid;
}
- @Audit(action = INSTALL_LIBS, type = NOTEBOOK)
+ @Audit(action = INSTALL_LIBS, type = INSTANCE)
@Override
public String installExploratoryLibs(@User UserInfo ui, @Project String project, @ResourceName String expName, List<LibInstallDTO> libs, @Info String auditInfo) {
final UserInstanceDTO userInstance = exploratoryDAO.fetchRunningExploratoryFields(ui.getName(), project, expName);
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/SchedulerJobServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/SchedulerJobServiceImpl.java
index 546a0444a..e1caab9db 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/SchedulerJobServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/SchedulerJobServiceImpl.java
@@ -65,7 +65,7 @@ import java.util.stream.Stream;
import static com.epam.datalab.backendapi.domain.AuditActionEnum.SET_UP_SCHEDULER;
import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.COMPUTE;
-import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.NOTEBOOK;
+import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.INSTANCE;
import static com.epam.datalab.constants.ServiceConsts.PROVISIONING_SERVICE_NAME;
import static com.epam.datalab.dto.UserInstanceStatus.CONFIGURING;
import static com.epam.datalab.dto.UserInstanceStatus.CREATING;
@@ -129,7 +129,7 @@ public class SchedulerJobServiceImpl implements SchedulerJobService {
exploratoryName) + " with computational resource " + computationalName));
}
- @Audit(action = SET_UP_SCHEDULER, type = NOTEBOOK)
+ @Audit(action = SET_UP_SCHEDULER, type = INSTANCE)
@Override
public void updateExploratorySchedulerData(@User UserInfo user, @Project String project, @ResourceName String exploratoryName, SchedulerJobDTO dto) {
validateExploratoryStatus(user.getName(), project, exploratoryName);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org