This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 838bcd2da213ccf73ff95ac381539b50bd44b765 Merge: 4d86331 b34898c Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Wed Apr 22 12:36:55 2020 +0300 Merge branch 'DLAB-1571' into develop .../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 | 95 +++++ .../bin/deploy/mongo_files}/gcp/mongo_roles.json | 52 --- .../deploy/mongo_files/mongod.service_template} | 56 +-- .../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} | 10 +- .../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} | 9 +- .../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 +- .../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} | 28 +- .../dlab/dto/billing/BillingResourceType.java} | 14 +- .../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} | 15 +- .../com/epam/dlab/backendapi/annotation/User.java} | 15 +- .../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} | 32 +- .../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 ++- .../schedulers/billing/BillingScheduler.java | 52 +++ .../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 +++----- 211 files changed, 4281 insertions(+), 6454 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org