This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 572981c39df453eaaad8cced8139f7de2ae4e41e
Merge: 4d58043 840a045
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Tue Jul 28 16:21:23 2020 +0300
Merge branch 'sonar' into develop
.../scripts/jenkins/sonar.py | 36 ++++
.../aws/computational_resources/main/main.tf | 27 ++-
.../aws/computational_resources/main/variables.tf | 21 +++
.../terraform/aws/endpoint/main/bucket.tf | 54 +++---
.../ssn-helm-charts/main/step-ca-chart/.helmignore | 21 +++
.../ssn-helm-charts/main/step-ca-chart/Chart.yaml | 23 ++-
.../main/step-ca-chart/templates/_helpers.tpl | 21 +++
.../main/step-ca-chart/templates/bootstrap.yaml | 47 +++--
.../main/step-ca-chart/templates/ca.yaml | 203 ++++++++++++---------
.../main/step-ca-chart/templates/configmaps.yaml | 117 +++++++-----
.../main/step-ca-chart/templates/ingress.yaml | 63 ++++---
.../main/step-ca-chart/templates/rbac.yaml | 23 ++-
.../main/step-ca-chart/templates/secrets.yaml | 21 +++
.../main/step-ca-chart/templates/service.yaml | 35 +++-
.../templates/tests/test-connection.yaml | 27 ++-
.../ssn-helm-charts/main/step-ca-chart/values.yaml | 25 ++-
.../terraform/bin/deploy/billing_app_aws.yml | 21 +++
.../terraform/bin/deploy/billing_azure.yml | 21 +++
.../terraform/bin/deploy/billing_gcp.yml | 21 +++
.../terraform/bin/deploy/endpoint_fab.py | 29 ++-
infrastructure-provisioning/terraform/bin/dlab.py | 20 +-
.../terraform/bin/terraform-cli.py | 31 +++-
.../terraform/gcp/endpoint/provisioning.py | 25 ++-
.../terraform/gcp/main/main.tf | 29 ++-
.../terraform/gcp/main/variables.tf | 21 +++
.../terraform/gcp/modules/common/iam.tf | 25 ++-
.../terraform/gcp/modules/common/network.tf | 29 ++-
.../terraform/gcp/modules/common/variables.tf | 21 +++
.../terraform/gcp/modules/data_engine/instance.tf | 28 ++-
.../terraform/gcp/modules/data_engine/variables.tf | 21 +++
.../terraform/gcp/modules/dataproc/instance.tf | 83 +++++----
.../terraform/gcp/modules/dataproc/variables.tf | 21 +++
.../terraform/gcp/modules/notebook/instance.tf | 23 ++-
.../terraform/gcp/modules/notebook/variables.tf | 21 +++
.../helm_charts/files/get_configmap_values.sh | 21 +++
.../modules/helm_charts/step-ca-chart/.helmignore | 21 +++
.../modules/helm_charts/step-ca-chart/Chart.yaml | 23 ++-
.../step-ca-chart/templates/_helpers.tpl | 21 +++
.../step-ca-chart/templates/bootstrap.yaml | 47 +++--
.../helm_charts/step-ca-chart/templates/ca.yaml | 203 ++++++++++++---------
.../step-ca-chart/templates/configmaps.yaml | 117 +++++++-----
.../step-ca-chart/templates/ingress.yaml | 62 ++++---
.../helm_charts/step-ca-chart/templates/rbac.yaml | 23 ++-
.../step-ca-chart/templates/secrets.yaml | 21 +++
.../step-ca-chart/templates/service.yaml | 35 +++-
.../templates/tests/test-connection.yaml | 27 ++-
.../modules/helm_charts/step-ca-chart/values.yaml | 25 ++-
.../dlab/login/resources/css/login.css | 19 ++
.../keycloak-theme/dlab/login/theme.properties | 33 ++--
integration-tests-cucumber/pom.xml | 19 ++
.../main/java/org/apache/dlab/dto/EndpointDTO.java | 19 ++
.../java/org/apache/dlab/mongo/MongoDBHelper.java | 19 ++
.../java/org/apache/dlab/util/JacksonMapper.java | 19 ++
.../java/org/apache/dlab/util/PropertyHelper.java | 19 ++
.../src/test/java/dlab/Constants.java | 19 ++
.../src/test/java/dlab/RunCucumberTest.java | 19 ++
.../src/test/java/dlab/endpoint/EndpointSteps.java | 19 ++
.../src/test/java/dlab/login/LoginSteps.java | 19 ++
.../src/test/resources/config.properties | 18 ++
.../src/test/resources/dlab/endpoint.feature | 18 ++
.../src/test/resources/dlab/login.feature | 18 ++
.../test_templates/rstudio/template_preparation.r | 17 ++
.../rstudio/template_visualization.r | 17 ++
pom.xml | 40 +++-
.../main/java/com/epam/dlab/BillingService.java | 1 +
.../billing-aws/src/main/resources/application.yml | 21 +++
.../src/main/resources/application.yml | 21 +++
services/billing-gcp/billing.yml | 21 +++
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 11 +-
.../dlab/billing/gcp/model/BillingHistory.java | 19 ++
.../gcp/repository/BillingHistoryRepository.java | 19 ++
.../billing-gcp/src/main/resources/application.yml | 21 +++
.../dlab/auth/conf/AzureLoginConfiguration.java | 39 ----
.../epam/dlab/auth/conf/GcpLoginConfiguration.java | 33 ----
.../epam/dlab/dto/base/project/ProjectResult.java | 19 ++
.../epam/dlab/dto/project/ProjectActionDTO.java | 19 ++
.../epam/dlab/dto/project/ProjectCreateDTO.java | 19 ++
.../main/java/com/epam/dlab/model/StringList.java | 35 ++--
.../main/java/com/epam/dlab/util/FileUtils.java | 2 +-
services/provisioning-service/pom.xml | 14 ++
.../DropwizardBearerTokenFilterImpl.java | 19 ++
.../core/response/folderlistener/WatchItem.java | 20 +-
.../response/handlers/ProjectCallbackHandler.java | 23 ++-
.../handlers/dao/FileSystemCallbackHandlerDao.java | 6 +-
.../dlab/backendapi/resources/ProjectResource.java | 19 ++
.../dlab/backendapi/service/ProjectService.java | 19 ++
.../service/impl/CheckInactivityServiceImpl.java | 2 +-
.../dlab/backendapi/service/impl/KeyService.java | 2 +-
.../service/impl/ProjectServiceImpl.java | 47 +++--
.../service/impl/aws/BucketServiceAwsImpl.java | 113 ++++++------
.../service/impl/azure/BucketServiceAzureImpl.java | 8 +-
.../service/impl/gcp/BucketServiceGcpImpl.java | 10 +-
.../dlab/process/builder/ProcessInfoBuilder.java | 17 +-
services/self-service/entrypoint.sh | 21 +++
services/self-service/pom.xml | 11 ++
.../epam/dlab/backendapi/annotation/Project.java | 19 ++
.../backendapi/auth/KeycloakAuthenticator.java | 23 ++-
.../filters/DropwizardBearerTokenFilterImpl.java | 19 ++
.../dlab/backendapi/conf/CloudConfiguration.java | 21 ++-
.../backendapi/conf/KeycloakConfiguration.java | 19 ++
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 19 ++
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 19 ++
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 3 +
.../dlab/backendapi/domain/CreateProjectDTO.java | 19 ++
.../epam/dlab/backendapi/domain/ProjectDTO.java | 19 ++
.../dlab/backendapi/domain/ProjectEndpointDTO.java | 19 ++
.../backendapi/domain/UpdateProjectBudgetDTO.java | 19 ++
.../dlab/backendapi/domain/UpdateProjectDTO.java | 19 ++
.../dropwizard/bundles/DlabKeycloakBundle.java | 20 +-
.../dropwizard/listeners/MongoStartupListener.java | 23 ++-
.../listeners/RestoreHandlerStartupListener.java | 2 +-
.../backendapi/healthcheck/MongoHealthCheck.java | 2 +-
.../interceptor/BudgetLimitInterceptor.java | 11 --
.../backendapi/resources/KeycloakResource.java | 24 ++-
.../dlab/backendapi/resources/ProjectResource.java | 33 +++-
.../resources/callback/ProjectCallback.java | 19 ++
.../dlab/backendapi/resources/dto/KeysDTO.java | 25 ++-
.../resources/dto/ProjectActionFormDTO.java | 19 ++
.../schedulers/billing/BillingScheduler.java | 2 +-
.../endpoint/CheckEndpointStatusScheduler.java | 2 +-
.../dlab/backendapi/service/EndpointService.java | 19 ++
.../dlab/backendapi/service/GuacamoleService.java | 19 ++
.../dlab/backendapi/service/KeycloakService.java | 22 +++
.../backendapi/service/KeycloakServiceImpl.java | 23 ++-
.../dlab/backendapi/service/ProjectService.java | 41 +++--
.../dlab/backendapi/service/SecurityService.java | 19 ++
.../backendapi/service/SecurityServiceImpl.java | 19 ++
.../epam/dlab/backendapi/service/TagService.java | 19 ++
.../dlab/backendapi/service/TagServiceImpl.java | 21 ++-
.../service/impl/BillingServiceImpl.java | 38 ++--
.../backendapi/service/impl/BucketServiceImpl.java | 10 +-
.../service/impl/ComputationalServiceImpl.java | 3 +-
.../service/impl/EndpointServiceImpl.java | 103 ++++++-----
.../service/impl/ExploratoryServiceImpl.java | 4 +-
.../service/impl/GuacamoleServiceImpl.java | 25 ++-
.../service/impl/ProjectServiceImpl.java | 134 ++++++++------
.../servlet/guacamole/GuacamoleServlet.java | 37 +++-
.../epam/dlab/backendapi/util/KeycloakUtil.java | 43 +++--
.../src/main/resources/webapp/browserslist | 23 ++-
.../webapp/src/app/core/services/audit.service.ts | 19 ++
.../app/core/services/bucket-browser.service.ts | 19 ++
.../src/app/reports/audit/filter-audit.model.ts | 19 ++
.../buckets-tree/bucket-tree.component.html | 21 ++-
.../buckets-tree/bucket-tree.component.scss | 19 +-
.../buckets-tree/bucket-tree.component.ts | 19 ++
.../folder-tree/folder-tree.component.html | 21 ++-
.../folder-tree/folder-tree.component.scss | 18 ++
.../folder-tree/folder-tree.component.ts | 19 ++
.../src/app/webterminal/webterminal.component.html | 2 +-
.../backendapi/resources/KeycloakResourceTest.java | 25 ++-
.../backendapi/resources/ProjectResourceTest.java | 173 ++++++++++--------
.../service/KeycloakServiceImplTest.java | 135 ++++++++------
152 files changed, 3440 insertions(+), 1012 deletions(-)
diff --cc
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
index 3d1eec4,52163a1..073aca2
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
@@@ -60,15 -43,14 +60,15 @@@ public class BucketServiceAzureImpl imp
@Override
public List<BucketDTO> getObjects(String bucket) {
try {
- BlobServiceClient blobServiceClient = new
BlobServiceClientBuilder().connectionString(System.getenv("AZURE_STORAGE_CONNECTION_STRING")).buildClient();
- BlobContainerClient blobContainerClient =
blobServiceClient.getBlobContainerClient(bucket);
+ AzureStorageAccount account = getAzureStorageAccount(bucket);
+ BlobServiceClient blobServiceClient =
getBlobServiceClient(account.getStorageAccount());
+ BlobContainerClient blobContainerClient =
blobServiceClient.getBlobContainerClient(account.getContainer());
return blobContainerClient.listBlobs()
.stream()
- .map(blob -> toBucketDTO(bucket, blob))
+ .map(blob -> toBucketDTO(account.getContainer(), blob))
.collect(Collectors.toList());
} catch (Exception e) {
- log.error("Cannot retrieve objects from bucket {}. Reason: {}",
bucket, e.getMessage());
+ log.error("Cannot retrieve objects from bucket {}. Reason: {}",
bucket, e.getMessage(), e);
throw new DlabException(String.format("Cannot retrieve objects
from bucket %s. Reason: %s", bucket, e.getMessage()));
}
}
@@@ -113,12 -93,11 +113,12 @@@
@Override
public void deleteObjects(String bucket, List<String> objects) {
try {
- BlobServiceClient blobServiceClient = new
BlobServiceClientBuilder().connectionString(System.getenv("AZURE_STORAGE_CONNECTION_STRING")).buildClient();
- BlobContainerClient blobContainerClient =
blobServiceClient.getBlobContainerClient(bucket);
+ AzureStorageAccount account = getAzureStorageAccount(bucket);
+ BlobServiceClient blobServiceClient =
getBlobServiceClient(account.getStorageAccount());
+ BlobContainerClient blobContainerClient =
blobServiceClient.getBlobContainerClient(account.getContainer());
objects.forEach(object ->
blobContainerClient.getBlobClient(object).delete());
} catch (Exception e) {
- log.error("Cannot delete objects {} from bucket {}. Reason: {}",
objects, bucket, e.getMessage());
+ log.error("Cannot delete objects {} from bucket {}. Reason:
{}", objects, bucket, e.getMessage(), e);
throw new DlabException(String.format("Cannot delete objects %s
from bucket %s. Reason: %s", objects, bucket, e.getMessage()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
