tree eb1c6fa220a03475dd5c8cbafc141993876d895f
parent 423fa3a4404326aaac6aebc68b80a0f86dd775b4
parent 062a052c19a8f79e275e5923d6dd5ab2dfdb8941
author KinashYurii <ura.kinash@gmail.com> 1628774648 +0300
committer KinashYurii <ura.kinash@gmail.com> 1628774648 +0300

Merge branch 'v2.5.0' of https://github.com/apache/incubator-datalab
Fixed Conflicts:
#	RELEASE_NOTES.md
#	USER_GUIDE.md
#	build.properties
#	doc/billing_filter.png
#	doc/billing_page.png
#	doc/bin_icon.png
#	doc/dataproc_create.png
#	doc/delete_group.png
#	doc/emr_creating.png
#	doc/environment_management.png
#	doc/main_page.png
#	doc/main_page2.png
#	doc/main_page3.png
#	doc/main_page_filter.png
#	doc/manage_environment.png
#	doc/managemanage_resource_actions.png
#	doc/notebook_create.png
#	doc/notebook_info.png
#	doc/notebook_libs_status.png
#	doc/notebook_terminated.png
#	doc/notebook_terminating.png
#	doc/roles.png
#	doc/upload_or_generate_user_key.png
#	infrastructure-provisioning/scripts/jenkins/sonar.py
#	infrastructure-provisioning/terraform/aws/computational_resources/main/main.tf
#	infrastructure-provisioning/terraform/aws/computational_resources/main/variables.tf
#	infrastructure-provisioning/terraform/aws/endpoint/main/README.md
#	infrastructure-provisioning/terraform/aws/project/main/variales.tf
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/.helmignore
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/Chart.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/templates/NOTES.txt
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/templates/_helpers.tpl
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/templates/configmap-billing-conf.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-billing-chart/values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/.helmignore
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/Chart.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/NOTES.txt
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/_helpers.tpl
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/.helmignore
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/Chart.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/bootstrap.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/ca.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/configmaps.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/ingress.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/rbac.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/secrets.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/service.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/templates/tests/test-connection.yaml
#	infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/step-ca-chart/values.yaml
#	infrastructure-provisioning/terraform/aws/ssn-k8s/main/README.md
#	infrastructure-provisioning/terraform/bin/datalab.py
#	infrastructure-provisioning/terraform/bin/deploy/daemon.json
#	infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
#	infrastructure-provisioning/terraform/bin/requirements.txt
#	infrastructure-provisioning/terraform/bin/terraform-cli.py
#	infrastructure-provisioning/terraform/gcp/endpoint/daemon.json
#	infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
#	infrastructure-provisioning/terraform/gcp/endpoint/supervisor_svc.conf
#	infrastructure-provisioning/terraform/gcp/main/main.tf
#	infrastructure-provisioning/terraform/gcp/main/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/network.tf
#	infrastructure-provisioning/terraform/gcp/modules/common/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/data_engine/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/data_engine/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/dataproc/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/dataproc/variables.tf
#	infrastructure-provisioning/terraform/gcp/modules/notebook/instance.tf
#	infrastructure-provisioning/terraform/gcp/modules/notebook/variables.tf
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/.helmignore
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/Chart.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/NOTES.txt
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/_helpers.tpl
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/deployment.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/templates/service.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-billing-chart/values.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/.helmignore
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/Chart.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/NOTES.txt
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/_helpers.tpl
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak-chart/templates/ingress.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/configmap.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongodb-chart/templates/svc-headless-rs.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql-chart/templates/tests/test-configmap.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/.helmignore
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/Chart.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/bootstrap.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/ca.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/configmaps.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/ingress.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/rbac.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/secrets.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/service.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/templates/tests/test-connection.yaml
#	infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
#	services/billing-aws/src/main/resources/application.yml
#	services/billing-azure/src/main/resources/application.yml
#	services/billing-gcp/billing.yml
#	services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java
#	services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java
#	services/billing-gcp/src/main/resources/application.yml
#	services/common/src/main/java/com/epam/datalab/exceptions/DatalabException.java
#	services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
#	services/datalab-model/src/main/java/com/epam/datalab/MongoKeyWords.java
#	services/datalab-model/src/main/java/com/epam/datalab/dto/backup/EnvBackupStatus.java
#	services/datalab-mongo-migration/src/main/java/com/epam/datalab/migration/exception/DatalabDbMigrationException.java
#	services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/RestartForm.java
#	services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java
#	services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java
#	services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java
#	services/provisioning-service/src/main/java/com/epam/dlab/backendapi/DropwizardBearerTokenFilterImpl.java
#	services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java
#	services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
#	services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
#	services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/annotation/Info.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/dao/OdahuDAO.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditActionEnum.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/service/SecurityService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Project.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/auth/KeycloakAuthenticator.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/auth/filters/DropwizardBearerTokenFilterImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/conf/KeycloakConfiguration.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/CreateProjectDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectEndpointDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectBudgetDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/bundles/DlabKeycloakBundle.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/resources/KeycloakResource.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectActionFormDTO.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/EndpointService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/SecurityService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/SecurityServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/servlet/guacamole/GuacamoleServlet.java
#	services/self-service/src/main/java/com/epam/dlab/backendapi/util/KeycloakUtil.java
#	services/self-service/src/main/resources/webapp/browserslist
#	services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
#	services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/convert-action.pipe.ts
#	services/self-service/src/main/resources/webapp/src/app/core/pipes/long-date-pipe/index.ts
#	services/self-service/src/main/resources/webapp/src/app/core/services/progress-bar.service.ts
#	services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
#	services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
#	services/self-service/src/main/resources/webapp/src/app/shared/checkbox/checkbox.component.css
#	services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
#	services/self-service/src/test/java/com/epam/datalab/backendapi/resources/KeycloakResourceTest.java
#	services/self-service/src/test/java/com/epam/datalab/backendapi/service/KeycloakServiceImplTest.java
#	services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
#	services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java