You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/13 08:19:48 UTC
[incubator-dlab] 01/01: Merge pull request #302 from apache/bil-2
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit adedd5e2327090829a549d30567f005e79880ff5
Merge: fe5e433 8d4a972
Author: bhliva <bo...@ukr.net>
AuthorDate: Fri Sep 13 11:19:42 2019 +0300
Merge pull request #302 from apache/bil-2
Billing for GCP added
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../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 +-
.../gcp/conf/BillingApplicationConfiguration.java} | 27 +-
.../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 +
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 75 ++--
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../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 ++--
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
48 files changed, 1747 insertions(+), 943 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org