This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 145e8218e1385c04f7f3cad0a2dd4839c4206a55
Merge: 93dd033 53d5ae6
Author: bhliva <bohdan_hl...@epam.com>
AuthorDate: Mon Sep 16 13:41:12 2019 +0300
DLAB-927 fixed merge conflicts
.../files/gcp/tensor-rstudio_description.json | 4 +-
.../epam/dlab/dto/base/project/ProjectResult.java | 2 +
.../java/com/epam/dlab/dto/status/EnvResource.java | 9 ++-
.../com/epam/dlab/rest/client/RESTService.java | 12 ++--
.../epam/dlab/rest/client/RESTServiceFactory.java | 47 +++++++------
.../dlab/rest/contracts/InfrasctructureAPI.java | 2 +-
.../epam/dlab/backendapi/core/DockerWarmuper.java | 2 +-
.../response/handlers/ProjectCallbackHandler.java | 5 +-
.../service/impl/ProjectServiceImpl.java | 14 ++--
.../epam/dlab/backendapi/dao/EndpointDAOImpl.java | 4 +-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 37 ++++++-----
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 3 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 10 +--
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 42 ++++++++----
.../dlab/backendapi/domain/CreateProjectDTO.java | 21 ++++++
.../epam/dlab/backendapi/domain/EndpointDTO.java | 3 +
.../dlab/backendapi/domain/EnvStatusListener.java | 25 +++----
.../backendapi/domain/ExploratoryLibCache.java | 15 +++--
.../epam/dlab/backendapi/domain/ProjectDTO.java | 7 +-
.../dlab/backendapi/domain/ProjectEndpointDTO.java | 12 ++++
.../resources/InfrastructureTemplateResource.java | 14 ++--
.../dlab/backendapi/resources/ProjectResource.java | 35 +++++-----
.../resources/callback/ProjectCallback.java | 11 ++--
.../resources/dto/ProjectActionFormDTO.java | 2 +
.../resources/dto/ProjectInfrastructureInfo.java | 2 +-
.../backendapi/service/ExploratoryService.java | 3 +-
.../dlab/backendapi/service/GuacamoleService.java | 2 +-
.../service/InfrastructureTemplateService.java | 4 +-
.../dlab/backendapi/service/ProjectService.java | 8 +--
.../service/impl/ComputationalServiceImpl.java | 36 ++++++----
.../service/impl/EnvironmentServiceImpl.java | 20 +++---
.../service/impl/ExploratoryServiceImpl.java | 27 +++++---
.../service/impl/GitCredentialServiceImpl.java | 6 +-
.../service/impl/GuacamoleServiceImpl.java | 11 +++-
.../impl/InfrastructureInfoServiceBase.java | 15 +++--
.../impl/InfrastructureTemplateServiceBase.java | 16 +++--
.../service/impl/LibraryServiceImpl.java | 14 ++--
.../service/impl/ProjectServiceImpl.java | 70 ++++++++++++--------
.../servlet/guacamole/GuacamoleServlet.java | 16 ++++-
.../epam/dlab/backendapi/util/RequestBuilder.java | 4 +-
.../project-list/project-list.component.html | 76 +++++++++++++---------
.../project-list/project-list.component.scss | 6 ++
.../project/project-list/project-list.component.ts | 13 ++--
.../administration/project/project.component.ts | 19 ++++--
.../resources/webapp/src/app/app.routing.module.ts | 2 +-
.../src/app/core/services/userResource.service.ts | 8 +--
.../resources/webapp/src/app/core/util/patterns.ts | 2 +-
...mputational-resource-create-dialog.component.ts | 6 +-
.../create-environment.component.html | 4 +-
.../create-environment.component.ts | 11 +++-
.../resources-grid/resources-grid.component.html | 2 +-
.../resources-grid/resources-grid.model.ts | 18 ++---
.../src/app/webterminal/webterminal.component.ts | 8 ++-
.../InfrastructureTemplateResourceTest.java | 36 +++++-----
.../service/impl/ComputationalServiceImplTest.java | 35 ++++++++--
.../service/impl/ExploratoryServiceImplTest.java | 24 +++++--
.../service/impl/GitCredentialServiceImplTest.java | 12 +++-
.../InfrastructureTemplateServiceBaseTest.java | 41 ++++++++----
.../service/impl/LibraryServiceImplTest.java | 24 +++++--
59 files changed, 608 insertions(+), 331 deletions(-)
diff --cc
infrastructure-provisioning/src/general/files/gcp/tensor-rstudio_description.json
index 0b0539e,0b0539e..c891756
---
a/infrastructure-provisioning/src/general/files/gcp/tensor-rstudio_description.json
+++
b/infrastructure-provisioning/src/general/files/gcp/tensor-rstudio_description.json
@@@ -1,4 -1,4 +1,3 @@@
--/*
{
"exploratory_environment_shapes": {
"GPU optimized": [
@@@ -34,5 -34,5 +33,4 @@@
"vendor": "GCP"
}
]
--}
--*/
++}
diff --cc
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java
index 2fe573c,7f890d4..688edb8
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java
@@@ -16,11 -17,12 +16,12 @@@ public class ProjectCallbackHandler ext
private final String callbackUri;
private final String projectName;
private final Class<? extends EdgeInfo> clazz;
+ private final String endpointName;
- public ProjectCallbackHandler(SystemUserInfoService
systemUserInfoService, RESTService selfService, String user,
+ public ProjectCallbackHandler(RESTService selfService, String user,
String uuid,
DockerAction action, String callbackUri, String projectName,
- Class<?
extends EdgeInfo> clazz) {
+ Class<?
extends EdgeInfo> clazz, String endpointName) {
- super(systemUserInfoService, selfService, user, uuid, action);
+ super(selfService, user, uuid, action);
this.callbackUri = callbackUri;
this.projectName = projectName;
this.clazz = clazz;
diff --cc
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 174f119,956a4f5..47c4dee
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@@ -60,8 -65,8 +62,8 @@@ public class ProjectServiceImpl impleme
folderListenerExecutor.start(configuration.getKeyLoaderDirectory(),
configuration.getKeyLoaderPollTimeout(),
- new
ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(),
uuid,
+ new ProjectCallbackHandler(selfService,
userInfo.getName(), uuid,
- action, CALLBACK_URI,
projectName, getEdgeClass()));
+ action, CALLBACK_URI,
projectName, getEdgeClass(), endpoint));
RunDockerCommand runDockerCommand = new RunDockerCommand()
.withInteractive()
diff --cc
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EnvStatusListener.java
index 2064fb5,64e8a18..ab1f9a8
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EnvStatusListener.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EnvStatusListener.java
@@@ -21,8 -21,9 +21,9 @@@
package com.epam.dlab.backendapi.domain;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration;
+import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.EnvDAO;
+ import com.epam.dlab.backendapi.service.EndpointService;
import com.epam.dlab.backendapi.util.RequestBuilder;
import com.epam.dlab.constants.ServiceConsts;
import com.epam.dlab.dto.UserEnvironmentResources;
diff --cc
services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java
index e8d1e9b,e5e9f93..59c31da
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java
@@@ -1,7 -1,7 +1,6 @@@
package com.epam.dlab.backendapi.resources.callback;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.dao.ProjectDAO;
- import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.backendapi.service.ExploratoryService;
import com.epam.dlab.dto.UserInstanceStatus;
diff --cc
services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
index f6b992f,2344432..8d3f7f6
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
@@@ -1,7 -1,8 +1,8 @@@
package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration;
+import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
+ import com.epam.dlab.backendapi.service.EndpointService;
import com.epam.dlab.backendapi.service.GuacamoleService;
import com.epam.dlab.constants.ServiceConsts;
import com.epam.dlab.exceptions.DlabException;
diff --cc
services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java
index 81813f2,376b458..f7606b6
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java
@@@ -20,9 -20,10 +20,10 @@@
package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration;
+import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.ComputationalDAO;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
+ import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO;
import
com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
