You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/24 09:08:04 UTC
[incubator-dlab] branch DLAB-terraform updated (be5243a -> f2512dd)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from be5243a Merge remote-tracking branch 'origin/DLAB-terraform' into DLAB-terraform
add ef59961 [DLAB-1099]: Added a check while deleting a group; Delete group record from Project while deleting group
add 0d2ce0d Code review
add 5aed71f Code review
add e22a5f1 Merge pull request #304 from ofuks/DLAB-1099
add 334d74f Fixed name of GCP dataproc. Hotfix for ssn creation on other clouds.
add 2427b6d Update ssn_lib.py
add efee5fc Update ssn_lib.py
add 8cdbc20 Merge pull request #306 from apache/fix_dataproc_2
add b663f2b DLAB-000 enabling CORS for dev mode
add dcd838a Fix develop.
add fba1e54 Fix develop2.
add 91232cf Merge pull request #307 from apache/fix-develop
add e469a02 DLAB-1088 fixed bug connected with computational scheduler
add 9052d5e [DLAB-1055] Removed tunnel links from UI
add e3fddc6 Merge pull request #311 from apache/DLAB-1055
add 22f2c6a Fixed spark-cluster creation for GCP.
add eb0f287 Merge pull request #312 from apache/fix_spark
add 25aaa99 [DLAB-997] Added user tag to role creation on AWS
add a8d2f09 [DLAB-997] bugfix
add b4bfca3 Merge pull request #313 from apache/DLAB-997
add 222d2ce [DLAB-1078]: Added endpoint to generate key pairs
add 6c26043 Code review
add cc6ecf9 Merge pull request #309 from ofuks/DLAB-1078
add 3f36c59 [DLAB-1110]: Added possibility to turn on/off of using shared image in project
add a47482e Merge pull request #315 from ofuks/DLAB-1110
add 625f2c5 DLAB-000 added new parameter for generate key endpoint
add 76f6d53 [DLAB-1054]: Added possibility to retrieve custom images per endpoint
add 123e37d Merge pull request #317 from ofuks/DLAB-1054-fix
add 68833d4 [DLAB-1062] Fixed issue with image names
add f85fcee [DLAB-1062] Refactoring
add e56bf76 Merge pull request #318 from apache/DLAB-1062
new f2512dd Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/lib/aws/actions_lib.py | 72 +++++++++++----------
.../src/general/lib/gcp/actions_lib.py | 6 +-
.../scripts/aws/common_create_role_policy.py | 4 +-
.../general/scripts/aws/deeplearning_configure.py | 14 ++--
.../src/general/scripts/aws/jupyter_configure.py | 10 +--
.../src/general/scripts/aws/project_prepare.py | 10 +--
.../src/general/scripts/aws/rstudio_configure.py | 10 +--
.../src/general/scripts/aws/ssn_prepare.py | 5 +-
.../scripts/aws/tensor-rstudio_configure.py | 14 ++--
.../src/general/scripts/aws/tensor_configure.py | 14 ++--
.../src/general/scripts/aws/zeppelin_configure.py | 14 ++--
.../scripts/azure/common_prepare_notebook.py | 8 ++-
.../scripts/azure/deeplearning_configure.py | 14 ++--
.../src/general/scripts/azure/jupyter_configure.py | 10 +--
.../src/general/scripts/azure/rstudio_configure.py | 10 +--
.../src/general/scripts/azure/tensor_configure.py | 14 ++--
.../general/scripts/azure/zeppelin_configure.py | 10 +--
.../general/scripts/gcp/deeplearning_configure.py | 14 ++--
.../src/general/scripts/gcp/jupyter_configure.py | 10 +--
.../src/general/scripts/gcp/rstudio_configure.py | 10 +--
.../scripts/gcp/tensor-rstudio_configure.py | 14 ++--
.../src/general/scripts/gcp/tensor_configure.py | 14 ++--
.../src/general/scripts/gcp/zeppelin_configure.py | 10 +--
.../epam/dlab/dto/project/ProjectCreateDTO.java | 1 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 13 ++--
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 3 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 12 ++--
.../epam/dlab/backendapi/domain/ProjectDTO.java | 1 +
.../epam/dlab/backendapi/modules/DevModule.java | 20 ++++++
.../resources/ImageExploratoryResource.java | 6 +-
.../dlab/backendapi/resources/ProjectResource.java | 20 +++++-
.../backendapi/resources/UserGroupResource.java | 1 +
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../dlab/backendapi/resources/dto/KeysDTO.java | 12 ++++
.../dlab/backendapi/service/AccessKeyService.java | 18 +-----
.../service/ImageExploratoryService.java | 2 +-
.../service/impl/AccessKeyServiceImpl.java | 17 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 5 +-
.../service/impl/UserGroupServiceImpl.java | 10 +++
.../epam/dlab/backendapi/util/RequestBuilder.java | 1 +
.../app/administration/roles/roles.component.ts | 3 +-
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../resources/ImageExploratoryResourceTest.java | 12 ++--
.../backendapi/resources/ProjectResourceTest.java | 74 ++++++++++++++++++++++
.../impl/ImageExploratoryServiceImplTest.java | 8 +--
47 files changed, 363 insertions(+), 193 deletions(-)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java
create mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-terraform
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f2512ddd1e1033c7e65db65e69672ce412f31547
Merge: be5243a e56bf76
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 24 12:07:43 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
Conflicts:
infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
services/self-service/src/main/java/com/epam/dlab/backendapi/service/AccessKeyService.java
services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
.../src/general/lib/aws/actions_lib.py | 72 +++++++++++----------
.../src/general/lib/gcp/actions_lib.py | 6 +-
.../scripts/aws/common_create_role_policy.py | 4 +-
.../general/scripts/aws/deeplearning_configure.py | 14 ++--
.../src/general/scripts/aws/jupyter_configure.py | 10 +--
.../src/general/scripts/aws/project_prepare.py | 10 +--
.../src/general/scripts/aws/rstudio_configure.py | 10 +--
.../src/general/scripts/aws/ssn_prepare.py | 5 +-
.../scripts/aws/tensor-rstudio_configure.py | 14 ++--
.../src/general/scripts/aws/tensor_configure.py | 14 ++--
.../src/general/scripts/aws/zeppelin_configure.py | 14 ++--
.../scripts/azure/common_prepare_notebook.py | 8 ++-
.../scripts/azure/deeplearning_configure.py | 14 ++--
.../src/general/scripts/azure/jupyter_configure.py | 10 +--
.../src/general/scripts/azure/rstudio_configure.py | 10 +--
.../src/general/scripts/azure/tensor_configure.py | 14 ++--
.../general/scripts/azure/zeppelin_configure.py | 10 +--
.../general/scripts/gcp/deeplearning_configure.py | 14 ++--
.../src/general/scripts/gcp/jupyter_configure.py | 10 +--
.../src/general/scripts/gcp/rstudio_configure.py | 10 +--
.../scripts/gcp/tensor-rstudio_configure.py | 14 ++--
.../src/general/scripts/gcp/tensor_configure.py | 14 ++--
.../src/general/scripts/gcp/zeppelin_configure.py | 10 +--
.../epam/dlab/dto/project/ProjectCreateDTO.java | 1 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 13 ++--
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 3 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 12 ++--
.../epam/dlab/backendapi/domain/ProjectDTO.java | 1 +
.../epam/dlab/backendapi/modules/DevModule.java | 20 ++++++
.../resources/ImageExploratoryResource.java | 6 +-
.../dlab/backendapi/resources/ProjectResource.java | 20 +++++-
.../backendapi/resources/UserGroupResource.java | 1 +
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../dlab/backendapi/resources/dto/KeysDTO.java | 12 ++++
.../dlab/backendapi/service/AccessKeyService.java | 18 +-----
.../service/ImageExploratoryService.java | 2 +-
.../service/impl/AccessKeyServiceImpl.java | 17 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 5 +-
.../service/impl/UserGroupServiceImpl.java | 10 +++
.../epam/dlab/backendapi/util/RequestBuilder.java | 1 +
.../app/administration/roles/roles.component.ts | 3 +-
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../resources/ImageExploratoryResourceTest.java | 12 ++--
.../backendapi/resources/ProjectResourceTest.java | 74 ++++++++++++++++++++++
.../impl/ImageExploratoryServiceImplTest.java | 8 +--
47 files changed, 363 insertions(+), 193 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 1ac4aae,b4aeb43..280b63a
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@@ -207,12 -194,12 +208,13 @@@ if __name__ == "__main__"
try:
logging.info('[CREATE BACKEND (NOTEBOOK) ROLES]')
print('[CREATE BACKEND (NOTEBOOK) ROLES]')
+ user_tag = "{0}:{0}-{1}-nb-de-Role".format(project_conf['service_base_name'], project_conf['project_name'])
params = "--role_name {} --role_profile_name {} --policy_name {} --region {} --infra_tag_name {} " \
- "--infra_tag_value {}" \
+ "--infra_tag_value {} --user_tag_value {}" \
- .format(project_conf['notebook_dataengine_role_name'], project_conf['notebook_dataengine_role_profile_name'],
- project_conf['notebook_dataengine_policy_name'], os.environ['aws_region'], project_conf['tag_name'],
- project_conf['service_base_name'], user_tag)
+ .format(project_conf['notebook_dataengine_role_name'],
+ project_conf['notebook_dataengine_role_profile_name'],
+ project_conf['notebook_dataengine_policy_name'], os.environ['aws_region'],
- project_conf['tag_name'], project_conf['service_base_name'])
++ project_conf['tag_name'], project_conf['service_base_name'], user_tag)
try:
local("~/scripts/{}.py {}".format('common_create_role_policy', params))
except:
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
index 0a2216a,2a4a3da..4a22907
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
@@@ -14,7 -14,9 +14,10 @@@ public interface ProjectDAO
List<ProjectDTO> getProjectsWithStatus(ProjectDTO.Status status);
+ List<ProjectDTO> getProjectsWithStatusNotIn(ProjectDTO.Status... statuses);
+
+ List<ProjectDTO> getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status);
+ List<ProjectDTO> getUserProjects(UserInfo userInfo);
void create(ProjectDTO projectDTO);
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
index bc9db38,03e1981..6e9ea11
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
@@@ -47,9 -44,15 +45,15 @@@ public class ProjectDAOImpl extends Bas
}
@Override
+ public List<ProjectDTO> getProjectsWithStatusNotIn(ProjectDTO.Status... statuses) {
+ List<String> statusList = Arrays.stream(statuses).map(ProjectDTO.Status::toString).collect(Collectors.toList());
+ return find(PROJECTS_COLLECTION, not(in(STATUS_FIELD, statusList)), ProjectDTO.class);
+ }
+
+ @Override
- public List<ProjectDTO> getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status) {
+ public List<ProjectDTO> getUserProjects(UserInfo userInfo) {
return find(PROJECTS_COLLECTION, and(in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()),
- userInfo.getRoles())), eq(STATUS_FIELD, status.toString())), ProjectDTO.class);
+ userInfo.getRoles()))), ProjectDTO.class);
}
@Override
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
index 5d48c69,88b8ea2..79d8b73
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
@@@ -22,7 -24,9 +22,8 @@@ public class ProjectDTO
@NotNull
private final String tag;
private final Integer budget;
- private final Status status = Status.CREATING;
- private EdgeInfo edgeInfo;
+ private final List<ProjectEndpointDTO> endpoints;
+ private boolean useSharedImage;
public enum Status {
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
index c6eebb9,02117ab..cb522fb
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
@@@ -35,13 -36,15 +35,18 @@@ import com.epam.dlab.rest.contracts.Doc
import com.epam.dlab.rest.dto.ErrorDTO;
import com.google.inject.name.Names;
import io.dropwizard.auth.Authorizer;
+import io.dropwizard.client.JerseyClientBuilder;
import io.dropwizard.setup.Environment;
+import org.glassfish.jersey.logging.LoggingFeature;
+ import org.eclipse.jetty.servlets.CrossOriginFilter;
+import javax.ws.rs.client.Client;
+ import javax.servlet.DispatcherType;
+ import javax.servlet.FilterRegistration;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+ import java.util.EnumSet;
+ import java.util.Optional;
/**
* Mock class for an application configuration of SelfService for developer mode.
@@@ -65,16 -68,11 +70,17 @@@ public class DevModule extends ModuleBa
@Override
protected void configure() {
+ configureCors(environment);
+ final Client httpClient =
+ new JerseyClientBuilder(environment)
+ .using(configuration.getJerseyClientConfiguration())
+ .build("httpClient")
+ .register(new LoggingFeature());
+ bind(SecurityService.class).to(SecurityServiceImpl.class);
+ bind(KeycloakService.class).to(KeycloakServiceImpl.class);
+ bind(Client.class).toInstance(httpClient);
bind(SelfServiceApplicationConfiguration.class).toInstance(configuration);
bind(MongoService.class).toInstance(configuration.getMongoFactory().build(environment));
- bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.SECURITY_SERVICE_NAME))
- .toInstance(createAuthenticationService());
bind(RESTService.class).annotatedWith(Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME))
.toInstance(configuration.getProvisioningFactory()
.build(environment, ServiceConsts.PROVISIONING_SERVICE_NAME));
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index 59251c6,4f6780e..1242203
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@@ -1,10 -1,12 +1,11 @@@
package com.epam.dlab.backendapi.resources;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.domain.ProjectDTO;
-import com.epam.dlab.backendapi.domain.UpdateProjectBudgetDTO;
-import com.epam.dlab.backendapi.domain.UpdateProjectDTO;
+import com.epam.dlab.backendapi.domain.*;
import com.epam.dlab.backendapi.resources.dto.ProjectActionFormDTO;
+ import com.epam.dlab.backendapi.service.AccessKeyService;
import com.epam.dlab.backendapi.service.ProjectService;
+import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.rest.dto.ErrorDTO;
import com.google.inject.Inject;
import io.dropwizard.auth.Auth;
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index 3990331,3a1e8f9..b041a19
--- 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
@@@ -623,7 -636,8 +623,8 @@@ public class RequestBuilder
.key(projectDTO.getKey())
.name(projectDTO.getName())
.tag(projectDTO.getTag())
- .endpoint(projectDTO.getEndpoints().iterator().next()) //TODO figure out how to deal with endpoints
+ .endpoint(endpoint)
+ .useSharedImage(projectDTO.isUseSharedImage())
.build()
.withCloudSettings(cloudSettings(userInfo));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org