You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/04/28 15:58:59 UTC

[incubator-dlab] branch develop updated (50d7885 -> 6043482)

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 50d7885  [DLAB-1702]: Fixed time circle on scheduler (#711)
     add 6c28123  gcp bucket browser
     add 235798f  update BucketDTO
     add 94aa13c  code refactoring
     add 5dc1b13  bucket browser aws
     add f45a0d7  [DLAB-1551]: Merge UI in bucket browser (#701)
     add 40d6e90  Merge remote-tracking branch 'origin/bucket-browser-gcp' into bucket-browser-gcp
     add 1be8402  Update ssn_nginx.conf
     add 3b3a0fe  [Dlab 1551]: Fixed bug file download (#708)
     add d9074f8  Small fix
     add 2f2f49d  Fix merge bug
     add 59dc52b  Merge remote-tracking branch 'origin/bucket-browser-gcp' into bucket-browser-gcp
     add e84ca63  Added permissions for bucket browser
     add dcf66f1  Merge branch 'develop' into bucket-browser-gcp
     add 894465b  Added permission for bucket browser
     add 2153e48  [DLAB-1757]: Updated bucket browser according to roles
     add 416556b  bucket browser azure configs
     new 6043482  Merge branch 'bucket-browser-gcp' into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/ssn/templates/ssn.yml                      |   5 +
 .../src/ssn/templates/ssn_nginx.conf               |   2 +-
 .../java/com/epam/dlab/dto/bucket/BucketDTO.java}  |  17 +-
 .../epam/dlab/dto/bucket/BucketDownloadDTO.java}   |  16 +-
 services/dlab-webapp-common/pom.xml                |   5 +
 .../java/com/epam/dlab/ServiceConfiguration.java   |   9 +
 .../com/epam/dlab/constants/ServiceConsts.java     |  19 +-
 .../com/epam/dlab/rest/client/RESTService.java     |  62 ++++-
 .../epam/dlab/rest/client/RESTServiceFactory.java  |   5 +-
 services/provisioning-service/pom.xml              |  43 ++++
 .../backendapi/ProvisioningServiceApplication.java |  34 ++-
 .../backendapi/modules/GcpProvisioningModule.java  |   1 +
 .../dlab/backendapi/modules/ProductionModule.java  |  12 +
 .../backendapi/modules/ProvisioningDevModule.java  |  37 ++-
 .../dlab/backendapi/resources/BucketResource.java  |  93 ++++++++
 .../dlab/backendapi/service/BucketService.java}    |  14 +-
 .../service/impl/aws/BucketServiceAwsImpl.java     | 125 ++++++++++
 .../impl/azure/BucketServiceAzureImpl.java}        |  42 ++--
 .../service/impl/gcp/BucketServiceGcpImpl.java     | 109 +++++++++
 .../backendapi/modules/CloudProviderModule.java    |   2 +
 .../epam/dlab/backendapi/modules/DevModule.java    |   6 +
 .../dlab/backendapi/modules/ProductionModule.java  |   6 +
 .../dlab/backendapi/resources/BucketResource.java  | 106 +++++++++
 ...ImageInfoRecord.java => BucketDownloadDTO.java} |  18 +-
 .../resources/dto/HealthStatusPageDTO.java         |  11 +
 .../dlab/backendapi/resources/dto/UserRoleDto.java |   1 +
 .../{UserGroupService.java => BucketService.java}  |  16 +-
 .../backendapi/service/impl/BucketServiceImpl.java | 129 ++++++++++
 .../impl/InfrastructureInfoServiceImpl.java        |  18 +-
 .../src/main/resources/mongo/aws/mongo_roles.json  |  49 ++++
 .../main/resources/mongo/azure/mongo_roles.json    |  49 ++++
 .../src/main/resources/mongo/gcp/mongo_roles.json  |  48 ++++
 .../administration/management/management.model.ts  |   1 +
 .../administration/project/project.component.ts    |   1 -
 .../core/interceptors/http.token.interceptor.ts    |  10 +-
 .../src/app/core/services/appRouting.service.ts    |   1 +
 .../services/applicationServiceFacade.service.ts   |  40 +++-
 .../app/core/services/bucket-browser.service.ts    |  61 +++++
 .../webapp/src/app/core/util/fileUtils.ts          |  10 +
 .../bucket-browser/bucket-browser.component.html   | 131 +++++++++++
 .../bucket-browser/bucket-browser.component.scss   | 262 +++++++++++++++++++++
 .../bucket-browser/bucket-browser.component.ts     | 173 ++++++++++++++
 .../bucket-browser/bucket-data.service.ts          | 108 +++++++++
 .../folder-tree/folder-tree.component.html         |  32 +++
 .../folder-tree/folder-tree.component.scss         |  38 +++
 .../folder-tree/folder-tree.component.ts           | 211 +++++++++++++++++
 .../detail-dialog/detail-dialog.component.html     |  23 +-
 .../detail-dialog/detail-dialog.component.scss     |   5 +
 .../detail-dialog/detail-dialog.component.ts       |  24 +-
 .../resources-grid/resources-grid.component.ts     |  15 +-
 .../src/app/resources/resources.component.html     |   3 +
 .../src/app/resources/resources.component.ts       |   6 +
 .../webapp/src/app/resources/resources.module.ts   |  15 +-
 .../multi-level-select-dropdown.component.ts       |   6 +-
 .../webapp/src/assets/styles/_dialogs.scss         |   1 +
 .../InfrastructureTemplateServiceBaseTest.java     |  18 +-
 56 files changed, 2163 insertions(+), 141 deletions(-)
 copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/model/BillingPeriod.java => dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java} (80%)
 copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/model/BillingPeriod.java => dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDownloadDTO.java} (76%)
 create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
 copy services/{self-service/src/main/java/com/epam/dlab/backendapi/service/UserSettingService.java => provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java} (69%)
 create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
 copy services/{billing-aws/src/main/java/com/epam/dlab/core/aggregate/AggregateGranularity.java => provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java} (58%)
 create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
 copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{ImageInfoRecord.java => BucketDownloadDTO.java} (74%)
 copy services/self-service/src/main/java/com/epam/dlab/backendapi/service/{UserGroupService.java => BucketService.java} (65%)
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/01: Merge branch 'bucket-browser-gcp' into develop

