This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1468 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 195c261df7f09b2f705d04c5f5997192f5e46734 Merge: 6b8fdec 134fe6e Author: leonidfrolov <[email protected]> AuthorDate: Mon Feb 17 10:13:41 2020 +0200 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop .../src/general/conf/dlab.ini | 2 +- .../scripts/aws/dataengine-service_configure.py | 2 +- .../scripts/aws/dataengine-service_prepare.py | 6 +- .../src/general/scripts/aws/ssn_configure.py | 4 + .../src/general/scripts/azure/ssn_configure.py | 4 + .../src/general/scripts/gcp/ssn_configure.py | 4 + .../terraform/azure/endpoint/main/instance.tf | 70 ++++++++++++ .../main/s3.tf => azure/endpoint/main/main.tf} | 28 +++-- .../terraform/azure/endpoint/main/network.tf | 98 +++++++++++++++++ .../buckets.tf => azure/endpoint/main/outputs.tf} | 23 ++-- .../terraform/azure/endpoint/main/sg.tf | 72 ++++++++++++ .../s3.tf => azure/endpoint/main/variables.tf} | 51 +++++++-- .../terraform/bin/deploy/endpoint_fab.py | 121 ++++++++------------- .../terraform/bin/deploy/provisioning.yml | 1 + infrastructure-provisioning/terraform/bin/dlab.py | 74 ++++++++++++- .../terraform/gcp/endpoint/main/variables.tf | 4 - .../dlab/login/resources/css/login.css | 1 + .../s3.tf => services/billing-azure/Dockerfile | 19 +--- .../billing/gcp/service/BillingServiceImpl.java | 2 +- .../epam/dlab/billing/gcp/util/BillingUtils.java | 6 +- .../epam/dlab/dto/azure/AzureCloudSettings.java | 16 +++ services/provisioning-service/provisioning.yml | 1 + .../epam/dlab/backendapi/CloudConfiguration.java | 1 + .../backendapi/core/commands/CommandBuilder.java | 11 +- .../backendapi/core/commands/RunDockerCommand.java | 5 + .../response/handlers/ComputationalConfigure.java | 42 ++++--- .../resources/GitExploratoryResource.java | 7 ++ .../dlab/backendapi/resources/ImageResource.java | 11 +- .../dlab/backendapi/resources/LibraryResource.java | 11 +- .../backendapi/resources/base/EdgeService.java | 8 ++ .../resources/base/ExploratoryService.java | 8 ++ .../resources/base/InfrastructureService.java | 43 ++++---- .../service/impl/CheckInactivityServiceImpl.java | 23 +++- .../service/impl/ProjectServiceImpl.java | 13 ++- .../service/impl/SparkClusterService.java | 27 ++++- .../epam/dlab/backendapi/domain/EndpointDTO.java | 8 +- .../backendapi/resources/EndpointResource.java | 3 +- .../service/impl/EndpointServiceImpl.java | 1 + .../services/applicationServiceFacade.service.ts | 7 ++ .../src/app/core/services/userResource.service.ts | 8 ++ .../webapp/src/app/core/util/sortUtils.ts | 5 + .../reporting-grid/reporting-grid.component.html | 2 +- .../reporting-grid/reporting-grid.component.scss | 4 + .../create-environment.component.html | 3 +- .../create-environment.component.ts | 19 +++- .../app/resources/exploratory/notebook.model.ts} | 39 +++---- .../resources-grid/resources-grid.component.scss | 4 + .../resources-grid/resources-grid.component.ts | 33 ++++-- .../resources/webapp/src/assets/styles/_theme.scss | 36 ++---- .../webapp/src/dictionary/azure.dictionary.ts | 2 +- 50 files changed, 742 insertions(+), 251 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
