You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/14 09:12:18 UTC
[incubator-dlab] branch for_video created (now 33c4182)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch for_video
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 33c4182 Created branch for video
This branch includes the following new commits:
new 49183ca Merge branch 'DLAB-1551' of github.com:apache/incubator-dlab into for_video
new 263e7d9 Merge branch 'DLAB-1571' of github.com:apache/incubator-dlab into for_video
new 33c4182 Created branch for video
The 3 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: Created branch for video
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch for_video
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 33c41821a193d5c24e4ec294fd818221c03a30fc
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Apr 14 12:11:10 2020 +0300
Created branch for video
---
.../bucket-browser/bucket-browser.component.scss | 30 +++++++++++++++++++---
.../folder-tree/folder-tree.component.scss | 2 ++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
index 7f004b4..e94b699 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
@@ -22,14 +22,17 @@
margin: 0 4px 10px 4px;
padding: 4px 4px 4px 20px;
color: rgba(0,0,0,.87);
+
.url{
font-weight: 600;
}
}
+
bottom: 0;
.dialog-content{
padding: 0 35px;
}
+
.content-box {
height: 500px;
@@ -37,10 +40,12 @@
.submit{
display: flex;
+
.butt{
position: relative;
overflow: hidden;
margin: 10px;
+
input[type="file"] {
position: absolute;
left: 0;
@@ -66,8 +71,6 @@
border-radius: 5px;
display: flex;
-
-
.navigation{
flex: 1;
border-right: 2px solid rgba(0,0,0,.12);
@@ -79,39 +82,47 @@
line-height: 30px;
}
}
-
}
.directory{
max-height: 500px;
overflow: auto;
flex: 2;
+
.folder-tree{
.name{
flex:2;
display: flex;
align-items: center;
+
&-folder{
span{
padding-left: 10px;
}
}
+
&-file{
padding-left: 4px;
+
span.item-name{
padding-left: 14px;
}
}
}
+
.size{
flex:1;
}
+
.progress-wrapper{
flex:1;
+
.progres{
+
border: 1px solid rgba(0,0,0,.12);
height: 15px;
position: relative;
+
.bar{
position: absolute;
top: 0;
@@ -119,6 +130,7 @@
left: 0;
width: 0;
background-color: #00bcd4;
+
&.full{
width: 100%;
transition: 5s ease-in-out;
@@ -126,20 +138,24 @@
}
}
}
+
.material-icons.close{
font-size: 15px;
margin: 0 10px;
cursor: pointer;
}
+
.action {
display: flex;
justify-content: space-around;
width: 100%;
+
.add-file {
overflow: hidden;
min-width: 100px ;
height: 30px;
position: relative;
+
input{
position: absolute;
left: 0;
@@ -161,6 +177,7 @@
.folder-item{
display: flex;
align-items: center;
+
.folder-item-wrapper{
width: 100%;
display: flex;
@@ -168,19 +185,24 @@
align-items: center;
cursor: pointer;
color: rgba(0,0,0,.87);
+
i{
color: rgb(232, 232, 232);
}
+
&:hover{
color: #00bcd4;
transition: .3s ease-in-out;
+
i{
color: #00bcd4;
transition: .3s ease-in-out;
}
+
.empty-checkbox{
border-color: #00bcd4
}
+
.progress-wrapper{
.progres{
border-color: #00bcd4 !important;
@@ -198,10 +220,12 @@
border: 2px solid lightgrey;
margin-top: 2px;
position: relative;
+
&.checked {
border-color: #35afd5;
background-color: #35afd5;
}
+
.checked-checkbox {
top: 0px;
left: 4px;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
index e9902af..afd11d8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
@@ -28,8 +28,10 @@
cursor: pointer;
transition: .3s;
overflow: unset;
+
&:hover{
color: #00bcd4;
+
i{
color: #00bcd4;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: Merge branch 'DLAB-1551' of
github.com:apache/incubator-dlab into for_video
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch for_video
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 49183ca9884bbb4ab1defae8c609ba8190854776
Merge: a2303e9 470a2d7
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Apr 14 11:17:29 2020 +0300
Merge branch 'DLAB-1551' of github.com:apache/incubator-dlab into for_video
.../app/core/services/bucket-browser.service.ts | 121 +++++++++++
.../bucket-browser/bucket-browser.component.html | 88 ++++++++
.../bucket-browser/bucket-browser.component.scss | 230 +++++++++++++++++++++
.../bucket-browser/bucket-browser.component.ts | 142 +++++++++++++
.../folder-tree/folder-tree.component.html | 32 +++
.../folder-tree/folder-tree.component.scss | 38 ++++
.../folder-tree/folder-tree.component.ts | 181 ++++++++++++++++
.../detail-dialog/detail-dialog.component.html | 4 +-
.../detail-dialog/detail-dialog.component.scss | 1 +
.../detail-dialog/detail-dialog.component.ts | 11 +-
.../src/app/resources/resources.component.html | 3 +
.../src/app/resources/resources.component.ts | 6 +
.../webapp/src/app/resources/resources.module.ts | 12 +-
.../webapp/src/assets/styles/_dialogs.scss | 1 +
14 files changed, 863 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: Merge branch 'DLAB-1571' of
github.com:apache/incubator-dlab into for_video
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch for_video
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 263e7d9c452e88cfd7c1a8053f349a2adbdf68e2
Merge: 49183ca 71919dc
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Apr 14 11:19:40 2020 +0300
Merge branch 'DLAB-1571' of github.com:apache/incubator-dlab into for_video
.../src/general/lib/os/debian/ssn_lib.py | 29 +-
.../src/general/scripts/aws/ssn_configure.py | 5 +-
.../src/general/scripts/azure/ssn_configure.py | 29 +-
.../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} | 26 +-
.../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} | 26 +-
.../epam/dlab/billing/azure}/dao/BillingDAO.java | 8 +-
.../billing/azure/dao/impl/BillingDAOImpl.java | 121 ++++++
.../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} | 24 +-
.../dlab/dto/billing/BillingResourceType.java} | 14 +-
.../computational/UserComputationalResource.java | 6 +-
.../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 | 3 +
.../dlab/backendapi/annotation/ProjectAdmin.java} | 15 +-
.../com/epam/dlab/backendapi/annotation/User.java} | 15 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 438 +++++----------------
.../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 | 6 +-
.../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 | 8 +-
.../backendapi/resources/dto/BillingFilter.java | 37 +-
.../resources/dto/HealthStatusPageDTO.java | 129 +-----
.../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 +-
.../dlab/backendapi/service/UserRoleService.java | 3 +-
.../backendapi/service/UserRoleServiceImpl.java | 20 +-
.../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 | 86 ++--
.../epam/dlab/backendapi/util/BillingUtils.java | 204 ++++++++++
.../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 +
.../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 | 24 +-
.../app/administration/roles/roles.component.scss | 7 +
.../app/administration/roles/roles.component.ts | 48 ++-
.../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 | 115 +++---
.../reporting-grid/reporting-grid.component.scss | 68 +++-
.../reporting-grid/reporting-grid.component.ts | 32 +-
.../src/app/reporting/reporting.component.ts | 101 ++---
.../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 | 18 +-
.../multi-level-select-dropdown.component.scss | 21 +-
.../multi-select-dropdown.component.html | 3 +-
.../confirmation-dialog.model.ts | 6 +-
.../src/app/shared/navbar/navbar.component.html | 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/InfrastructureInfoResourceTest.java | 38 +-
.../backendapi/resources/ProjectResourceTest.java | 24 +-
.../resources/UserGroupResourceTest.java | 206 +++-------
.../backendapi/resources/UserRoleResourceTest.java | 11 +-
.../service/UserRoleServiceImplTest.java | 42 +-
.../service/aws/AwsBillingServiceTest.java | 224 -----------
.../service/azure/AzureBillingServiceTest.java | 208 ----------
.../service/impl/EnvironmentServiceImplTest.java | 71 ----
.../InfrastructureTemplateServiceBaseTest.java | 10 +-
.../service/impl/UserGroupServiceImplTest.java | 156 +++-----
206 files changed, 4323 insertions(+), 6437 deletions(-)
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
index 6394d89,2587a62..7933fec
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
@@@ -24,10 -24,9 +24,10 @@@ import { MatDialog } from '@angular/mat
import { ResourcesGridComponent } from './resources-grid/resources-grid.component';
import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment';
import { Exploratory } from './resources-grid/resources-grid.model';
- import { HealthStatusService, ProjectService } from '../core/services';
+ import {ApplicationSecurityService, HealthStatusService} from '../core/services';
import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
import { Project } from './../administration/project/project.component';
+import {BucketBrowserComponent} from './bucket-browser/bucket-browser.component';
@Component({
selector: 'dlab-resources',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org