You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/10/07 12:26:28 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1119-2
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1119-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d7482f98e7cccbe709bab0ed76f73b5151021de6
Merge: d9d70ae d0b835d
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Oct 7 15:16:50 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1119-2
.../src/general/lib/os/debian/ssn_lib.py | 2 +
.../src/general/lib/os/redhat/ssn_lib.py | 2 +
...common_notebook_configure_dataengine-service.py | 3 +-
.../general/scripts/aws/common_prepare_notebook.py | 5 +-
.../scripts/aws/dataengine-service_configure.py | 5 +-
.../scripts/aws/dataengine-service_prepare.py | 11 +++-
.../general/scripts/aws/dataengine_configure.py | 5 +-
.../src/general/scripts/aws/dataengine_prepare.py | 5 +-
.../general/scripts/aws/deeplearning_configure.py | 3 +-
.../src/general/scripts/aws/edge_configure.py | 3 +-
.../src/general/scripts/aws/edge_start.py | 5 +-
.../src/general/scripts/aws/edge_stop.py | 5 +-
.../src/general/scripts/aws/jupyter_configure.py | 3 +-
.../src/general/scripts/aws/project_prepare.py | 4 +-
.../src/general/scripts/aws/project_terminate.py | 3 +-
.../src/general/scripts/aws/rstudio_configure.py | 3 +-
.../scripts/aws/tensor-rstudio_configure.py | 3 +-
.../src/general/scripts/aws/tensor_configure.py | 3 +-
.../src/general/scripts/aws/zeppelin_configure.py | 3 +-
.../scripts/azure/common_create_notebook_image.py | 4 +-
.../scripts/azure/common_prepare_notebook.py | 6 +-
.../general/scripts/azure/dataengine_configure.py | 4 +-
.../general/scripts/azure/dataengine_prepare.py | 6 +-
.../scripts/azure/deeplearning_configure.py | 4 +-
.../src/general/scripts/azure/edge_configure.py | 4 +-
.../src/general/scripts/azure/edge_start.py | 4 +-
.../src/general/scripts/azure/edge_stop.py | 4 +-
.../src/general/scripts/azure/jupyter_configure.py | 4 +-
.../src/general/scripts/azure/project_prepare.py | 5 +-
.../src/general/scripts/azure/rstudio_configure.py | 4 +-
.../src/general/scripts/azure/tensor_configure.py | 4 +-
.../general/scripts/azure/zeppelin_configure.py | 4 +-
...common_notebook_configure_dataengine-service.py | 3 +-
.../general/scripts/gcp/common_prepare_notebook.py | 5 +-
.../scripts/gcp/dataengine-service_configure.py | 6 +-
.../scripts/gcp/dataengine-service_prepare.py | 4 +-
.../general/scripts/gcp/dataengine_configure.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 6 +-
.../general/scripts/gcp/deeplearning_configure.py | 3 +-
.../src/general/scripts/gcp/edge_configure.py | 4 +-
.../src/general/scripts/gcp/edge_start.py | 4 +-
.../src/general/scripts/gcp/edge_stop.py | 4 +-
.../src/general/scripts/gcp/jupyter_configure.py | 3 +-
.../src/general/scripts/gcp/project_prepare.py | 3 +-
.../src/general/scripts/gcp/rstudio_configure.py | 3 +-
.../scripts/gcp/tensor-rstudio_configure.py | 3 +-
.../src/general/scripts/gcp/tensor_configure.py | 3 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 3 +-
.../terraform/aws/endpoint/main/network.tf | 7 +++
.../terraform/aws/endpoint/main/variables.tf | 12 ++++
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 3 +-
.../ssn-helm-charts/main/dlab-ui-chart/values.yaml | 2 +
.../terraform/aws/ssn-helm-charts/main/dlab-ui.tf | 2 +
...ysql_values.yaml => mysql_keycloak_values.yaml} | 0
.../terraform/aws/ssn-helm-charts/main/keycloak.tf | 6 +-
.../terraform/aws/ssn-helm-charts/main/mysql.tf | 29 +++++-----
.../terraform/aws/ssn-helm-charts/main/secrets.tf | 8 +--
.../aws/ssn-helm-charts/main/variables.tf | 8 ++-
.../terraform/bin/deploy/endpoint_fab.py | 64 ++++++++++++++++++++--
.../terraform/gcp/endpoint/main/network.tf | 2 +-
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 1 -
.../src/main/java/com/epam/dlab/auth/UserInfo.java | 13 ++++-
.../backendapi/resources/KeycloakResource.java | 46 ++++++++++++++--
.../backendapi/service/SecurityServiceImpl.java | 26 +++------
.../epam/dlab/backendapi/util/KeycloakUtil.java | 22 ++++++++
.../project-list/project-list.component.html | 4 +-
.../project/project-list/project-list.component.ts | 16 ++++++
.../backendapi/resources/KeycloakResourceTest.java | 47 ++++++++++++++++
68 files changed, 392 insertions(+), 120 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org