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/05 13:22:37 UTC
[incubator-dlab] 02/04: DLAB-837 added project name parameter to
lib list action
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7bf362375f24314e50892c3545dc098617272941
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Jul 5 14:30:25 2019 +0300
DLAB-837 added project name parameter to lib list action
---
.../main/java/com/epam/dlab/backendapi/util/RequestBuilder.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 1d1aa12..7694160 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
@@ -308,6 +308,7 @@ public class RequestBuilder {
return newResourceSysBaseDTO(userInfo, ExploratoryGitCredsUpdateDTO.class)
.withNotebookImage(instanceDTO.getImageName())
.withApplicationName(getApplicationNameFromImage(instanceDTO.getImageName()))
+ .withProject(instanceDTO.getProject())
.withNotebookInstanceName(instanceDTO.getExploratoryId())
.withExploratoryName(instanceDTO.getExploratoryName())
.withGitCreds(exploratoryGitCredsDTO.getGitCreds());
@@ -321,6 +322,7 @@ public class RequestBuilder {
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withNotebookInstanceName(userInstance.getExploratoryId())
.withExploratoryName(userInstance.getExploratoryName())
+ .withProject(userInstance.getProject())
.withLibs(libs);
}
@@ -330,6 +332,7 @@ public class RequestBuilder {
checkInappropriateCloudProviderOrElseThrowException();
return (T) newResourceSysBaseDTO(userInfo, ExploratoryActionDTO.class)
.withNotebookInstanceName(userInstance.getExploratoryId())
+ .withProject(userInstance.getProject())
.withNotebookImage(userInstance.getImageName())
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withExploratoryName(userInstance.getExploratoryName());
@@ -344,6 +347,7 @@ public class RequestBuilder {
.withComputationalId(computationalResource.getComputationalId())
.withComputationalName(computationalResource.getComputationalName())
.withExploratoryName(userInstance.getExploratoryName())
+ .withProject(userInstance.getProject())
.withComputationalImage(computationalResource.getImageName())
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withLibs(libs);
@@ -358,6 +362,7 @@ public class RequestBuilder {
checkInappropriateCloudProviderOrElseThrowException();
return (T) newResourceSysBaseDTO(userInfo, LibListComputationalDTO.class)
.withComputationalId(computationalResource.getComputationalId())
+ .withProject(userInstance.getProject())
.withComputationalImage(computationalResource.getImageName())
.withLibCacheKey(ExploratoryLibCache.libraryCacheKey(userInstance))
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()));
@@ -463,7 +468,8 @@ public class RequestBuilder {
String exploratoryId,
String computationalName,
String computationalId,
- DataEngineType dataEngineType, String project) {
+ DataEngineType dataEngineType,
+ String project) {
T computationalTerminate;
switch (cloudProvider()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org