This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch bucket-browser-azure in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3a7efccf02dda47134558abef74ed6b167c6a5f3 Merge: 83105e1 7ff249d Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Thu Jul 16 15:21:20 2020 +0300 Merge branch 'develop' into bucket-browser-azure # Conflicts: # services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java build.properties | 2 +- .../src/general/lib/os/debian/ssn_lib.py | 8 +- .../src/general/scripts/aws/project_terminate.py | 6 +- .../src/general/scripts/azure/project_terminate.py | 8 +- .../scripts/gcp/common_create_notebook_image.py | 92 ++++ .../general/scripts/gcp/common_prepare_notebook.py | 24 +- .../scripts/gcp/common_terminate_notebook_image.py | 62 +++ .../src/general/scripts/gcp/project_terminate.py | 2 +- .../templates/proxy_location_webapp_template.conf | 2 +- .../src/ssn/templates/supervisor_svc.conf | 4 +- .../terraform/bin/deploy/endpoint_fab.py | 8 +- .../terraform/bin/deploy/provisioning.yml | 5 + .../terraform/bin/deploy/supervisor_svc.conf | 2 +- pom.xml | 1 + services/billing-aws/Dockerfile | 4 +- services/billing-azure/Dockerfile | 4 +- services/billing-gcp/Dockerfile | 4 +- .../computational/AwsComputationalResource.java | 5 +- .../com/epam/dlab/dto/bucket/FolderUploadDTO.java} | 25 +- .../SparkStandaloneClusterResource.java | 5 +- .../computational/UserComputationalResource.java | 4 +- .../computational/GcpComputationalResource.java | 4 +- .../main/java/com/epam/dlab/model/StringList.java} | 34 +- .../java/com/epam/dlab/util/UsernameUtils.java | 2 +- .../epam/dlab/rest/contracts/ComputationalAPI.java | 1 + services/provisioning-service/pom.xml | 5 + .../dlab/backendapi/resources/BucketResource.java | 65 ++- .../azure/ComputationalResourceAzure.java | 2 +- .../dlab/backendapi/service/BucketService.java | 7 +- .../service/impl/aws/BucketServiceAwsImpl.java | 26 +- .../service/impl/azure/BucketServiceAzureImpl.java | 7 +- .../service/impl/gcp/BucketServiceGcpImpl.java | 26 +- .../mock_response/gcp/notebook_create_image.json | 17 + services/self-service/Dockerfile | 2 +- services/self-service/entrypoint.sh | 2 +- services/self-service/pom.xml | 5 + services/self-service/self-service.yml | 6 +- .../dlab/backendapi/SelfServiceApplication.java | 39 +- .../epam/dlab/backendapi/annotation/Audit.java} | 24 +- .../UserGroupDao.java => annotation/Info.java} | 18 +- .../ResourceName.java} | 18 +- .../conf/SelfServiceApplicationConfiguration.java | 7 + .../dao/{UserGroupDao.java => AuditDAO.java} | 15 +- .../com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 169 +++++++ .../epam/dlab/backendapi/dao/BaseBillingDAO.java | 28 +- .../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 2 + .../com/epam/dlab/backendapi/dao/BillingDAO.java | 3 + .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 12 +- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +- .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 15 +- .../com/epam/dlab/backendapi/dao/UserGroupDao.java | 1 + .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 28 +- .../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 20 +- .../dlab/backendapi/domain/AuditActionEnum.java} | 10 +- .../{BillingReport.java => AuditCreateDTO.java} | 28 +- .../domain/{BillingReport.java => AuditDTO.java} | 28 +- ...{BillingReport.java => AuditPaginationDTO.java} | 28 +- .../backendapi/domain/AuditResourceTypeEnum.java} | 10 +- .../epam/dlab/backendapi/domain/BillingReport.java | 2 +- .../epam/dlab/backendapi/domain/BudgetDTO.java} | 28 +- .../dlab/backendapi/domain/CreateProjectDTO.java | 3 +- .../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +- .../backendapi/domain/UpdateProjectBudgetDTO.java | 1 + .../backendapi/interceptor/AuditInterceptor.java | 127 ++++++ .../backendapi/modules/CloudProviderModule.java | 11 +- .../epam/dlab/backendapi/modules/DevModule.java | 6 + .../dlab/backendapi/modules/ProductionModule.java | 6 + .../dlab/backendapi/resources/AuditResource.java | 70 +++ .../dlab/backendapi/resources/BucketResource.java | 75 +++- .../backendapi/resources/EndpointResource.java | 16 +- .../backendapi/resources/ExploratoryResource.java | 11 +- .../backendapi/resources/GitCredsResource.java | 41 +- .../resources/ImageExploratoryResource.java | 7 +- .../backendapi/resources/KeycloakResource.java | 27 +- .../resources/LibExploratoryResource.java | 22 +- .../dlab/backendapi/resources/ProjectResource.java | 21 +- .../backendapi/resources/SchedulerJobResource.java | 7 +- .../backendapi/resources/UserGroupResource.java | 9 +- .../resources/aws/ComputationalResourceAws.java | 68 +-- .../azure/ComputationalResourceAzure.java | 76 ++-- .../dto/{GroupDTO.java => FolderUploadDTO.java} | 27 +- .../dlab/backendapi/resources/dto/GroupDTO.java | 3 +- .../resources/dto/HealthStatusPageDTO.java | 2 + .../resources/dto/ProjectInfrastructureInfo.java | 4 +- .../dto/{GroupDTO.java => UpdateGroupDTO.java} | 14 +- .../backendapi/resources/dto/UserResourceInfo.java | 70 +-- .../dlab/backendapi/resources/dto/UserRoleDto.java | 8 + .../resources/gcp/ComputationalResourceGcp.java | 104 ++--- .../{UserGroupService.java => AuditService.java} | 18 +- .../dlab/backendapi/service/BucketService.java | 8 +- .../backendapi/service/ComputationalService.java | 59 +-- .../dlab/backendapi/service/EndpointService.java | 6 +- .../backendapi/service/ExploratoryService.java | 10 +- .../service/ImageExploratoryService.java | 2 +- .../dlab/backendapi/service/LibraryService.java | 4 +- .../dlab/backendapi/service/ProjectService.java | 25 +- .../backendapi/service/SchedulerJobService.java | 5 +- .../backendapi/service/SecurityServiceImpl.java | 15 +- .../dlab/backendapi/service/UserGroupService.java | 9 +- .../backendapi/service/impl/AuditServiceImpl.java | 63 +++ .../service/impl/BillingServiceImpl.java | 36 +- .../backendapi/service/impl/BucketServiceImpl.java | 46 +- .../service/impl/ComputationalServiceImpl.java | 148 ++++--- .../service/impl/EndpointServiceImpl.java | 89 ++-- .../service/impl/EnvironmentServiceImpl.java | 73 ++-- .../service/impl/ExploratoryServiceImpl.java | 178 +++++--- .../service/impl/GitCredentialServiceImpl.java | 71 +-- .../service/impl/ImageExploratoryServiceImpl.java | 88 ++-- .../impl/InfrastructureInfoServiceImpl.java | 26 +- .../impl/InfrastructureTemplateServiceImpl.java | 35 +- .../service/impl/LibraryServiceImpl.java | 80 ++-- .../service/impl/ProjectServiceImpl.java | 204 ++++++--- .../service/impl/SchedulerJobServiceImpl.java | 231 +++++----- .../service/impl/UserGroupServiceImpl.java | 122 +++++- .../epam/dlab/backendapi/util/BillingUtils.java | 48 +- .../epam/dlab/backendapi/util/RequestBuilder.java | 154 +++---- .../management/endpoints/endpoints.component.ts | 9 +- .../manage-environment-dilog.component.html | 40 +- .../manage-environment-dilog.component.scss | 8 +- .../manage-environment-dilog.component.ts | 15 +- .../management-grid/management-grid.component.html | 94 +++- .../management-grid/management-grid.component.scss | 27 +- .../management-grid/management-grid.component.ts | 204 ++++++--- .../management/management.component.html | 37 +- .../management/management.component.ts | 108 ++++- .../administration/management/management.model.ts | 7 +- .../administration/project/project-data.service.ts | 13 +- .../project/project-form/project-form.component.ts | 50 ++- .../project-list/project-list.component.html | 6 +- .../project-list/project-list.component.scss | 6 +- .../app/administration/roles/roles.component.ts | 40 +- .../main/resources/webapp/src/app/app.module.ts | 10 +- .../resources/webapp/src/app/app.routing.module.ts | 14 +- .../resources/webapp/src/app/core/core.module.ts | 2 + .../convert-action-pipe/convert-action.pipe.ts} | 14 +- .../app/core/pipes/convert-action-pipe/index.ts} | 20 +- .../convert-file-size.pipe.ts} | 28 +- .../src/app/core/pipes/convert-file-size/index.ts} | 20 +- .../resources/webapp/src/app/core/pipes/index.ts | 1 + .../app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts | 6 +- .../src/app/core/services/appRouting.service.ts | 1 - .../services/applicationServiceFacade.service.ts | 24 +- .../webapp/src/app/core/services/audit.guard.ts} | 23 +- .../webapp/src/app/core/services/audit.service.ts | 47 ++ .../app/core/services/bucket-browser.service.ts | 8 + .../src/app/core/services/healthStatus.service.ts | 4 + .../webapp/src/app/core/services/index.ts | 1 + .../webapp/src/app/core/util/copyPathUtils.ts} | 30 +- .../resources/webapp/src/app/core/util/patterns.ts | 2 +- .../webapp/src/app/core/util/sortUtils.ts | 8 +- .../audit/audit-grid/audit-grid.component.html | 232 ++++++++++ .../audit/audit-grid/audit-grid.component.scss | 291 +++++++++++++ .../audit/audit-grid/audit-grid.component.ts | 308 +++++++++++++ .../audit-toolbar/audit-toolbar.component.html} | 7 +- .../audit-toolbar/audit-toolbar.component.scss} | 2 +- .../audit-toolbar/audit-toolbar.component.ts} | 40 +- .../src/app/reports/audit/audit.component.ts | 101 +++++ .../audit/audit.module.ts} | 27 +- .../src/app/reports/audit/filter-audit.model.ts | 27 ++ .../reporting-grid/reporting-grid.component.html | 6 +- .../reporting-grid/reporting-grid.component.scss | 0 .../reporting-grid/reporting-grid.component.ts | 17 +- .../{ => reports}/reporting/reporting.component.ts | 32 +- .../{ => reports}/reporting/reporting.module.ts | 6 +- .../reporting/toolbar/toolbar.component.html | 8 +- .../reporting/toolbar/toolbar.component.scss | 0 .../reporting/toolbar/toolbar.component.ts | 10 +- .../webapp/src/app/reports/reports.module.ts} | 25 +- .../bucket-browser/bucket-browser.component.html | 153 +++---- .../bucket-browser/bucket-browser.component.scss | 158 ++++--- .../bucket-browser/bucket-browser.component.ts | 297 +++++++++---- .../bucket-browser/bucket-browser.module.ts | 56 +++ .../bucket-confirmation-dialog.component.html | 82 ++-- .../bucket-confirmation-dialog.component.scss | 14 + .../bucket-browser/bucket-data.service.ts | 60 +-- .../buckets-tree/bucket-tree.component.html | 16 +- .../buckets-tree/bucket-tree.component.scss | 5 + .../buckets-tree/bucket-tree.component.ts | 84 ++-- .../folder-tree/folder-tree.component.html | 31 +- .../folder-tree/folder-tree.component.scss | 3 + .../folder-tree/folder-tree.component.ts | 174 +++----- .../cluster-details/cluster-details.component.html | 31 +- .../cluster-details/cluster-details.component.scss | 11 + .../cluster-details/cluster-details.component.ts | 34 +- ...utational-resource-create-dialog.component.html | 6 +- ...mputational-resource-create-dialog.component.ts | 20 +- .../computational-resources-list.component.scss | 10 +- .../cost-details-dialog.component.html | 4 +- .../create-environment.component.ts | 20 +- .../detail-dialog/detail-dialog.component.html | 173 ++++++-- .../detail-dialog/detail-dialog.component.scss | 16 +- .../detail-dialog/detail-dialog.component.ts | 42 +- .../exploratory/install-libraries/index.ts | 6 +- .../install-libraries.component.html | 11 +- .../install-libraries.component.scss | 4 + .../install-libraries.component.ts | 22 +- .../resources-grid/resources-grid.component.html | 66 ++- .../resources-grid/resources-grid.component.scss | 34 +- .../resources-grid/resources-grid.component.ts | 96 +++- .../resources-grid/resources-grid.model.ts | 10 +- .../src/app/resources/resources.component.html | 24 +- .../src/app/resources/resources.component.ts | 18 +- .../webapp/src/app/resources/resources.module.ts | 15 +- .../resources/scheduler/scheduler.component.html | 13 +- .../app/resources/scheduler/scheduler.component.ts | 9 +- .../webapp/src/app/shared/form-controls/index.ts | 17 +- .../multi-select-dropdown.component.html | 13 +- .../confirmation-dialog-type.enum.ts | 1 + .../confirmation-dialog.component.html | 14 +- .../confirmation-dialog.component.ts | 30 +- .../confirmation-dialog.model.ts | 3 + .../notification-dialog.component.ts | 27 +- .../webapp/src/app/shared/navbar/index.ts | 2 +- .../src/app/shared/navbar/navbar.component.html | 50 ++- .../src/app/shared/navbar/navbar.component.scss | 8 +- .../src/app/shared/navbar/navbar.component.ts | 2 +- .../webapp/src/assets/styles/_dialogs.scss | 66 ++- .../webapp/src/assets/styles/_general.scss | 2 + .../resources/webapp/src/assets/styles/_theme.scss | 126 +++++- .../src/main/resources/webapp/src/styles.scss | 12 + .../resources/ExploratoryResourceTest.java | 229 +++++----- .../resources/ImageExploratoryResourceTest.java | 14 +- .../resources/LibExploratoryResourceTest.java | 46 +- .../resources/SchedulerJobResourceTest.java | 25 +- .../resources/UserGroupResourceTest.java | 45 +- .../service/impl/ComputationalServiceImplTest.java | 75 ++-- .../service/impl/EnvironmentServiceImplTest.java | 110 ++--- .../service/impl/ExploratoryServiceImplTest.java | 164 +++---- .../impl/ImageExploratoryServiceImplTest.java | 10 +- .../service/impl/LibraryServiceImplTest.java | 15 +- .../service/impl/SchedulerJobServiceImplTest.java | 485 +++++++++++---------- .../service/impl/UserGroupServiceImplTest.java | 14 +- 232 files changed, 6331 insertions(+), 2882 deletions(-) diff --cc services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java index db0344c,1b55711..898a2e5 --- 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 @@@ -73,12 -56,11 +73,12 @@@ public class BucketServiceAzureImpl imp } @Override - public void uploadObject(String bucket, String object, InputStream stream, long fileSize) { + public void uploadObject(String bucket, String object, InputStream stream, String contentType, long fileSize) { log.info("Uploading file {} to bucket {}", object, 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()); BlobClient blobClient = blobContainerClient.getBlobClient(object); blobClient.upload(stream, fileSize); } catch (Exception e) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org