You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/12/03 13:57:28 UTC

[incubator-datalab] 01/05: Merge remote-tracking branch 'origin/develop' into develop

This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch develop_odahu_UI
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit ca3e6be8dcd20ed90a3f140b8208ae554a98b34f
Merge: 66a0f79 f3459e4
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Nov 30 17:57:32 2020 +0200

    Merge remote-tracking branch 'origin/develop' into develop

 .../src/general/files/aws/base_Dockerfile          |   2 +-
 .../src/general/files/azure/base_Dockerfile        |   2 +-
 .../src/general/files/gcp/base_Dockerfile          |   2 +-
 .../src/general/lib/aws/actions_lib.py             |  15 ++
 .../src/general/scripts/aws/odahu_deploy.py        | 293 +++++++++++++++++++++
 .../src/general/scripts/aws/odahu_prepare.py       | 158 +++++++++++
 .../src/ssn/scripts/configure_docker.py            |  38 ++-
 .../com/epam/datalab/dto/base/DataEngineType.java  |   5 +-
 .../epam/datalab/dto/base/odahu/OdahuResult.java}  |  32 ++-
 .../epam/datalab/dto/odahu/ActionOdahuDTO.java}    |  47 ++--
 .../epam/datalab/dto/odahu/CreateOdahuDTO.java}    |  28 +-
 .../java/com/epam/datalab/model/ResourceEnum.java  |   3 +-
 .../java/com/epam/datalab/cloud/CloudProvider.java |   2 +-
 .../backendapi/ProvisioningServiceApplication.java |   2 +
 .../core/commands/CommandExecutorMockAsync.java    |   2 +-
 .../response/handlers/OdahuCallbackHandler.java    |  94 +++++++
 .../handlers/ResourcesStatusCallbackHandler.java   |   2 +-
 .../backendapi/modules/ProductionModule.java       |   3 +
 .../backendapi/modules/ProvisioningDevModule.java  |   3 +
 .../backendapi/resources/OdahuResource.java}       |  47 ++--
 .../datalab/backendapi/service/OdahuService.java}  |  18 +-
 .../backendapi/service/impl/OdahuServiceImpl.java  | 115 ++++++++
 .../datalab/backendapi/SelfServiceApplication.java |  24 +-
 .../dao/{UserRoleDAO.java => OdahuDAO.java}        |  33 +--
 .../epam/datalab/backendapi/dao/OdahuDAOImpl.java  | 167 ++++++++++++
 .../epam/datalab/backendapi/dao/UserRoleDAO.java   |  10 +-
 .../datalab/backendapi/dao/UserRoleDAOImpl.java    |  26 +-
 .../OdahuActionDTO.java}                           |  22 +-
 .../OdahuCreateDTO.java}                           |  25 +-
 .../dto/UserGroupDto.java => domain/OdahuDTO.java} |  30 ++-
 .../OdahuFieldsDTO.java}                           |  26 +-
 .../epam/datalab/backendapi/domain/ProjectDTO.java |   3 +-
 .../dropwizard/listeners/MongoStartupListener.java |  25 +-
 .../epam/datalab/backendapi/modules/DevModule.java |  32 ++-
 .../backendapi/modules/ProductionModule.java       |  40 +--
 .../backendapi/resources/OdahuResource.java        |  97 +++++++
 .../backendapi/resources/UserRoleResource.java     |   4 +-
 .../resources/callback/OdahuCallback.java          |  59 +++++
 .../resources/dto/ProjectInfrastructureInfo.java   |  27 +-
 .../backendapi/resources/dto/UserGroupDto.java     |   2 +-
 .../dto/{UserRoleDto.java => UserRoleDTO.java}     |   4 +-
 .../CheckInfrastructureStatusScheduler.java        | 207 ++++++++-------
 .../{UserRoleService.java => OdahuService.java}    |  25 +-
 .../backendapi/service/UserRoleService.java        |   8 +-
 .../backendapi/service/UserRoleServiceImpl.java    |   8 +-
 .../service/impl/EndpointServiceImpl.java          |  21 +-
 .../service/impl/EnvironmentServiceImpl.java       | 100 ++++---
 .../impl/InfrastructureInfoServiceImpl.java        |  13 +-
 .../backendapi/service/impl/OdahuServiceImpl.java  | 203 ++++++++++++++
 .../service/impl/ProjectServiceImpl.java           |  19 +-
 .../service/impl/UserGroupServiceImpl.java         |   6 +-
 .../datalab/backendapi/util/RequestBuilder.java    |  31 +++
 .../src/main/resources/mongo/aws/mongo_roles.json  |  98 -------
 .../main/resources/mongo/azure/mongo_roles.json    |  98 -------
 .../src/main/resources/mongo/gcp/mongo_roles.json  |  98 -------
 .../main/resources/mongo/general/mongo_roles.json  | 100 +++++++
 .../management-grid/management-grid.component.html |   6 +-
 .../management-grid/management-grid.component.ts   |  57 ++--
 .../backendapi/resources/UserRoleResourceTest.java |   8 +-
 .../backendapi/service/ProjectServiceImplTest.java | 202 ++++++++------
 .../service/UserRoleServiceImplTest.java           |   6 +-
 .../service/impl/EndpointServiceImplTest.java      |  93 ++++---
 .../impl/InfrastructureInfoServiceImplTest.java    |  52 ++--
 .../service/impl/OdahuServiceImplTest.java         | 250 ++++++++++++++++++
 64 files changed, 2387 insertions(+), 891 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org