This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 4d86331 Revert merge
add 72a2f1c [DLAB-1571] Convey billing for remote gcp endpoint
add 1c2288e Added some changes
add cf65de2 Added billing filter functionality
add 1a24f7e Added some changes
add b687782 Added shape and status filter
add 66cb878 Added metadata to billing report
add a2bd9fa Refactoring
add 06dd176 Refactoring
add 8aa8ec3 Added download report feature
add 3713da8 Refactoring
add d383c85 Merge branch 'develop' into DLAB-1571
add 375d4b5 Added Get API by dlabIds
add dcab9cb [DLAB-1566]: Changed billing model for remote endpoints
add 525c476 Added detailed billing feature
add bf010b4 Code refactoring
add becd827 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 581c5a2 Code refactoring
add d97da87 Code refactoring
add 099d952 [DLAB-1565]: Convey billing for remote endpoints
add aa5a8ca [DLAB-1565]: Convey billing for remote endpoints - variables
for GCP added
add 002a3e0 [DLAB-1565]: Convey billing for remote endpoints - variables
for GCP main.tf added
add 762b99f [DLAB-1565]: Convey billing for remote endpoints - put
billing.yml fixed
add 76561bd [DLAB-1565]: Convey billing for remote endpoints -
billing.yml added
add fee0e82 [DLAB-1565]: Convey billing for remote endpoints - sed
parameters in billing.yml fixed
add a457dc5 [DLAB-1565]: Convey billing for remote endpoints -
billing.yml according to cloud provider fixed
add e2816f8 [DLAB-1565]: Convey billing for remote endpoints -
billing.yml according to cloud provider fixed again
add b1019df [DLAB-1565]: Convey billing for remote endpoints -
billing.yml according to cloud provider fixed again
add c40ec2e [DLAB-1565]: Convey billing for remote endpoints - [GCP]
implemented
add 025d788 [DLAB-1565]: Convey billing for remote endpoints - [GCP] fixed
add 3018eb8 [DLAB-1565]: Convey billing for remote endpoints - [GCP] fixed
add fa19a8a [DLAB-1565]: Convey billing for remote endpoints - [GCP] fixed
add a5ba7b9 [DLAB-1565]: Convey billing for remote endpoints - [GCP] fixed
add f888554 Merge pull request #638 from apache/DLAB-1565
add f0d7635 Changed port to 8088
add 4b791b9 [DLAB-643] Conveyed billing for remote aws endpoint
add 101fa77 Refactoring
add 9b09d6a Fixed search by dlabId
add 35d053a Refactoring
add f74a6be Changed billing for remote endpoint on UI
add 3d9e518 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 667524f Conveyed billing for Azure remote endpoint
add 27bd697 Changed config file
add 6579e18 [DLAB-1565]: Convey billing for remote endpoints - [GCP]
billing added to supervisor
add b7e6253 [DLAB-1565]: Convey billing for remote endpoints - [GCP]
billing added to supervisor
add f3a312c [DLAB-1565]: Convey billing for remote endpoints - [GCP]
billing.yml and variables fixed
add 2490ac7 [DLAB-1565]: Convey billing for remote endpoints - [GCP]
billing.yml and variables fixed
add 80075f6 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint added
add 73205b8 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint fixed
add c0d8b04 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint fixed
add f34781e [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint fixed
add b453d50 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint fixed
add da81d30 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint fixed
add 4b9669d [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add 1954560 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add fb3dd9d [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add d015791 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add d5a00cf [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add a3bd962 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add eaeb086 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed
add 3603ce6 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed, pymongo added
add c154402 [DLAB-1565]: Convey billing for remote endpoints - Mongo on
endpoint installation fixed, pymongo added
add 96b0510 [DLAB-1565]: Convey billing for remote endpoints - python
libs added
add 2ae11d2 [DLAB-1565]: Convey billing for remote endpoints - [GCP]
final fixes
add 8bb7e82 Merge pull request #657 from apache/DLAB-1565
add 5dfb76d Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 92a2288 Small changes in config file
add 3ba0487 Added more changes to Azure remote billing
add 193a0c1 Fixed billing issues on self-service side
add 2aad4d7 Added changes to Azure remote billing
add e726ab4 Fixed small bugs
add 0612a4a Added changes for azure remote billing
add 4d17eb7 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add b270d01 [DLAB-1565]: [AWS] - billing on remote endpoint implementation
add dc6907b [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 1bad0bc [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 6bf1b74 [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 8afeb3c [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 7eae24a [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add fb5deb6 [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 5f22f61 [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add fd084c6 [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 57b8b64 [DLAB-1565]: [AWS] - billing on remote endpoint fixes
add 67c5d7c [DLAB-1565]: [Azure] - billing on remote endpoint
add 64f24fb [DLAB-1565]: [Azure] - billing on remote endpoint fixes
add d6efc09 [DLAB-1565]: [Azure] - billing on remote endpoint fixes
add 9ce7393 [DLAB-1565]: [Azure] - Billing on remote endpoint fixed
add cb63850 Merge pull request #672 from apache/DLAB-1565-aws
add d43f177 [DLAB-1571]: [AWS] - Billing parameters fixed;
[AWS,GCP,Azure] - port 8088 opened
add eddfe93 [DLAB-1571]: [AWS] - Billing parameters fixed
add 01c7272 [DLAB-1565]: [GCP] - Billing yml cron fixed
add 2c2b713 [DLAB-1565]: [GCP] - billing on local endpoint updated
add cce7bc6 [DLAB-1565]: [GCP] - billing on local endpoint fixed
add 8f4f526 [DLAB-1565]: [GCP] - billing on local endpoint fixed
add 010ebe1 [DLAB-1565]: [GCP] - billing on local endpoint fixed
add 79e094b [DLAB-1565]: [GCP] - billing on local endpoint fixed
add bbe2c5e [DLAB-1565]: [Azure] - billing on local endpoint updated
add b6386fd [DLAB-1565]: [Aws] - billing on local endpoint updated
add 131823d [DLAB-1565]: [Aws] - billing on local endpoint updated
add 91224cc [DLAB-1565]: billing on local endpoint fixed
add 8feb625 Merge branch 'develop' into DLAB-1571
add 2566f24 Fixed merge conflicts
add 280922b [DLAB-1649]: Added possibility to sort by project/user/charges
add bf314b8 Fixed issue with displaying list of resources
add a12ef67 Merge pull request #676 from apache/DLAB-1565-aws
add eae5b35 Remote billing
add 5ebb9c8 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 4b7abeb Refactoring local billing
add 475a95f Refactoring billing
add 740dbbe Changed cron
add bd944de Remote billing
add 6f616a6 Merge pull request #678 from apache/DLAB-1565-aws
add c7c5acf Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 3fb67c3 Remote billing
add 8151f52 Remote billing
add 8232671 Remote billing
add 435d3a1 Remote billing
add b9dc738 [DLAB-1590] Admin per project
add e7ab0d7 Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab
into DLAB-1590
add 3befbd18 Deleted requests which was not used
add 555a485 Admin per project
add e4bcf7c Admin per project
add 8fed687 Admin per project
add ca73d94 Admin per project
add 9729f01 Admin per project
add d753b18 [DLAB-1591]: Add parameters for admin per project
add a6aa0d2 Merge remote-tracking branch 'origin/DLAB-1590' into DLAB-1590
add bdaf53b Admin per project refactoring
add e266731 Admin per project refactoring
add b190bca Merge branch 'DLAB-1590' into DLAB-1571
add d96075e Admin per project
add d797b19 [DLAB-1591]: Update roles for admin per project
add bde44ac [DLAB-384]: Add category names for roles
add 1b229fb Remote billing
add b557d00 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 760f769 Remote billing
add 95911ca Remote billing
add 09ffe7c Admin per project
add 41480c4 Added standard image format
add a424388 Added custom image format
add b6b4dfb Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add ad23468 Merge branch 'DLAB-1571' into DLAB-1565-aws
add 1d00ec5 Merge pull request #689 from apache/DLAB-1565-aws
add ed3a741 Merge branch 'develop' into DLAB-1571
add c1b44b3 Remote billing
add 665df82 Update sg.tf
add ce458a1 [DLAB-1491]: Fix page refresh
add 9959aab [DLAB-1491, 1682]: Fixed administrative page appear for user
who has not permission,Fixed billing header
add e996afc [DLAB-1686] Fixed issue with key sensitive of group
add e55a045 [DLAB-1683] Fixed issue with list of resources for user
add 04d8f93 [DLAB-1685]: Local billing test
add 774e243 [DLAB-1685]: Local billing fixed
add 1198157 [DLAB-1685]: [AWS] Local billing fixed
add 41c26c1 Merge pull request #690 from apache/DLAB-1685
add 9d71130 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 4f0489e Changed scale
add 23bf755 Increased warmupPollTimeout
add 23d4388 Remote billing
add 501d147 [DLAB-1684, 1690]: Fixed list of resources for user and style
fo arrows on roles page
add 6b955d3 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 329d6a8 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 0a8d98d Merge branch 'develop' into DLAB-1571
add 7572611 Remote billing
add 27baebd [DLAB-1696, DLAB-1696]: Fixed fixed headers in
billing,resourses and menegment page. Fixed billing in resourses
add 7fd2b28 [DLAB-1571]: GCP ssn deployment fixed
add fbb1778 [DLAB-1571]: GCP ssn deployment fixed
add 78f0738 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 8ab22ae Fixed resource stop and terminate from list of resourse
add 0d8ea60 [DLAB-1694] Fixed quotas issues
add 3ca46a9 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add f95320b Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 2f467b7 Fixed project terminating
add 2fb381e Revert "[DLAB-1694] Fixed quotas issues"
add 6eab336 Revert "[DLAB-1694] Fixed quotas issues"
add 5d15822 Remote billing gcp
add f4a47a5 Remote billing gcp
add 754252d billing
add bb371c6 fixed filters
add 6e51093 billing azure
add 61df0d8 billing self-service
add 7f26141 fixed exception output
add c43b683 billing self-service
add 6e309d0 billing aws
add 965ba14 set scale
add cb8a112 update logs
add 8bf88c3 billing aws
add ce7d7ae Fixed billing on resources page
add ca644c3 Fixed billing on resources page
add ab0dea3 remote billing
add da85786 Updated details billing on resources page
add 083773e billing rest service
add 8c28e7a remote billing
add bc07cbc updated config
add 71919dc [DLAB-1700] Fixed issue with admin per project
add 64a59ef refactoring
add c4a379d [DLAB-1701]: Project_admin should not be able to remove
administrative operation for all Dlab from Super_admin
add 0852d2c Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add fc9e515 fixed billing issues
add 2ef1b7d changed billing scheduler
add 623a31a fixed billing issues
add 16fd6d1 fixed billing issues
add eaab833 [DLAB-1571]: Azure ssn deployment fixed
add f495fcb changed schedulers
add 5721ffa [DLAB-1711]: [GCP] Bucket tags with key 'name' added
add 79b0cf3 Merge pull request #693 from apache/DLAB-1711
add e3f593a Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 236000a [DLAB-1718] fixed bugs with filters
add c49406e [DLAB-1719] Fixed issues with billing export
add 326c273 [DLAB-1571]: Azure ssn configure fixed
add 1ec61d4 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 89e6df4 send full list of roles
add 70b9713 Allow to set project quota without total, fixed double value
in billing filters
add 11aebbe [DLAB-1710] added extra values for image record
add 2708765 added shape for dataengine service
add 27d49d7 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 2183f70 Fixed sorting on billing page, upd parsing master and slave,
removed no projects message for superadmin
add 04008ef [DLAB-1717] fixed filter for shape
add 4cf9c06 [DLAB-1725, DLAB-1726] Fixed issues with billing export
add e46ea8b Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 334d00e [DLAB-1700] Do not convey to Project_Admin groups of
Super_Admin and Project_Admin
add 922a73f fixed issues with ami
add 6a7c2bf [DLAB-1732]: [Azure] Billing on local endpoint fixed
add 9a1f5a0 Merge pull request #694 from apache/DLAB-1732
add 2b6e97b [DLAB-1571]: Azure ssn deployment fixed
add 9fa0e9e [DLAB-1731]: Fixed billing report
add ff3b701 [DLAB-1739, 1740]: Fixed sorting and filtering on billing
report
add a0c9cfd [DLAB-1571]: AWS local billing fixed
add 23b07c0 [DLAB-1571]: AWS local billing fixed
add 78824a5 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 7b69f62 Fixed user deleted from roles
add 378e500 [DLAB-1571]: [AWS] ssn deployment fixed
add 4c8b468 [DLAB-1571]: [AWS] mongo password setting for billing fixed
add b34898c [DLAB-1571]: [AWS] billing fixed
new 838bcd2 Merge branch 'DLAB-1571' into develop
The 1 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:
.../src/general/lib/os/debian/ssn_lib.py | 29 +-
.../src/general/scripts/aws/ssn_configure.py | 10 +-
.../src/general/scripts/azure/ssn_configure.py | 30 +-
.../src/general/scripts/gcp/project_prepare.py | 6 +-
.../src/general/scripts/gcp/ssn_configure.py | 11 +-
.../src/ssn/scripts/configure_billing.py | 125 ++++--
.../src/ssn/scripts/configure_ui.py | 8 +-
.../src/ssn/templates/ssn.yml | 5 +
.../terraform/aws/endpoint/main/network.tf | 7 +
.../terraform/aws/endpoint/main/variables.tf | 22 +-
.../terraform/azure/endpoint/main/sg.tf | 14 +
.../terraform/azure/endpoint/main/variables.tf | 20 +-
.../terraform/bin/deploy/billing_app_aws.yml | 34 ++
.../terraform/bin/deploy/billing_aws.yml | 35 +-
.../terraform/bin/deploy/billing_azure.yml | 59 +++
.../terraform/bin/deploy/billing_gcp.yml | 38 ++
.../terraform/bin/deploy/endpoint_fab.py | 339 +++++++++++++++-
.../bin/deploy/mongo_files}/configure_mongo.py | 15 +-
.../bin/deploy/mongo_files}/gcp/mongo_roles.json | 0
.../deploy/mongo_files}/mongod.service_template | 0
.../terraform/bin/deploy/provisioning.yml | 7 +-
.../terraform/bin/deploy/renew_certificates.sh | 2 +-
.../terraform/bin/deploy/supervisor_svc.conf | 10 +
infrastructure-provisioning/terraform/bin/dlab.py | 22 +
.../terraform/gcp/endpoint/main/network.tf | 2 +-
.../terraform/gcp/endpoint/main/variables.tf | 8 +
.../terraform/gcp/endpoint/provisioning.yml | 2 +-
pom.xml | 2 +-
services/billing-aws/billing.yml | 37 +-
services/billing-aws/pom.xml | 128 +++---
.../java/com/epam/dlab/BillingAwsApplication.java} | 13 +-
.../main/java/com/epam/dlab/BillingScheduler.java | 267 -------------
.../main/java/com/epam/dlab}/BillingService.java | 9 +-
.../java/com/epam/dlab/BillingServiceImpl.java | 128 ++++++
.../src/main/java/com/epam/dlab/BillingTool.java | 20 +-
.../src/main/java/com/epam/dlab/Help.java | 19 +-
.../java/com/epam/dlab/conf/SecurityConfig.java | 66 +++
.../configuration/BillingToolConfiguration.java | 30 --
.../dlab/configuration/SchedulerConfiguration.java | 213 ----------
.../epam/dlab/controller/BillingController.java} | 31 +-
.../main/java/com/epam/dlab/core/AdapterBase.java | 4 +-
.../java/com/epam/dlab/core/parser/ParserBase.java | 22 +-
.../com/epam/dlab/core/parser/ParserByLine.java | 11 +-
.../java/com/epam/dlab/module/AdapterConsole.java | 4 +-
.../java/com/epam/dlab/module/AdapterFile.java | 23 +-
.../com/epam/dlab/module/aws/AdapterS3File.java | 3 +-
.../java/com/epam/dlab/mongo/AdapterMongoDb.java | 63 +--
.../com/epam/dlab/mongo/DlabResourceTypeDAO.java | 297 +-------------
.../java/com/epam/dlab/mongo/ResourceItem.java | 152 -------
.../java/com/epam/dlab/mongo/ResourceItemList.java | 136 -------
.../billing-aws/src/main/resources/application.yml | 34 ++
.../com/epam/dlab/mongo/ResourceItemListTest.java | 54 ---
services/billing-azure/billing.yml | 111 +++---
services/billing-azure/pom.xml | 109 ++---
.../azure/AzureBillableResourcesService.java | 315 ---------------
.../billing/azure/AzureBillingDetailsService.java | 194 ---------
.../azure/AzureInvoiceCalculationService.java | 60 +--
.../billing/azure/BillingAzureApplication.java} | 8 +-
.../dlab/billing/azure/BillingSchedulerAzure.java | 314 ---------------
.../billing/azure/CalculateBillingService.java} | 12 +-
.../billing/azure/CalculateBillingServiceImpl.java | 245 ++++++++++++
.../azure/config/BillingConfigurationAzure.java | 6 +-
.../dlab/billing/azure/config/SecurityConfig.java | 66 +++
.../azure/controller/BillingController.java} | 31 +-
.../azure/model/AzureDailyResourceInvoice.java | 34 +-
.../src/main/resources/application.yml | 59 +++
services/billing-gcp/billing.yml | 34 +-
services/billing-gcp/pom.xml | 30 ++
.../dlab/billing/gcp/BillingGcpApplication.java | 2 -
.../gcp/conf/BillingApplicationConfiguration.java | 2 -
.../epam/dlab/billing/gcp/conf/SecurityConfig.java | 66 +++
.../BillingController.java} | 32 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java | 5 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 44 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 ---
.../dlab/billing/gcp/model/GcpBillingData.java | 10 +-
.../billing/gcp/repository/BillingRepository.java | 4 +-
.../billing/gcp/repository/ProjectRepository.java | 26 --
.../gcp/repository/UserInstanceRepository.java | 30 --
.../dlab/billing/gcp/service/BillingService.java | 7 +-
.../billing/gcp/service/BillingServiceImpl.java | 186 ---------
.../impl/BillingServiceImpl.java} | 34 +-
.../epam/dlab/billing/gcp/util/BillingUtils.java | 95 -----
.../billing-gcp/src/main/resources/application.yml | 26 +-
.../gcp/service/BillingServiceImplTest.java | 87 ----
.../com/epam/dlab/billing/DlabResourceType.java | 86 ----
.../com/epam/dlab/dto/billing/BillingData.java} | 23 +-
.../epam/dlab/dto/billing/BillingResourceType.java | 12 +-
.../computational/UserComputationalResource.java | 8 +-
.../java/com/epam/dlab/ServiceConfiguration.java | 9 +
.../com/epam/dlab/constants/ServiceConsts.java | 17 +-
.../com/epam/dlab/rest/client/RESTService.java | 18 +-
services/self-service/pom.xml | 6 +
services/self-service/self-service.yml | 9 +-
.../dlab/backendapi/annotation/ProjectAdmin.java | 7 +-
.../com/epam/dlab/backendapi/annotation/User.java | 7 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 441 +++++----------------
.../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 64 ++-
.../com/epam/dlab/backendapi/dao/BillingDAO.java | 15 +-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 19 -
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 19 +
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 -
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 11 +-
.../com/epam/dlab/backendapi/dao/UserGroupDao.java | 2 -
.../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 5 -
.../com/epam/dlab/backendapi/dao/UserRoleDao.java | 2 -
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 5 -
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 74 ----
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 121 ------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 65 ---
.../com/epam/dlab/backendapi/domain/BaseShape.java | 23 --
.../dlab/backendapi/domain/BillingReport.java} | 30 +-
.../dlab/backendapi/domain/BillingReportLine.java} | 52 +--
.../backendapi/domain/DataEngineServiceShape.java | 37 --
.../dlab/backendapi/domain/DataEngineShape.java | 34 --
.../epam/dlab/backendapi/domain/EndpointShape.java | 14 -
.../dlab/backendapi/domain/ExploratoryShape.java | 14 -
.../dlab/backendapi/domain/ProjectManagingDTO.java | 16 -
.../com/epam/dlab/backendapi/domain/SsnShape.java | 14 -
.../interceptor/ProjectAdminInterceptor.java | 74 ++++
.../backendapi/modules/AwsSelfServiceModule.java | 83 ----
.../backendapi/modules/AzureSelfServiceModule.java | 81 ----
.../backendapi/modules/CloudProviderModule.java | 34 +-
.../epam/dlab/backendapi/modules/DevModule.java | 67 +++-
.../backendapi/modules/GcpSelfServiceModule.java | 84 ----
.../dlab/backendapi/modules/ModuleFactory.java | 13 -
.../dlab/backendapi/modules/ProductionModule.java | 69 +++-
.../dlab/backendapi/resources/BillingResource.java | 12 +-
.../backendapi/resources/EnvironmentResource.java | 20 +-
.../resources/InfrastructureInfoResource.java | 13 +-
.../dlab/backendapi/resources/ProjectResource.java | 52 +--
.../backendapi/resources/UserGroupResource.java | 67 +---
.../backendapi/resources/UserRoleResource.java | 6 +-
.../backendapi/resources/dto/BillingFilter.java | 37 +-
.../resources/dto/HealthStatusPageDTO.java | 129 +-----
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/ProjectInfrastructureInfo.java | 3 +
.../com/epam/dlab/backendapi/roles/UserRole.java | 13 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 62 ++-
.../BillingScheduler.java} | 36 +-
.../dlab/backendapi/service/BillingService.java | 77 +---
.../backendapi/service/EnvironmentService.java | 8 +-
.../backendapi/service/ExploratoryService.java | 8 +
.../service/InfrastructureInfoService.java | 4 +-
.../dlab/backendapi/service/ProjectService.java | 13 +-
.../epam/dlab/backendapi/service/ShapeFormat.java | 5 -
.../dlab/backendapi/service/UserGroupService.java | 12 +-
.../backendapi/service/UserRoleServiceImpl.java | 1 +
.../backendapi/service/aws/AwsBillingService.java | 110 -----
.../service/azure/AzureBillingService.java | 116 ------
.../backendapi/service/gcp/GcpBillingService.java | 104 -----
.../service/impl/BillingServiceImpl.java | 338 ++++++++++++++++
.../service/impl/EndpointServiceImpl.java | 2 +-
.../service/impl/EnvironmentServiceImpl.java | 81 ++--
.../service/impl/ExploratoryServiceImpl.java | 27 +-
.../impl/InfrastructureInfoServiceImpl.java | 112 ++++--
.../service/impl/ProjectServiceImpl.java | 65 +--
.../service/impl/UserGroupServiceImpl.java | 97 +++--
.../epam/dlab/backendapi/util/BillingUtils.java | 228 +++++++++++
.../src/main/resources/mongo/aws/mongo_roles.json | 19 +
.../main/resources/mongo/azure/mongo_roles.json | 19 +
.../src/main/resources/mongo/gcp/mongo_roles.json | 20 +
.../manage-environment-dilog.component.ts | 2 +-
.../management-grid/management-grid.component.html | 30 +-
.../management-grid/management-grid.component.ts | 4 +-
.../management/management.component.ts | 3 +-
.../administration/management/management.model.ts | 1 +
.../administration/project/project.component.html | 8 +-
.../administration/project/project.component.ts | 9 +-
.../app/administration/roles/roles.component.html | 35 +-
.../app/administration/roles/roles.component.scss | 7 +
.../app/administration/roles/roles.component.ts | 58 +--
.../services/applicationServiceFacade.service.ts | 10 -
.../src/app/core/services/healthStatus.service.ts | 11 +-
.../src/app/core/services/project.service.ts | 18 -
.../reporting-grid/reporting-grid.component.html | 123 +++---
.../reporting-grid/reporting-grid.component.scss | 68 +++-
.../reporting-grid/reporting-grid.component.ts | 44 +-
.../src/app/reporting/reporting.component.ts | 96 ++---
.../app/reporting/toolbar/toolbar.component.html | 4 +-
.../cost-details-dialog.component.html | 22 +-
.../cost-details-dialog.component.scss | 2 +-
.../resources-grid/resources-grid.component.html | 38 +-
.../resources-grid/resources-grid.component.scss | 4 +
.../resources-grid/resources-grid.component.ts | 6 -
.../resources-grid/resources-grid.model.ts | 62 +--
.../src/app/resources/resources.component.html | 2 +-
.../src/app/resources/resources.component.ts | 17 +-
.../multi-level-select-dropdown.component.html | 26 +-
.../multi-level-select-dropdown.component.scss | 25 +-
.../multi-level-select-dropdown.component.ts | 1 +
.../multi-select-dropdown.component.html | 3 +-
.../confirmation-dialog.component.html | 3 +-
.../confirmation-dialog.model.ts | 6 +-
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/app/shared/navbar/navbar.component.ts | 2 +-
.../resources/webapp/src/assets/styles/_theme.scss | 5 +
.../webapp/src/dictionary/gcp.dictionary.ts | 2 +-
.../webapp/src/dictionary/global.dictionary.ts | 20 +-
.../resources/EnvironmentResourceTest.java | 97 +----
.../resources/ImageExploratoryResourceTest.java | 2 +-
.../resources/InfrastructureInfoResourceTest.java | 38 +-
.../backendapi/resources/ProjectResourceTest.java | 24 +-
.../resources/UserGroupResourceTest.java | 206 +++-------
.../backendapi/resources/UserRoleResourceTest.java | 7 +-
.../service/UserRoleServiceImplTest.java | 42 +-
.../service/aws/AwsBillingServiceTest.java | 224 -----------
.../service/azure/AzureBillingServiceTest.java | 208 ----------
.../service/impl/EnvironmentServiceImplTest.java | 71 ----
.../impl/ImageExploratoryServiceImplTest.java | 2 +-
.../InfrastructureTemplateServiceBaseTest.java | 10 +-
.../service/impl/UserGroupServiceImplTest.java | 156 +++-----
212 files changed, 4132 insertions(+), 6402 deletions(-)
create mode 100644
infrastructure-provisioning/terraform/bin/deploy/billing_app_aws.yml
copy services/billing-aws/billing.yml =>
infrastructure-provisioning/terraform/bin/deploy/billing_aws.yml (75%)
create mode 100644
infrastructure-provisioning/terraform/bin/deploy/billing_azure.yml
create mode 100644
infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml
copy infrastructure-provisioning/{src/ssn/scripts =>
terraform/bin/deploy/mongo_files}/configure_mongo.py (88%)
copy infrastructure-provisioning/{src/ssn/files =>
terraform/bin/deploy/mongo_files}/gcp/mongo_roles.json (100%)
copy infrastructure-provisioning/{src/ssn/templates =>
terraform/bin/deploy/mongo_files}/mongod.service_template (100%)
copy
services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/BillingGcpApplication.java
=> billing-aws/src/main/java/com/epam/dlab/BillingAwsApplication.java} (79%)
delete mode 100644
services/billing-aws/src/main/java/com/epam/dlab/BillingScheduler.java
copy services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service =>
billing-aws/src/main/java/com/epam/dlab}/BillingService.java (86%)
create mode 100644
services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
create mode 100644
services/billing-aws/src/main/java/com/epam/dlab/conf/SecurityConfig.java
delete mode 100644
services/billing-aws/src/main/java/com/epam/dlab/configuration/SchedulerConfiguration.java
copy
services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java
=> billing-aws/src/main/java/com/epam/dlab/controller/BillingController.java}
(54%)
delete mode 100644
services/billing-aws/src/main/java/com/epam/dlab/mongo/ResourceItem.java
delete mode 100644
services/billing-aws/src/main/java/com/epam/dlab/mongo/ResourceItemList.java
create mode 100644 services/billing-aws/src/main/resources/application.yml
delete mode 100644
services/billing-aws/src/test/java/com/epam/dlab/mongo/ResourceItemListTest.java
delete mode 100644
services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
delete mode 100644
services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillingDetailsService.java
copy
services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/BillingGcpApplication.java
=>
billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingAzureApplication.java}
(84%)
delete mode 100644
services/billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingSchedulerAzure.java
copy
services/{common/src/main/java/com/epam/dlab/exceptions/DlabAuthenticationException.java
=>
billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingService.java}
(81%)
create mode 100644
services/billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java
create mode 100644
services/billing-azure/src/main/java/com/epam/dlab/billing/azure/config/SecurityConfig.java
rename
services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java
=>
billing-azure/src/main/java/com/epam/dlab/billing/azure/controller/BillingController.java}
(52%)
create mode 100644 services/billing-azure/src/main/resources/application.yml
create mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/SecurityConfig.java
copy
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{scheduler/BillingScheduler.java
=> controller/BillingController.java} (55%)
delete mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/UserInstance.java
delete mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/ProjectRepository.java
delete mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/UserInstanceRepository.java
delete mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
rename
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{scheduler/BillingScheduler.java
=> service/impl/BillingServiceImpl.java} (57%)
delete mode 100644
services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
delete mode 100644
services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
copy
services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/model/BillingPeriod.java
=> dlab-model/src/main/java/com/epam/dlab/dto/billing/BillingData.java} (68%)
copy
integration-tests/src/main/java/com/epam/dlab/automation/docker/Labels.java =>
services/dlab-model/src/main/java/com/epam/dlab/dto/billing/BillingResourceType.java
(82%)
copy
integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java
=>
services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/ProjectAdmin.java
(88%)
copy
integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java
=>
services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/User.java
(88%)
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/BaseShape.java
copy
services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/rate/RateCardResponse.java
=>
self-service/src/main/java/com/epam/dlab/backendapi/domain/BillingReport.java}
(65%)
rename
services/{billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingData.java
=>
self-service/src/main/java/com/epam/dlab/backendapi/domain/BillingReportLine.java}
(62%)
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineServiceShape.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineShape.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointShape.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryShape.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectManagingDTO.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/SsnShape.java
create mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/ProjectAdminInterceptor.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/modules/AwsSelfServiceModule.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/modules/AzureSelfServiceModule.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
copy
services/self-service/src/main/java/com/epam/dlab/backendapi/schedulers/{exploratory/StopExploratoryJob.java
=> billing/BillingScheduler.java} (52%)
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/service/ShapeFormat.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/service/azure/AzureBillingService.java
delete mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.java
create mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
create mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
delete mode 100644
services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
delete mode 100644
services/self-service/src/test/java/com/epam/dlab/backendapi/service/azure/AzureBillingServiceTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
