You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/16 14:05:13 UTC
[incubator-dlab] 01/05: merge dlab-loading into DLAB-1056
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit dc284605d73e75cb259ebfd947e33ee3f106cfd8
Merge: 42803a4 a374b70
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 15:58:53 2019 +0300
merge dlab-loading into DLAB-1056
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 25 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
pom.xml | 18 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 +-
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../BillingApplicationConfiguration.java} | 17 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 24 +-
.../BillingDAO.java} | 10 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 +
.../Project.java} | 13 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +
.../epam/dlab/billing/gcp/model/BillingData.java | 70 +
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 25 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../BillingRepository.java} | 10 +-
.../ProjectRepository.java} | 9 +-
.../UserInstanceRepository.java} | 11 +-
.../BillingScheduler.java} | 21 +-
.../BillingService.java} | 8 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 +
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 +-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +-
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +-
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 +-
.../epam/dlab/backendapi/modules/DevModule.java | 19 +
.../backendapi/modules/GcpSelfServiceModule.java | 75 +-
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/UserGroupResource.java | 1 +
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 +
.../dlab/backendapi/service/BillingService.java | 87 +-
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 +-
.../backendapi/service/gcp/GcpBillingService.java | 102 +
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../service/impl/UserGroupServiceImpl.java | 10 +
.../src/main/resources/webapp/angular.json | 25 +-
.../src/main/resources/webapp/package-lock.json | 8760 +++++++++-----------
.../src/main/resources/webapp/package.json | 46 +-
.../project/project-form/project-form.component.ts | 5 +-
.../app/administration/roles/roles.component.ts | 3 +-
.../main/resources/webapp/src/app/app.module.ts | 21 +-
.../resources/webapp/src/app/core/core.module.ts | 24 +-
.../core/interceptors/httpInterceptor.service.ts | 0
.../core/interceptors/logInterceptor.factory.ts | 0
.../services/applicationServiceFacade.service.ts | 10 +-
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../src/app/reporting/reporting.component.ts | 4 +-
.../cluster-details/cluster-details.component.ts | 2 +-
...mputational-resource-create-dialog.component.ts | 6 +-
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.ts | 6 +-
.../install-libraries.component.ts | 4 +-
.../manage-ungit/manage-ungit.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 2 +-
.../app/resources/scheduler/scheduler.component.ts | 96 +-
.../webapp/src/app/shared/bubble/bubble.service.ts | 4 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../shared/modal-dialog/key-upload-dialog/index.ts | 34 -
.../key-upload-dialog.component.html | 64 -
.../key-upload-dialog.component.ts | 82 -
.../key-upload-dialog/key-upload.model.ts | 80 -
.../webapp/src/app/shared/navbar/index.ts | 5 +-
.../src/app/webterminal/webterminal.component.ts | 5 +-
.../webapp/src/assets/styles/app-loading.scss | 86 +
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../webapp/src/environments/environment.ts | 3 +-
.../src/main/resources/webapp/src/index.html | 80 +-
.../src/main/resources/webapp/tsconfig.json | 11 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
97 files changed, 5753 insertions(+), 6085 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org