Posted by of...@apache.org.
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 604348251c872dc862aaa0092fce86f1effd1320
Merge: 50d7885 416556b
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Tue Apr 28 18:32:33 2020 +0300

    Merge branch 'bucket-browser-gcp' into develop

 .../src/ssn/templates/ssn.yml                      |   5 +
 .../src/ssn/templates/ssn_nginx.conf               |   2 +-
 .../java/com/epam/dlab/dto/bucket/BucketDTO.java}  |  34 +--
 .../epam/dlab/dto/bucket/BucketDownloadDTO.java}   |  22 +-
 services/dlab-webapp-common/pom.xml                |   5 +
 .../java/com/epam/dlab/ServiceConfiguration.java   |   9 +
 .../com/epam/dlab/constants/ServiceConsts.java     |  19 +-
 .../com/epam/dlab/rest/client/RESTService.java     |  62 ++++-
 .../epam/dlab/rest/client/RESTServiceFactory.java  |   5 +-
 services/provisioning-service/pom.xml              |  43 ++++
 .../backendapi/ProvisioningServiceApplication.java |  34 ++-
 .../backendapi/modules/GcpProvisioningModule.java  |   1 +
 .../dlab/backendapi/modules/ProductionModule.java  |  12 +
 .../backendapi/modules/ProvisioningDevModule.java  |  37 ++-
 .../dlab/backendapi/resources/BucketResource.java  |  93 ++++++++
 .../dlab/backendapi/service/BucketService.java}    |  30 ++-
 .../service/impl/aws/BucketServiceAwsImpl.java     | 125 ++++++++++
 .../impl/azure/BucketServiceAzureImpl.java}        |  52 ++--
 .../service/impl/gcp/BucketServiceGcpImpl.java     | 109 +++++++++
 .../backendapi/modules/CloudProviderModule.java    |   2 +
 .../epam/dlab/backendapi/modules/DevModule.java    |   6 +
 .../dlab/backendapi/modules/ProductionModule.java  |   6 +
 .../dlab/backendapi/resources/BucketResource.java  | 106 +++++++++
 ...thStatusPageDTO.java => BucketDownloadDTO.java} |  37 +--
 .../resources/dto/HealthStatusPageDTO.java         |  11 +
 .../dlab/backendapi/resources/dto/UserRoleDto.java |   1 +
 .../dlab/backendapi/service/BucketService.java}    |  25 +-
 .../backendapi/service/impl/BucketServiceImpl.java | 129 ++++++++++
 .../impl/InfrastructureInfoServiceImpl.java        |  18 +-
 .../src/main/resources/mongo/aws/mongo_roles.json  |  49 ++++
 .../main/resources/mongo/azure/mongo_roles.json    |  49 ++++
 .../src/main/resources/mongo/gcp/mongo_roles.json  |  48 ++++
 .../administration/management/management.model.ts  |   1 +
 .../administration/project/project.component.ts    |   1 -
 .../core/interceptors/http.token.interceptor.ts    |  10 +-
 .../src/app/core/services/appRouting.service.ts    |   1 +
 .../services/applicationServiceFacade.service.ts   |  40 +++-
 .../app/core/services/bucket-browser.service.ts    |  61 +++++
 .../webapp/src/app/core/util/fileUtils.ts          |  10 +
 .../bucket-browser/bucket-browser.component.html   | 131 +++++++++++
 .../bucket-browser/bucket-browser.component.scss   | 262 +++++++++++++++++++++
 .../bucket-browser/bucket-browser.component.ts     | 173 ++++++++++++++
 .../bucket-browser/bucket-data.service.ts          | 108 +++++++++
 .../folder-tree/folder-tree.component.html         |  32 +++
 .../folder-tree/folder-tree.component.scss         |  38 +++
 .../folder-tree/folder-tree.component.ts           | 211 +++++++++++++++++
 .../detail-dialog/detail-dialog.component.html     |  23 +-
 .../detail-dialog/detail-dialog.component.scss     |   5 +
 .../detail-dialog/detail-dialog.component.ts       |  24 +-
 .../resources-grid/resources-grid.component.ts     |  15 +-
 .../src/app/resources/resources.component.html     |   3 +
 .../src/app/resources/resources.component.ts       |   6 +
 .../webapp/src/app/resources/resources.module.ts   |  15 +-
 .../multi-level-select-dropdown.component.ts       |   6 +-
 .../webapp/src/assets/styles/_dialogs.scss         |   1 +
 .../InfrastructureTemplateServiceBaseTest.java     |  18 +-
 56 files changed, 2187 insertions(+), 194 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org