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:11 UTC
[incubator-dlab] 01/01: Merge branch 'DLAB-terraform' of
github.com:apache/incubator-dlab into DLAB-1028
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