This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch DLAB-1056 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9a3dfca84d3892ab2762f31fbc9b79c16c3318d8 Merge: 42803a4 b663f2b Author: bhliva <bohdan_hl...@epam.com> AuthorDate: Mon Sep 16 14:03:55 2019 +0300 Merge remote-tracking branch 'remotes/origin/develop' 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 | 34 +- .../src/general/lib/os/redhat/ssn_lib.py | 32 +- .../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/package-lock.json | 458 ++++++++++----------- .../app/administration/roles/roles.component.ts | 3 +- .../webapp/src/dictionary/aws.dictionary.ts | 4 +- .../webapp/src/dictionary/azure.dictionary.ts | 4 +- .../webapp/src/dictionary/gcp.dictionary.ts | 6 +- .../resources/ImageExploratoryResourceTest.java | 12 +- .../impl/ImageExploratoryServiceImplTest.java | 8 +- 67 files changed, 1857 insertions(+), 971 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org