You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2020/11/25 11:16:17 UTC
[incubator-datalab] branch DATALAB-2162 updated (bce0d47 -> 6fbd98a)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2162
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from bce0d47 [DATALAB-2162]: changed dlab to datalab
add 43b7e18 merge odahu (provisioning)
add 9499a58 merge odahu (provisioning)
add 05943f4 merge odahu (self-service)
add 5cea7a1 [DATALAB-2152] -- added cluster instances to scheduler status sync (#989)
add 97ce7b9 Merge remote-tracking branch 'origin/develop' into develop
add 3db6fb1 merge odahu (self-service)
new 6fbd98a [DATALAB-2162]: merged from develop
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:
.../com/epam/datalab/dto/base/DataEngineType.java | 5 +-
.../ProjectResult.java => odahu/OdahuResult.java} | 21 +-
.../ActionOdahuDTO.java} | 21 +-
.../CreateOdahuDTO.java} | 13 +-
.../java/com/epam/datalab/model/ResourceEnum.java | 3 +-
.../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} | 15 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 115 ++++++
.../datalab/backendapi/SelfServiceApplication.java | 24 +-
.../dao/{BackupDAO.java => OdahuDAO.java} | 23 +-
.../epam/datalab/backendapi/dao/OdahuDAOImpl.java | 5 +-
...teProjectBudgetDTO.java => OdahuActionDTO.java} | 13 +-
...teProjectBudgetDTO.java => OdahuCreateDTO.java} | 16 +-
.../{UpdateProjectDTO.java => OdahuDTO.java} | 26 +-
.../{AuditCreateDTO.java => OdahuFieldsDTO.java} | 19 +-
.../epam/datalab/backendapi/domain/ProjectDTO.java | 3 +-
.../epam/datalab/backendapi/modules/DevModule.java | 32 +-
.../backendapi/modules/ProductionModule.java | 40 +-
.../backendapi/resources/OdahuResource.java | 97 +++++
.../{BackupCallback.java => OdahuCallback.java} | 54 +--
.../resources/dto/ProjectInfrastructureInfo.java | 27 +-
.../CheckInfrastructureStatusScheduler.java | 207 +++++-----
.../{BillingService.java => OdahuService.java} | 27 +-
.../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 +-
.../datalab/backendapi/util/RequestBuilder.java | 31 ++
.../src/main/resources/mongo/aws/mongo_roles.json | 3 +-
.../main/resources/mongo/azure/mongo_roles.json | 3 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 3 +-
.../backendapi/service/ProjectServiceImplTest.java | 202 +++++-----
.../service/impl/EndpointServiceImplTest.java | 93 ++---
.../impl/InfrastructureInfoServiceImplTest.java | 52 +--
.../service/impl/OdahuServiceImplTest.java | 418 +++++++++++----------
42 files changed, 1425 insertions(+), 695 deletions(-)
copy services/datalab-model/src/main/java/com/epam/datalab/dto/base/{project/ProjectResult.java => odahu/OdahuResult.java} (67%)
copy services/datalab-model/src/main/java/com/epam/datalab/dto/{project/ProjectCreateDTO.java => odahu/ActionOdahuDTO.java} (68%)
copy services/datalab-model/src/main/java/com/epam/datalab/dto/{project/ProjectCreateDTO.java => odahu/CreateOdahuDTO.java} (84%)
create mode 100644 services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/OdahuCallbackHandler.java
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/resources/UserRoleResource.java => provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/OdahuResource.java} (54%)
copy services/{self-service/src/main/java/com/epam/datalab/backendapi/service/UserSettingService.java => provisioning-service/src/main/java/com/epam/datalab/backendapi/service/OdahuService.java} (70%)
create mode 100644 services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/OdahuServiceImpl.java
copy services/self-service/src/main/java/com/epam/datalab/backendapi/dao/{BackupDAO.java => OdahuDAO.java} (55%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/domain/{UpdateProjectBudgetDTO.java => OdahuActionDTO.java} (85%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/domain/{UpdateProjectBudgetDTO.java => OdahuCreateDTO.java} (79%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/domain/{UpdateProjectDTO.java => OdahuDTO.java} (66%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/domain/{AuditCreateDTO.java => OdahuFieldsDTO.java} (75%)
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/resources/OdahuResource.java
copy services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/{BackupCallback.java => OdahuCallback.java} (55%)
copy services/self-service/src/main/java/com/epam/datalab/backendapi/service/{BillingService.java => OdahuService.java} (54%)
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/OdahuServiceImpl.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2162]: merged from develop
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2162
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 6fbd98aac5d0a004b87492cad14faa05a73bac85
Merge: bce0d47 3db6fb1
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Nov 25 13:15:50 2020 +0200
[DATALAB-2162]: merged from develop
.../com/epam/datalab/dto/base/DataEngineType.java | 5 +-
.../epam/datalab/dto/base/odahu/OdahuResult.java} | 49 ++-
.../epam/datalab/dto/odahu/ActionOdahuDTO.java} | 47 ++-
.../odahu/CreateOdahuDTO.java} | 32 +-
.../java/com/epam/datalab/model/ResourceEnum.java | 3 +-
.../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 | 70 ++++
.../datalab/backendapi/service/OdahuService.java} | 24 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 115 ++++++
.../datalab/backendapi/SelfServiceApplication.java | 24 +-
.../com/epam/datalab/backendapi/dao/OdahuDAO.java} | 34 +-
.../epam/datalab/backendapi/dao/OdahuDAOImpl.java | 5 +-
.../datalab/backendapi/domain/OdahuActionDTO.java} | 28 +-
.../datalab/backendapi/domain/OdahuCreateDTO.java} | 31 +-
.../OdahuDTO.java} | 45 +--
.../datalab/backendapi/domain/OdahuFieldsDTO.java} | 32 +-
.../epam/datalab/backendapi/domain/ProjectDTO.java | 3 +-
.../epam/datalab/backendapi/modules/DevModule.java | 32 +-
.../backendapi/modules/ProductionModule.java | 40 +-
.../backendapi/resources/OdahuResource.java | 97 +++++
.../resources/callback/OdahuCallback.java | 59 +++
.../resources/dto/ProjectInfrastructureInfo.java | 27 +-
.../CheckInfrastructureStatusScheduler.java | 207 +++++-----
.../datalab/backendapi/service/OdahuService.java | 47 +++
.../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 +-
.../datalab/backendapi/util/RequestBuilder.java | 31 ++
.../src/main/resources/mongo/aws/mongo_roles.json | 3 +-
.../main/resources/mongo/azure/mongo_roles.json | 3 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 3 +-
.../backendapi/service/ProjectServiceImplTest.java | 202 +++++-----
.../service/impl/EndpointServiceImplTest.java | 93 ++---
.../impl/InfrastructureInfoServiceImplTest.java | 52 +--
.../service/impl/OdahuServiceImplTest.java | 418 +++++++++++----------
42 files changed, 1583 insertions(+), 740 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org