You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/09/18 12:44:39 UTC
[incubator-dlab] branch DLAB-433 updated (bfd284a -> fff767e)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from bfd284a Merge pull request #261 from bodnarmykola/DLAB-433
add 0cf2f0e [GCP] Service accounts and roles removing prevented for similar SBN
add 0507d70 [GCP] SBN unique validation added
add ffc0789 [GCP] SBN unique validation fixed
add 40fca3f [AWS] SBN unique validation added
add 12b67ca security aws test
add 53511f0 [Azure] SBN unique validation added
add db03fb8 [AWS] 'sg' in lower case
add 6d16b54 Project status is not updated from creating to active fixed
add c197a25 [Azure] lower letters in project name implemented
add e775692 Merge pull request #253 from bodnarmykola/DLAB-748
add cd4a646 Merge pull request #22 from apache/develop
add b7092ed [DLAB-998] Added enpoint_tag to IAM roles of project/notebook/CR
add 00d106d Merge pull request #257 from AdamsDisturber/develop
add 059bfca [DLAB-1008]: added project data refresh
add 3cb9820 Merge pull request #258 from apache/DLAB-1008
add 5e6032a Merge pull request #260 from bodnarmykola/DLAB-748
add 63abcfe Merge pull request #269 from bodnarmykola/DLAB-748
add b79c19a hide computational_url if cluster is not in active state
add bd93e73 Merge pull request #271 from bodnarmykola/DLAB-748
add 6e90fc6 added health status update after project creation
add 05a3aa5 [DLAB-1010]: update billing data filtering
add 8433271 [DLAB-1010]: update billing data filtering
add c2f1bad Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1010
add 90d859a [DLAB-1010]: clear name filtering field on reset
add 3a89cd6 Merge pull request #267 from apache/DLAB-1010
add 38de3bf [DLAB-1009]: Prevent notebook action depends on status of computational resource
add 5862c95 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1009
add 61306cd Merge pull request #270 from apache/DLAB-1009
add 631a75c Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-981
add e4245e2 added tags into resources list grid
add ee91dc6 spot parameter fix in cluster model form
add 4e53b0a changed theme of chips controls for tags
add a453dbc added tooltips to describe tags
add 8420f77 Merge pull request #272 from apache/DLAB-981
add 393b260 [DLAB-1035] Fixed custom images using.
add 35ac440 DLAB-1016 fixed bug connected with getting user groups
add 000dbd2 DLAB-990, 992, 1004 fixed bugs connected with project actions on AZURE
add 586aebf [DLAB-1005]: no duplacation patterns check
add b7f73a7 merge develop into DLAB-1005
add 3a9490a [DLAB-939]: billing grid align fixes
add 04b3bd4 [DLAB-939]: billing grid align fixes for firefox
add 12c67ad Merge pull request #274 from apache/DLAB-1005
add 8063145 Merge pull request #275 from bodnarmykola/DLAB-748
add efb3f2f [DLAB-1005]: prevent special characters on project name creation
add 9912349 [DLAB-981]: fixed issue with Data Engine template for GPU instances
add 7839c0b [DLAB-940][1032]: spot instance parameters fixes; checked by defaulth with value
add 9731d92 [DLAB-1053]: added extra custom tag check
add 8838abe Merge pull request #276 from apache/DLAB-981
add 26a4375 [DLAB-1068] Fixed Deep Learning creation.
add d7d4c2b Merge pull request #277 from apache/DLAB-1068
add a40c3b3 Merge pull request #16 from apache/develop
add e131b10 [Azure] project strt/terminate fixed
add 65a2c1a [Azure] notebook creation fixed
add 24f7420 [Azure]: Any notebook is not created successfully fixed [Azure]: Shared AMis for both per project and per endpoint
add d7859fe DLAB-1087 - [AWS]: RStudio with TensorFlow creation fails due to 'conf_service_base_name' is not defined fixed DLAB-1084 - [Debian]: Notebook/spark cluster creations stuck using shared image
add 9c147ad [DLAB-1071] Spark cluster fails if project name contains uppercase. Removed tensor-rstudio_description.json for gcp.
add ab54228 Merge pull request #278 from apache/DLAB-1071
add d474476 [DLAB-1073][GCP] Failed spark start, stop or terminate procedure in case of uppercase in project name.
add 8f5b1bd Merge pull request #280 from apache/DLAB-1073
add b5f022c [DLAB-1070]: fixed notebook and clusters validation on the identity
add 8d3efc7 [DLAB-1069]: case insensitive group name on create validity check
add fb94752 [DLAB-1069]: case insensitive group name on create validity check
add 90a0082 [DLAB-1072]: Removed extra expansion of the library list on installing process
add a6d9dee [DLAB-1051]: cluster name validation fix; unique only per notebook
add 964db3c Merge pull request #281 from apache/DLAB-1070
add a9ddda1 Merge pull request #282 from bodnarmykola/DLAB-748
add b33094b [DLAB-1052]: is Resources In Progress check fixes
add 16bc773 [DLAB-1052]: is Resources In Progress check fixes
add 8dfbbca Merge pull request #284 from apache/DLAB-1052
add 0998498 fix-repo
add 97d4193 Merge pull request #285 from apache/fix_repo
add 093c289 DLAB-1060 removed edge from status api
add 8b0fea1 Hot-fix. Fixing exit after 60 tries.
add 187e376 Hot-fix. Fixing exit after 60 tries modified.
add 8698dd0 Update common_lib.py
add b237b68 Merge pull request #286 from apache/fix_repo
add 0a3adb7 [DLAB-77] Temporarily removed tensor-rstudio template because of unpreparedness
add bbf1a40 Merge pull request #287 from apache/DLAB-77
add f56d671 DLAB-1060 fixed bug connected with roles
add 9e4099a [DLAB-947] Added gitlab support to ssh proxy config
add 25b4ff1 Merge pull request #289 from apache/DLAB-947
add 727cdb9 Merge pull request #290 from bodnarmykola/DLAB-748
add 741f216 [DLAB-1043]: added error message during cluster creation in case of quota exceeding
add b402157 [DLAB-1043]: added error message during cluster creation in case of quota exceeding
add 8a6409c Merge pull request #288 from apache/DLAB-1043
add c87b0e1 Merge branch 'develop' into DLAB-748
add 9374ad1 Merge pull request #293 from bodnarmykola/DLAB-748
add de14f04 [DLAB-984]: added error message in case of project starting issues
add 5443d06 [DLAB-984]: added error message in case of project starting issues
add 5485a3a [DLAB-984]: added tooltip to project name on Manage environment popup
add d8dcf20 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1044
add e4cddfa Merge pull request #292 from apache/DLAB-1044
add 637b408 [DLAB-1038]: fixed overlaps and collapse markdown
add 3355feb [DLAB-977]: added extra check for active resources termination list
add d6426ed [DLAB-842]: dictionary labels replaced
add 27423df Merge pull request #295 from apache/DLAB-1038
add 03d7a32 [DLAB-1081]: Fixed bug with scheduler by inactivity
add cf8fb16 Merge pull request #291 from ofuks/DLAB-1081
add a3c3e23 [DLAB-1066]: endpoint grid alignment
add 70d6a45 added project parameter to ami request on notebook creation
add 7e07166 Merge pull request #297 from apache/DLAB-1066
add 0c36b2a [DLAB-1054]: Added possibility to retrieve custom images per project
add e611e76 Added space
add 5e5ded1 Code review
add 852175f Merge pull request #294 from ofuks/DLAB-1054
add df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
add 864c4db Merge pull request #300 from apache/DLAB-1037
add a555c58 [DLAB-1090] Include EMR disk name cluster_name, instead of instance_name on GCP.
add 8032f1f minor fix
add 9821a56 Merge pull request #296 from apache/DLAB-1090
add c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc.
add fe5e433 Merge pull request #301 from apache/fix-dataproc
add 310b9c5 DLAB-000 billing mock on gcp implemented
add 5a9566f DLAB-23 added gcp billing + refactored current billing implementation
add 105ef3a DLAB-23 billing updated for aws
add ccfa823 DLAB-23 dictionary updated
add 236e8b6 DLAB-23 added billing for gcp
add 0522016 DLAB-000 license headers updated
add 217462d DLAB-23 billing updated
add f5563be DLAB-23 fixed merge conflicts
add eed9091 DLAB-23 pom fixed
add f79696d DLAB-23 removed copping billing jar
add 807bbe4 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 82e2820 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 99b7c2d DLAB-23 added billing on GCP
add a42e071 DLAB-23 added possibility to export billing on GCP
add 461b6b7 DLAB-23 added project to billable resource
add b2ccd81 DLAB-23 additional log added
add c012d21 Devops gcp billing
add 1971736 Devops gcp billing. Added billing_dataset_name.
add d43c4f4 Devops gcp billing. Added RedHat support.
add 8320e93 Fixed MongoDB password parsing.
add db65309 Set billing service on 8088 port in billing.yml
add e319c0e Fixed blling.yml
add 8d4a972 Merge pull request #298 from apache/bil-devops
add adedd5e Merge pull request #302 from apache/bil-2
add ef59961 [DLAB-1099]: Added a check while deleting a group; Delete group record from Project while deleting group
add 0d2ce0d Code review
add 5aed71f Code review
add e22a5f1 Merge pull request #304 from ofuks/DLAB-1099
add 334d74f Fixed name of GCP dataproc. Hotfix for ssn creation on other clouds.
add 2427b6d Update ssn_lib.py
add efee5fc Update ssn_lib.py
add 8cdbc20 Merge pull request #306 from apache/fix_dataproc_2
add b663f2b DLAB-000 enabling CORS for dev mode
add dcd838a Fix develop.
add fba1e54 Fix develop2.
add 91232cf Merge pull request #307 from apache/fix-develop
add e469a02 DLAB-1088 fixed bug connected with computational scheduler
add 9052d5e [DLAB-1055] Removed tunnel links from UI
add e3fddc6 Merge pull request #311 from apache/DLAB-1055
add 22f2c6a Fixed spark-cluster creation for GCP.
add eb0f287 Merge pull request #312 from apache/fix_spark
add 25aaa99 [DLAB-997] Added user tag to role creation on AWS
add a8d2f09 [DLAB-997] bugfix
add b4bfca3 Merge pull request #313 from apache/DLAB-997
new efa12a5 Merge branch 'develop' into DLAB-433
new fff767e Merge remote-tracking branch 'origin/DLAB-433' into DLAB-433
The 2 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:
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../files/gcp/tensor-rstudio_description.json | 34 +-
.../src/general/lib/aws/actions_lib.py | 75 ++--
.../src/general/lib/azure/actions_lib.py | 2 +-
.../src/general/lib/gcp/actions_lib.py | 25 +-
.../src/general/lib/os/debian/common_lib.py | 37 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/fab.py | 3 +
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../scripts/aws/common_create_notebook_image.py | 2 +-
.../scripts/aws/common_create_role_policy.py | 4 +-
.../scripts/aws/common_create_security_group.py | 2 +-
.../general/scripts/aws/common_prepare_notebook.py | 5 +-
.../scripts/aws/dataengine-service_prepare.py | 2 +-
.../general/scripts/aws/deeplearning_configure.py | 16 +-
.../src/general/scripts/aws/edge_configure.py | 4 +-
.../src/general/scripts/aws/jupyter_configure.py | 12 +-
.../src/general/scripts/aws/project_prepare.py | 19 +-
.../src/general/scripts/aws/rstudio_configure.py | 12 +-
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/general/scripts/aws/ssn_prepare.py | 11 +-
.../scripts/aws/tensor-rstudio_configure.py | 18 +-
.../src/general/scripts/aws/tensor_configure.py | 16 +-
.../src/general/scripts/aws/zeppelin_configure.py | 16 +-
.../scripts/azure/common_create_notebook_image.py | 2 +-
.../scripts/azure/common_prepare_notebook.py | 15 +-
.../general/scripts/azure/dataengine_configure.py | 6 +-
.../general/scripts/azure/dataengine_prepare.py | 16 +-
.../src/general/scripts/azure/dataengine_start.py | 4 +-
.../src/general/scripts/azure/dataengine_stop.py | 4 +-
.../general/scripts/azure/dataengine_terminate.py | 4 +-
.../scripts/azure/deeplearning_configure.py | 30 +-
.../src/general/scripts/azure/edge_configure.py | 4 +-
.../src/general/scripts/azure/edge_start.py | 5 +-
.../src/general/scripts/azure/edge_stop.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 24 +-
.../src/general/scripts/azure/project_terminate.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 34 +-
.../src/general/scripts/azure/ssn_prepare.py | 4 +
.../src/general/scripts/azure/tensor_configure.py | 30 +-
.../general/scripts/azure/zeppelin_configure.py | 28 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../gcp/common_notebook_configure_dataengine.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/dataengine_start.py | 4 +-
.../src/general/scripts/gcp/dataengine_stop.py | 4 +-
.../general/scripts/gcp/dataengine_terminate.py | 4 +-
.../general/scripts/gcp/deeplearning_configure.py | 16 +-
.../src/general/scripts/gcp/edge_terminate.py | 6 +-
.../src/general/scripts/gcp/jupyter_configure.py | 10 +-
.../src/general/scripts/gcp/project_terminate.py | 6 +-
.../src/general/scripts/gcp/rstudio_configure.py | 10 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../src/general/scripts/gcp/ssn_prepare.py | 4 +
.../scripts/gcp/ssn_terminate_gcp_resources.py | 4 +-
.../scripts/gcp/tensor-rstudio_configure.py | 14 +-
.../src/general/scripts/gcp/tensor_configure.py | 14 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 10 +-
.../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} | 18 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 20 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java} | 12 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../epam/dlab/billing/gcp/documents/Project.java} | 15 +-
.../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} | 20 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../billing/gcp/repository/BillingRepository.java | 16 +-
.../billing/gcp/repository/ProjectRepository.java | 16 +-
.../gcp/repository/UserInstanceRepository.java} | 14 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 33 +-
.../dlab/billing/gcp/service/BillingService.java} | 7 +-
.../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 +
.../{aws => azure}/project_create.json | 2 +-
.../{aws => azure}/project_terminate.json | 0
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 2 +-
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 26 +-
.../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 +
.../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 ++--
.../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 +-
.../BillingResourceGcp.java} | 28 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 18 +-
.../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/ProjectServiceImpl.java | 3 +-
.../service/impl/UserGroupServiceImpl.java | 10 +
.../epam/dlab/backendapi/util/RequestBuilder.java | 6 +
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../project-form/project-form.component.html | 8 +-
.../project-form/project-form.component.scss | 12 +
.../project/project-form/project-form.component.ts | 4 +-
.../administration/project/project.component.ts | 7 +-
.../app/administration/roles/roles.component.scss | 6 +
.../app/administration/roles/roles.component.ts | 7 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 4 +-
.../resources/webapp/src/app/core/util/patterns.ts | 3 +-
.../reporting-grid/reporting-grid.component.html | 24 +-
.../reporting-grid/reporting-grid.component.scss | 17 +
.../reporting-grid/reporting-grid.component.ts | 16 +-
.../src/app/reporting/reporting.component.ts | 21 +-
.../cluster-details/cluster-details.component.html | 108 +++--
...utational-resource-create-dialog.component.html | 14 +-
...mputational-resource-create-dialog.component.ts | 29 +-
.../computational-resource-create.model.ts | 2 +-
.../computational-resources-list.component.scss | 18 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.html | 4 +-
.../install-libraries.component.scss | 85 +++-
.../resources-grid/resources-grid.component.html | 86 +++-
.../resources-grid/resources-grid.component.scss | 41 +-
.../resources-grid/resources-grid.component.ts | 39 +-
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../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 +-
155 files changed, 2591 insertions(+), 1511 deletions(-)
rename services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{BillingApplicationGcp.java => BillingGcpApplication.java} (58%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityUnauthorizedHandler.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/BillingApplicationConfiguration.java} (65%)
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/DlabConfiguration.java} (69%)
copy services/{self-service/src/main/java/com/epam/dlab/backendapi/service/ApplicationSettingService.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java} (78%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java} (80%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/UserInstance.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingData.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java
copy services/{dlab-model/src/main/java/com/epam/dlab/dto/InfrastructureMetaInfoDTO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java} (69%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java
copy integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpInstanceState.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingRepository.java (72%)
copy integration-tests/src/main/java/com/epam/dlab/automation/docker/Networks.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/ProjectRepository.java (76%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfoDAO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/UserInstanceRepository.java} (70%)
copy services/{security-service/src/main/java/com/epam/dlab/auth/core/SimpleConnection.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/scheduler/BillingScheduler.java} (58%)
copy services/{dlab-mongo-migration/src/main/java/com/epam/dlab/migration/DbMigration.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java} (88%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
create mode 100644 services/billing-gcp/src/main/resources/application.yml
copy services/provisioning-service/src/main/resources/mock_response/{aws => azure}/project_create.json (98%)
copy services/provisioning-service/src/main/resources/mock_response/{aws => azure}/project_terminate.json (100%)
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{azure/AzureBillingFilter.java => gcp/GcpBillingFilter.java} (78%)
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/{azure/BillingResourceAzure.java => gcp/BillingResourceGcp.java} (77%)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: Merge remote-tracking branch
'origin/DLAB-433' into DLAB-433
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fff767e6d151c33b96228966e93119455ea50a1f
Merge: efa12a5 bfd284a
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Wed Sep 18 15:44:28 2019 +0300
Merge remote-tracking branch 'origin/DLAB-433' into DLAB-433
.../src/dataengine/scripts/configure_dataengine.py | 4 ++++
.../src/deeplearning/scripts/configure_deep_learning_node.py | 4 ++++
.../src/general/lib/os/debian/notebook_lib.py | 6 ++++++
.../src/jupyter/scripts/configure_jupyter_node.py | 4 ++++
.../src/rstudio/scripts/configure_rstudio_node.py | 4 ++++
.../src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py | 4 ++++
.../src/tensor/scripts/configure_tensor_node.py | 4 ++++
.../src/zeppelin/scripts/configure_zeppelin_node.py | 4 ++++
8 files changed, 34 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'develop' into DLAB-433
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit efa12a573e59474341eee9811226b7f3c30ed7b3
Merge: 19f1fb3 b4bfca3
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Wed Sep 18 15:42:30 2019 +0300
Merge branch 'develop' into DLAB-433
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../files/gcp/tensor-rstudio_description.json | 34 +-
.../src/general/lib/aws/actions_lib.py | 75 ++--
.../src/general/lib/azure/actions_lib.py | 2 +-
.../src/general/lib/gcp/actions_lib.py | 31 +-
.../src/general/lib/os/debian/common_lib.py | 37 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/fab.py | 3 +
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../scripts/aws/common_create_notebook_image.py | 2 +-
.../scripts/aws/common_create_role_policy.py | 4 +-
.../scripts/aws/common_create_security_group.py | 2 +-
.../general/scripts/aws/common_prepare_notebook.py | 5 +-
.../scripts/aws/dataengine-service_create.py | 9 -
.../scripts/aws/dataengine-service_prepare.py | 10 +-
.../general/scripts/aws/deeplearning_configure.py | 16 +-
.../src/general/scripts/aws/edge_configure.py | 4 +-
.../src/general/scripts/aws/jupyter_configure.py | 12 +-
.../src/general/scripts/aws/project_prepare.py | 19 +-
.../src/general/scripts/aws/rstudio_configure.py | 12 +-
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/general/scripts/aws/ssn_prepare.py | 11 +-
.../scripts/aws/tensor-rstudio_configure.py | 18 +-
.../src/general/scripts/aws/tensor_configure.py | 16 +-
.../src/general/scripts/aws/zeppelin_configure.py | 16 +-
.../scripts/azure/common_create_notebook_image.py | 2 +-
.../scripts/azure/common_prepare_notebook.py | 15 +-
.../general/scripts/azure/dataengine_configure.py | 6 +-
.../general/scripts/azure/dataengine_prepare.py | 16 +-
.../src/general/scripts/azure/dataengine_start.py | 4 +-
.../src/general/scripts/azure/dataengine_stop.py | 4 +-
.../general/scripts/azure/dataengine_terminate.py | 4 +-
.../scripts/azure/deeplearning_configure.py | 30 +-
.../src/general/scripts/azure/edge_configure.py | 4 +-
.../src/general/scripts/azure/edge_start.py | 5 +-
.../src/general/scripts/azure/edge_stop.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 24 +-
.../src/general/scripts/azure/project_terminate.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 34 +-
.../src/general/scripts/azure/ssn_prepare.py | 4 +
.../src/general/scripts/azure/tensor_configure.py | 30 +-
.../general/scripts/azure/zeppelin_configure.py | 28 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../gcp/common_notebook_configure_dataengine.py | 4 +-
.../scripts/gcp/dataengine-service_create.py | 2 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/dataengine_start.py | 4 +-
.../src/general/scripts/gcp/dataengine_stop.py | 4 +-
.../general/scripts/gcp/dataengine_terminate.py | 4 +-
.../general/scripts/gcp/deeplearning_configure.py | 24 +-
.../src/general/scripts/gcp/edge_terminate.py | 6 +-
.../src/general/scripts/gcp/jupyter_configure.py | 18 +-
.../src/general/scripts/gcp/project_terminate.py | 10 +-
.../src/general/scripts/gcp/rstudio_configure.py | 18 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../src/general/scripts/gcp/ssn_prepare.py | 4 +
.../scripts/gcp/ssn_terminate_gcp_resources.py | 4 +-
.../scripts/gcp/tensor-rstudio_configure.py | 22 +-
.../src/general/scripts/gcp/tensor_configure.py | 22 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 18 +-
.../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 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 27 +-
.../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 +
.../mock_response/azure/project_create.json | 57 +++
.../mock_response/azure/project_terminate.json | 12 +
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 2 +-
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 26 +-
.../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 +
.../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 ++--
.../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 ++++
.../com/epam/dlab/backendapi/roles/UserRoles.java | 18 +-
.../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/ProjectServiceImpl.java | 3 +-
.../service/impl/UserGroupServiceImpl.java | 10 +
.../epam/dlab/backendapi/util/RequestBuilder.java | 6 +
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../project-form/project-form.component.html | 8 +-
.../project-form/project-form.component.scss | 12 +
.../project/project-form/project-form.component.ts | 4 +-
.../administration/project/project.component.ts | 7 +-
.../app/administration/roles/roles.component.scss | 6 +
.../app/administration/roles/roles.component.ts | 7 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 4 +-
.../resources/webapp/src/app/core/util/patterns.ts | 3 +-
.../reporting-grid/reporting-grid.component.html | 24 +-
.../reporting-grid/reporting-grid.component.scss | 17 +
.../reporting-grid/reporting-grid.component.ts | 16 +-
.../src/app/reporting/reporting.component.ts | 21 +-
.../cluster-details/cluster-details.component.html | 108 +++--
...utational-resource-create-dialog.component.html | 14 +-
...mputational-resource-create-dialog.component.ts | 29 +-
.../computational-resource-create.model.ts | 2 +-
.../computational-resources-list.component.scss | 18 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.html | 4 +-
.../install-libraries.component.scss | 85 +++-
.../resources-grid/resources-grid.component.html | 86 +++-
.../resources-grid/resources-grid.component.scss | 41 +-
.../resources-grid/resources-grid.component.ts | 39 +-
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../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 +-
157 files changed, 2788 insertions(+), 1489 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org