You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/19 13:36:55 UTC
[incubator-dlab] branch develop updated: DLAB-918 fixed bug
connected with user projects + added tags for action create for
computational resources
This is an automated email from the ASF dual-hosted git repository.
bhliva 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 4ed1fa1 DLAB-918 fixed bug connected with user projects + added tags for action create for computational resources
4ed1fa1 is described below
commit 4ed1fa1a40cc94dd584a057ac8e0ed34e4dddd36
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Jul 19 16:36:12 2019 +0300
DLAB-918 fixed bug connected with user projects + added tags for action create for computational resources
---
.../epam/dlab/dto/base/computational/ComputationalBase.java | 10 ++++++++++
.../epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 2 ++
.../java/com/epam/dlab/backendapi/util/RequestBuilder.java | 6 ++++--
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java
index f33e0ec..21daa43 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java
@@ -23,6 +23,8 @@ import com.epam.dlab.dto.ResourceEnvBaseDTO;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects.ToStringHelper;
+import java.util.Map;
+
public abstract class ComputationalBase<T extends ComputationalBase<?>> extends ResourceEnvBaseDTO<T> {
@SuppressWarnings("unchecked")
private final T self = (T) this;
@@ -39,6 +41,9 @@ public abstract class ComputationalBase<T extends ComputationalBase<?>> extends
@JsonProperty("project_name")
private String project;
+ @JsonProperty("tags")
+ private Map<String, String> tags;
+
public String getComputationalName() {
return computationalName;
}
@@ -83,6 +88,11 @@ public abstract class ComputationalBase<T extends ComputationalBase<?>> extends
return self;
}
+ public T withTags(Map<String, String> tags) {
+ this.tags = tags;
+ return self;
+ }
+
public String getProject() {
return project;
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index c43b9a4..c246582 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -32,6 +32,7 @@ public class ProjectServiceImpl implements ProjectService {
private static final String TERMINATE_PRJ_API = "infrastructure/project/terminate";
private static final String START_PRJ_API = "infrastructure/project/start";
private static final String STOP_PRJ_API = "infrastructure/project/stop";
+ private static final String ANY_USER_ROLE = "$anyuser";
private final ProjectDAO projectDAO;
private final EnvironmentService environmentService;
private final UserGroupDao userGroupDao;
@@ -57,6 +58,7 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public List<ProjectDTO> getUserProjects(UserInfo userInfo) {
+ userInfo.getRoles().add(ANY_USER_ROLE);
return projectDAO.getUserProjectsWithStatus(userInfo, ProjectDTO.Status.ACTIVE);
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index bcfcd5f..f33b758 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -409,7 +409,8 @@ public class RequestBuilder {
.withNotebookTemplateName(userInstance.getTemplateName())
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withNotebookInstanceName(userInstance.getExploratoryId())
- .withProject(userInstance.getProject());
+ .withProject(userInstance.getProject())
+ .withTags(userInstance.getTags());
}
@SuppressWarnings("unchecked")
@@ -459,7 +460,8 @@ public class RequestBuilder {
.withNotebookTemplateName(userInstance.getTemplateName())
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withNotebookInstanceName(userInstance.getExploratoryId())
- .withProject(userInstance.getProject());
+ .withProject(userInstance.getProject())
+ .withTags(userInstance.getTags());
}
@SuppressWarnings("unchecked")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org