You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/26 10:40:10 UTC
[incubator-dlab] branch DLAB-1028 updated (ecc2284 -> 7ca8e14)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-1028
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from ecc2284 added initialization scripts for MySQL
add d37e478 [DLAB-edge] Created terraform scripts for project deployment
add 0054c6d Merge pull request #319 from apache/DLAB-edge
add 33108b4 Endpoint provisioning unification.
add b677e6b Update provisioning.yml
add cff0bc7 Merge pull request #320 from apache/DLAB-terraform-fixing
add 6e4db18 [DLAB-1056]: added project data to reporting grid
add 794fd91 [DLAB-1031]: fixed names overlaping on billing detail dialog
add ba581b2 [DLAB-1094]: prevent extra scrollbar on create notebook dialog
add 1bb1214 moved servise pages
add cb1a557 moved servise pages; separate service page module
add 1cd5653 moved servise pages; separate service page module
add f303f8a [DLAB-1056]: added project parameter to configuration model
add 42803a4 [DLAB-987]: exteneded billing filtering; added expanding
add 4f21dbb updated perameters and configurations
add bd9cffb added starting loader; mocked api url for dev mode
add 5b93b55 Merge branch 'develop' of github.com:apache/incubator-dlab into dlab-loading
add 26c4c23 moved interseptors loading to core module
add a374b70 initial page preloader
add dc28460 merge dlab-loading into DLAB-1056
add 9a3dfca Merge remote-tracking branch 'remotes/origin/develop' into DLAB-1056
add effc3f8 DLAB-000 added possibility to filter by project on billing report page
add 4416d09 Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
add deca22e DLAB-000 added project field to billing report
add b307c81 Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
add 39fa563 [DLAB-1056]: added filtering by project to billing report
add 46787bc [DLAB-1056]: changed ReportingConfigModel
add 0e30fb4 [DLAB-1116]: Alter url endpoint error message
add 032ad0d Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
add a2f4e02 added missed package
add db72322 added missed package
add f3aced2 routing animation added
add 097fe95 added default api url key to production env variables
add 957a333 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
add 6d72270 [DLAB-1079]: added key generation on project creation
add 941dc21 Merge branch 'DLAB-1079' of github.com:apache/incubator-dlab into DLAB-1056
add e680da2 [DLAB-1079]: generate key service fixes
add 48a04ad [DLAB-1079]: download key parameters fixes; util options added
add a3ad97a Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
add 4c0bdae [DLAB-1079]: key format for saving added
add f7e3db4 package versions updates; mismatching issues fixes
add 69ebf13 shared material module update; imports fixes
add ce2cc00 request methods mapping
add fb1f9b1 toastr notification appearing fixes
add af3b90e [DLAB-472]: added filtering controls to management grid
add 8b57048 [DLAB-472]: added positioning fixes on reporting
add 54416cd [DLAB-472]: generate key controls fixes
add cb317e9 [DLAB-472]: added filtering configuration to management grid
add a579843 [DLAB-472]: added filtering configuration to management grid
add 4c9df43 [DLAB-472]: added filtering by multiple values
add caf4ef6 [DLAB-472]: added filter row collapsing
add ce232d1 Updated node.js to v12.
add 3340139 Merge remote-tracking branch 'origin/DLAB-1056' into DLAB-1056
add 5e247e2 Updated node.js to v12 ssn.
add 1708e1e Fixed "npm install"
add a49ce33 Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
add 604b0d4 [DLAB-472]: fixed filter collapse on list of resources grid
add 022f4ca [DLAB-1151][DLAB-1149]: extended tags tooltips;
add 4c32065 [DLAB-1147]: prevent project status check on env management dialog
add 0d0a110 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
add 8114011 Merge pull request #321 from apache/DLAB-1056
add 99c0767 Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
add ac6b9a3 Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
add 9243fde updated endpoint parameters;
new 7ca8e14 Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1028
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 | 2 +-
.../src/general/lib/os/redhat/ssn_lib.py | 2 +-
.../src/ssn/scripts/configure_ui.py | 2 +-
.../main/files/edge-assume-policy.json} | 0
.../main/files/edge-policy.json} | 0
.../main/files/nb-assume-policy.json} | 0
.../aws/project/main/files/nb-policy.json | 43 +
.../terraform/aws/project/main/iam.tf | 108 +
.../aws/{endpoint => project}/main/instance.tf | 29 +-
.../aws/{endpoint => project}/main/main.tf | 5 +-
.../terraform/aws/project/main/network.tf | 275 +
.../variables.tf => project/main/variales.tf} | 34 +-
.../terraform/bin/deploy/daemon.json | 6 +-
.../terraform/bin/deploy/endpoint_fab.py | 353 +-
.../terraform/bin/deploy/provisioning.yml | 40 +-
infrastructure-provisioning/terraform/bin/dlab.py | 11 +
.../terraform/gcp/endpoint/main/instance.tf | 5 +-
.../terraform/gcp/endpoint/main/main.tf | 2 +-
.../terraform/gcp/endpoint/main/variables.tf | 6 +-
.../terraform/gcp/endpoint/provisioning.py | 2 +-
.../terraform/gcp/endpoint/provisioning.yml | 32 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 4 +
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 3 +-
.../backendapi/resources/dto/BillingFilter.java | 3 +
.../src/main/resources/webapp/angular.json | 25 +-
.../src/main/resources/webapp/browserslist | 12 +
.../src/main/resources/webapp/package-lock.json | 19967 ++++++++-----------
.../src/main/resources/webapp/package.json | 66 +-
.../app/access-denied/access-denied.component.html | 33 -
.../backup-dilog/backup-dilog.component.ts | 2 +-
.../management/endpoints/endpoints.component.html | 4 +-
.../management/endpoints/endpoints.component.ts | 2 +-
.../manage-environment-dilog.component.html | 23 +-
.../manage-environment-dilog.component.ts | 2 +-
.../management/management-data.service.ts | 4 +
.../management-grid/management-grid.component.html | 125 +-
.../management-grid/management-grid.component.scss | 56 +-
.../management-grid/management-grid.component.ts | 90 +-
.../management/management.component.html | 8 +-
.../management/management.component.ts | 2 +-
.../administration/management/management.model.ts | 27 +
.../ssn-monitor/ssn-monitor.component.ts | 2 +-
.../project-form/project-form.component.html | 4 +
.../project-form/project-form.component.scss | 7 +
.../project/project-form/project-form.component.ts | 23 +-
.../project/project-list/project-list.component.ts | 2 +-
.../administration/project/project.component.ts | 2 +-
.../app/administration/roles/roles.component.ts | 2 +-
.../main/resources/webapp/src/app/app.module.ts | 35 +-
.../resources/webapp/src/app/app.routing.module.ts | 4 +-
.../resources/webapp/src/app/core/core.module.ts | 26 +-
.../core/interceptors/httpInterceptor.service.ts | 0
.../core/interceptors/logInterceptor.factory.ts | 0
.../services/applicationServiceFacade.service.ts | 176 +-
.../src/app/core/services/userAccessKey.service.ts | 8 +-
.../webapp/src/app/core/util/fileUtils.ts | 21 +-
.../webapp/src/app/core/util/http-methods.ts | 11 +
.../webapp/src/app/core/util/http-status-codes.ts | 106 +-
.../resources/webapp/src/app/core/util/index.ts | 1 +
.../webapp/src/app/layout/layout.component.ts | 1 +
.../webapp/src/app/not-found/not-found.module.ts | 29 -
.../reporting-grid/reporting-grid.component.html | 92 +-
.../reporting-grid/reporting-grid.component.scss | 27 +-
.../reporting-grid/reporting-grid.component.ts | 10 +-
.../src/app/reporting/reporting.component.ts | 11 +-
.../cluster-details/cluster-details.component.ts | 4 +-
...mputational-resource-create-dialog.component.ts | 8 +-
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.ts | 2 +-
.../cost-details-dialog.component.scss | 15 +-
.../cost-details-dialog.component.ts | 2 +-
.../create-environment.component.scss | 2 +-
.../create-environment.component.ts | 4 +-
.../detail-dialog/detail-dialog.component.ts | 8 +-
.../install-libraries.component.ts | 6 +-
.../manage-ungit/manage-ungit.component.ts | 4 +-
.../resources-grid/resources-grid.component.html | 38 +-
.../resources-grid/resources-grid.component.scss | 46 +-
.../resources-grid/resources-grid.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 4 +-
.../app/resources/scheduler/scheduler.component.ts | 98 +-
.../access-denied/access-denied.component.scss | 0
.../access-denied/access-denied.component.ts | 17 +-
.../not-found/not-found.component.html | 0
.../not-found/not-found.component.scss | 0
.../not-found/not-found.component.ts | 0
.../service-pages.module.ts} | 9 +-
.../webapp/src/app/shared/bubble/bubble.service.ts | 4 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../webapp/src/app/shared/material.module.ts | 66 +-
.../confirmation-dialog.component.ts | 2 +-
.../shared/modal-dialog/key-upload-dialog/index.ts | 34 -
.../key-upload-dialog.component.html | 64 -
.../key-upload-dialog.component.ts | 82 -
.../key-upload-dialog/key-upload.model.ts | 80 -
.../notification-dialog.component.ts | 2 +-
.../progress-dialog/progress-dialog.component.ts | 2 +-
.../webapp/src/app/shared/navbar/index.ts | 5 +-
.../src/app/shared/navbar/navbar.component.html | 7 +-
.../src/app/shared/navbar/navbar.component.scss | 52 +
.../src/app/shared/navbar/navbar.component.ts | 44 +-
.../shared/time-picker/time-picker.component.scss | 2 -
.../shared/time-picker/time-picker.component.ts | 2 +-
.../src/app/webterminal/webterminal.component.ts | 3 +-
.../webapp/src/assets/styles/_dialogs.scss | 5 -
.../resources/webapp/src/assets/styles/_theme.scss | 41 +-
.../webapp/src/assets/styles/app-loading.scss | 86 +
.../webapp/src/dictionary/aws.dictionary.ts | 6 +-
.../webapp/src/dictionary/azure.dictionary.ts | 6 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../webapp/src/environments/environment.prod.ts | 3 +-
.../webapp/src/environments/environment.ts | 3 +-
.../src/main/resources/webapp/src/index.html | 80 +-
.../src/main/resources/webapp/src/polyfills.ts | 33 +-
.../src/main/resources/webapp/src/styles.scss | 11 +-
.../main/resources/webapp/src/tsconfig.app.json | 2 -
.../main/resources/webapp/src/tsconfig.spec.json | 1 -
.../src/main/resources/webapp/tsconfig.json | 16 +-
.../src/main/resources/webapp/tslint.json | 8 +-
119 files changed, 10667 insertions(+), 12378 deletions(-)
copy infrastructure-provisioning/terraform/aws/{ssn-k8s/main/files/assume-policy.json => project/main/files/edge-assume-policy.json} (100%)
copy infrastructure-provisioning/terraform/aws/{endpoint/main/files/endpoint-policy.json => project/main/files/edge-policy.json} (100%)
copy infrastructure-provisioning/terraform/aws/{ssn-k8s/main/files/assume-policy.json => project/main/files/nb-assume-policy.json} (100%)
create mode 100644 infrastructure-provisioning/terraform/aws/project/main/files/nb-policy.json
create mode 100644 infrastructure-provisioning/terraform/aws/project/main/iam.tf
copy infrastructure-provisioning/terraform/aws/{endpoint => project}/main/instance.tf (60%)
copy infrastructure-provisioning/terraform/aws/{endpoint => project}/main/main.tf (99%)
create mode 100644 infrastructure-provisioning/terraform/aws/project/main/network.tf
copy infrastructure-provisioning/terraform/aws/{computational_resources/modules/data_engine/variables.tf => project/main/variales.tf} (77%)
create mode 100644 services/self-service/src/main/resources/webapp/browserslist
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/httpInterceptor.service.ts
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/logInterceptor.factory.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/util/http-methods.ts
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts
rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.scss (100%)
rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.ts (69%)
rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.html (100%)
rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.scss (100%)
rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.ts (100%)
rename services/self-service/src/main/resources/webapp/src/app/{access-denied/access-denied.module.ts => service-pages/service-pages.module.ts} (75%)
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload.model.ts
create mode 100644 services/self-service/src/main/resources/webapp/src/assets/styles/app-loading.scss
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'DLAB-terraform' of
github.com:apache/incubator-dlab into DLAB-1028
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1028
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7ca8e147f4968d4547c360131795aeefa6fbb52d
Merge: ecc2284 9243fde
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Sep 26 13:39:57 2019 +0300
Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1028
.../src/general/lib/os/debian/ssn_lib.py | 2 +-
.../src/general/lib/os/redhat/ssn_lib.py | 2 +-
.../src/ssn/scripts/configure_ui.py | 2 +-
.../aws/project/main/files/edge-assume-policy.json | 13 +
.../aws/project/main/files/edge-policy.json | 123 +
.../aws/project/main/files/nb-assume-policy.json | 13 +
.../aws/project/main/files/nb-policy.json | 43 +
.../terraform/aws/project/main/iam.tf | 108 +
.../terraform/aws/project/main/instance.tf | 50 +
.../{gcp/endpoint => aws/project}/main/main.tf | 12 +-
.../terraform/aws/project/main/network.tf | 275 +
.../main/main.tf => aws/project/main/variales.tf} | 47 +-
.../terraform/bin/deploy/daemon.json | 6 +-
.../terraform/bin/deploy/endpoint_fab.py | 353 +-
.../terraform/bin/deploy/provisioning.yml | 40 +-
infrastructure-provisioning/terraform/bin/dlab.py | 11 +
.../terraform/gcp/endpoint/main/instance.tf | 5 +-
.../terraform/gcp/endpoint/main/main.tf | 2 +-
.../terraform/gcp/endpoint/main/variables.tf | 6 +-
.../terraform/gcp/endpoint/provisioning.py | 2 +-
.../terraform/gcp/endpoint/provisioning.yml | 32 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 4 +
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 3 +-
.../backendapi/resources/dto/BillingFilter.java | 3 +
.../src/main/resources/webapp/angular.json | 25 +-
.../src/main/resources/webapp/browserslist | 12 +
.../src/main/resources/webapp/package-lock.json | 19967 ++++++++-----------
.../src/main/resources/webapp/package.json | 66 +-
.../app/access-denied/access-denied.component.html | 33 -
.../src/app/access-denied/access-denied.module.ts | 29 -
.../backup-dilog/backup-dilog.component.ts | 2 +-
.../management/endpoints/endpoints.component.html | 4 +-
.../management/endpoints/endpoints.component.ts | 2 +-
.../manage-environment-dilog.component.html | 23 +-
.../manage-environment-dilog.component.ts | 2 +-
.../management/management-data.service.ts | 4 +
.../management-grid/management-grid.component.html | 125 +-
.../management-grid/management-grid.component.scss | 56 +-
.../management-grid/management-grid.component.ts | 90 +-
.../management/management.component.html | 8 +-
.../management/management.component.ts | 2 +-
.../administration/management/management.model.ts | 27 +
.../ssn-monitor/ssn-monitor.component.ts | 2 +-
.../project-form/project-form.component.html | 4 +
.../project-form/project-form.component.scss | 7 +
.../project/project-form/project-form.component.ts | 23 +-
.../project/project-list/project-list.component.ts | 2 +-
.../administration/project/project.component.ts | 2 +-
.../app/administration/roles/roles.component.ts | 2 +-
.../main/resources/webapp/src/app/app.module.ts | 35 +-
.../resources/webapp/src/app/app.routing.module.ts | 4 +-
.../resources/webapp/src/app/core/core.module.ts | 26 +-
.../core/interceptors/httpInterceptor.service.ts | 0
.../core/interceptors/logInterceptor.factory.ts | 0
.../services/applicationServiceFacade.service.ts | 176 +-
.../src/app/core/services/userAccessKey.service.ts | 8 +-
.../webapp/src/app/core/util/fileUtils.ts | 21 +-
.../webapp/src/app/core/util/http-methods.ts | 11 +
.../webapp/src/app/core/util/http-status-codes.ts | 106 +-
.../resources/webapp/src/app/core/util/index.ts | 1 +
.../webapp/src/app/layout/layout.component.ts | 1 +
.../reporting-grid/reporting-grid.component.html | 92 +-
.../reporting-grid/reporting-grid.component.scss | 27 +-
.../reporting-grid/reporting-grid.component.ts | 10 +-
.../src/app/reporting/reporting.component.ts | 11 +-
.../cluster-details/cluster-details.component.ts | 4 +-
...mputational-resource-create-dialog.component.ts | 8 +-
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.ts | 2 +-
.../cost-details-dialog.component.scss | 15 +-
.../cost-details-dialog.component.ts | 2 +-
.../create-environment.component.scss | 2 +-
.../create-environment.component.ts | 4 +-
.../detail-dialog/detail-dialog.component.ts | 8 +-
.../install-libraries.component.ts | 6 +-
.../manage-ungit/manage-ungit.component.ts | 4 +-
.../resources-grid/resources-grid.component.html | 38 +-
.../resources-grid/resources-grid.component.scss | 46 +-
.../resources-grid/resources-grid.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 4 +-
.../app/resources/scheduler/scheduler.component.ts | 98 +-
.../access-denied/access-denied.component.scss | 0
.../access-denied/access-denied.component.ts | 17 +-
.../not-found/not-found.component.html | 0
.../not-found/not-found.component.scss | 0
.../not-found/not-found.component.ts | 0
.../service-pages.module.ts} | 9 +-
.../webapp/src/app/shared/bubble/bubble.service.ts | 4 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../webapp/src/app/shared/material.module.ts | 66 +-
.../confirmation-dialog.component.ts | 2 +-
.../shared/modal-dialog/key-upload-dialog/index.ts | 34 -
.../key-upload-dialog.component.html | 64 -
.../key-upload-dialog.component.ts | 82 -
.../key-upload-dialog/key-upload.model.ts | 80 -
.../notification-dialog.component.ts | 2 +-
.../progress-dialog/progress-dialog.component.ts | 2 +-
.../webapp/src/app/shared/navbar/index.ts | 5 +-
.../src/app/shared/navbar/navbar.component.html | 7 +-
.../src/app/shared/navbar/navbar.component.scss | 52 +
.../src/app/shared/navbar/navbar.component.ts | 44 +-
.../shared/time-picker/time-picker.component.scss | 2 -
.../shared/time-picker/time-picker.component.ts | 2 +-
.../src/app/webterminal/webterminal.component.ts | 3 +-
.../webapp/src/assets/styles/_dialogs.scss | 5 -
.../resources/webapp/src/assets/styles/_theme.scss | 41 +-
.../webapp/src/assets/styles/app-loading.scss | 86 +
.../webapp/src/dictionary/aws.dictionary.ts | 6 +-
.../webapp/src/dictionary/azure.dictionary.ts | 6 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../webapp/src/environments/environment.prod.ts | 3 +-
.../webapp/src/environments/environment.ts | 3 +-
.../src/main/resources/webapp/src/index.html | 80 +-
.../src/main/resources/webapp/src/polyfills.ts | 33 +-
.../src/main/resources/webapp/src/styles.scss | 11 +-
.../main/resources/webapp/src/tsconfig.app.json | 2 -
.../main/resources/webapp/src/tsconfig.spec.json | 1 -
.../src/main/resources/webapp/tsconfig.json | 16 +-
.../src/main/resources/webapp/tslint.json | 8 +-
119 files changed, 10874 insertions(+), 12361 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org