You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/13 11:02:55 UTC
[incubator-dlab] 01/01: Merge branch 'DLAB-terraform' of
github.com:apache/incubator-dlab into DLAB-1086
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 87072dfeaf00437cf59828b83fc8ebf64de5600b
Merge: cd9934b ec83eae
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Sep 13 14:02:36 2019 +0300
Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1086
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 29 +-
.../src/general/lib/os/debian/common_lib.py | 54 +--
.../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 +-
.../scripts/aws/tensor-rstudio_configure.py | 2 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
.../terraform/gcp/endpoint/daemon.json | 5 +
.../terraform/gcp/endpoint/main/iam.tf | 49 ++
.../terraform/gcp/endpoint/main/instance.tf | 60 +++
.../terraform/gcp/endpoint/main/main.tf | 7 +
.../terraform/gcp/endpoint/main/network.tf | 74 +++
.../terraform/gcp/endpoint/main/variables.tf | 144 ++++++
.../terraform/gcp/endpoint/provisioning.py | 495 +++++++++++++++++++++
.../terraform/gcp/endpoint/provisioning.yml | 151 +++++++
.../gcp/endpoint}/supervisor_svc.conf | 32 +-
pom.xml | 15 +-
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 | 41 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../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 | 59 +--
.../resources/ImageExploratoryResource.java | 8 +-
.../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 +-
.../src/main/resources/webapp/package-lock.json | 458 +++++++++----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../administration/project/project.component.ts | 3 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 2 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../resources-grid/resources-grid.component.scss | 13 +-
.../resources-grid/resources-grid.component.ts | 4 +-
.../confirmation-dialog.component.ts | 13 +-
.../resources/webapp/src/assets/styles/_theme.scss | 17 +-
.../webapp/src/dictionary/aws.dictionary.ts | 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 8 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 10 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
85 files changed, 2891 insertions(+), 1076 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org