This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1466 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from fa6e9fd [DLAB-1466]: Fixed set of minor issues add b567b4e Fixed typo add 66d895f Fixed typo add c3f8e2d Fixed typo add 58ad0b7 Merge pull request #1 from apache/develop add 5c24613 last call of create_tag(TAG) function overwrites user:tag('Value') with sbn+:+TAG('Value') add 8f4e6be Merge pull request #543 from leonidfrolov/develop add 5d85fbd [DLAB-1469]: Fixed issue with parameters add 7177e3b [DLAB-1469]: Fixed issue with result file add b004015 [DLAB-1469]: Fixed issue with result file add 592c9ba [DLAB-1469]: Fixed issue with result file add 73d12c3 [DLAB-1469]: Fixed issue with result file add 0d985e3 Merge pull request #544 from apache/DLAB-1469 add 10f841a fixed issue with endpoint parameters add 4274507 fixed issue with endpoint instance name add 2df7bd2 [DLAB-1466]:Fixed set of minor issues (#545) add f65cb24 [DLAB-1455]: Fixed [MS Edge browser]: UI style should be consistent add 9bc87e5 [DLAB-1405] Added note about SSN in pre-defined VPC termination (#547) add 24dc7ca [DLAB-1432] Multiple cloud support (#548) add 8821e63 Merge branch 'develop' into DLAB-1466 No new revisions were added by this update. Summary of changes: README.md | 24 +- .../src/general/files/gcp/ssn_Dockerfile | 1 - .../src/general/lib/aws/actions_lib.py | 4 +- .../src/general/scripts/aws/project_prepare.py | 3 +- .../src/general/scripts/azure/project_prepare.py | 2 +- .../general/scripts/gcp/common_prepare_notebook.py | 4 + .../scripts/gcp/dataengine-service_prepare.py | 3 + .../src/general/scripts/gcp/dataengine_prepare.py | 4 + .../terraform/aws/endpoint/main/outputs.tf | 12 + .../terraform/aws/endpoint/main/variables.tf | 16 +- .../terraform/bin/deploy/provisioning.yml | 3 +- infrastructure-provisioning/terraform/bin/dlab.py | 2 +- .../terraform/gcp/endpoint/main/outputs.tf | 8 + .../backendapi/ProvisioningServiceApplication.java | 5 +- .../healthcheck/ProvisioningHealthCheck.java | 30 -- .../resources/ProvisioningHealthCheckResource.java | 15 +- services/self-service/self-service.yml | 8 - .../dlab/backendapi/SelfServiceApplication.java | 8 +- .../conf/SelfServiceApplicationConfiguration.java | 33 +- .../epam/dlab/backendapi/dao/BaseBillingDAO.java | 33 +- .../com/epam/dlab/backendapi/dao/BillingDAO.java | 5 +- .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 8 +- .../java/com/epam/dlab/backendapi/dao/KeyDAO.java | 190 ---------- .../com/epam/dlab/backendapi/dao/MongoSetting.java | 2 +- .../com/epam/dlab/backendapi/dao/SettingsDAO.java | 8 +- .../com/epam/dlab/backendapi/dao/UserRoleDao.java | 7 +- .../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 59 ++- .../dlab/backendapi/dao/aws/AwsBillingDAO.java | 25 +- .../epam/dlab/backendapi/dao/aws/AwsKeyDao.java | 45 --- .../dlab/backendapi/dao/azure/AzureBillingDAO.java | 15 +- .../dlab/backendapi/dao/azure/AzureKeyDao.java | 47 --- .../dlab/backendapi/dao/gcp/GcpBillingDao.java | 21 +- .../epam/dlab/backendapi/dao/gcp/GcpKeyDao.java | 47 --- .../epam/dlab/backendapi/domain/EndpointDTO.java | 7 +- .../dlab/backendapi/domain/EnvStatusListener.java | 164 --------- .../backendapi/domain/ExploratoryLibCache.java | 17 +- .../dropwizard/listeners/MongoStartupListener.java | 28 +- .../listeners/RestoreHandlerStartupListener.java | 10 +- .../backendapi/modules/AwsSelfServiceModule.java | 18 +- .../backendapi/modules/AzureSelfServiceModule.java | 24 +- ...ServiceModule.java => CloudProviderModule.java} | 71 ++-- .../epam/dlab/backendapi/modules/DevModule.java | 2 - .../backendapi/modules/GcpSelfServiceModule.java | 16 - .../dlab/backendapi/modules/ModuleFactory.java | 7 +- .../dlab/backendapi/modules/ProductionModule.java | 2 - ...illingResourceGcp.java => BillingResource.java} | 34 +- .../dlab/backendapi/resources/EdgeResource.java | 74 ---- .../backendapi/resources/EndpointResource.java | 2 +- .../backendapi/resources/EnvironmentResource.java | 21 -- .../backendapi/resources/KeyUploaderResource.java | 131 ------- .../backendapi/resources/SecurityResource.java | 147 -------- .../resources/aws/BillingResourceAws.java | 80 ---- .../resources/aws/ComputationalResourceAws.java | 2 +- .../resources/azure/BillingResourceAzure.java | 80 ---- .../azure/ComputationalResourceAzure.java | 2 +- .../resources/callback/ComputationalCallback.java | 5 - .../resources/callback/ExploratoryCallback.java | 9 +- .../resources/callback/aws/EdgeCallbackAws.java | 65 ---- .../callback/aws/KeyUploaderCallbackAws.java | 66 ---- .../callback/azure/EdgeCallbackAzure.java | 63 ---- .../callback/azure/KeyUploaderCallbackAzure.java | 70 ---- .../resources/callback/base/EdgeCallback.java | 78 ---- .../callback/base/KeyUploaderCallback.java | 58 --- .../resources/callback/gcp/EdgeCallbackGcp.java | 63 ---- .../callback/gcp/KeyUploaderCallbackGcp.java | 68 ---- .../backendapi/resources/dto/BillingFilter.java | 11 +- .../resources/dto/ProjectInfrastructureInfo.java | 4 + .../resources/dto/aws/AwsBillingFilter.java | 43 --- .../resources/dto/azure/AzureBillingFilter.java | 41 --- .../resources/dto/gcp/GcpBillingFilter.java | 42 --- .../resources/gcp/ComputationalResourceGcp.java | 2 +- .../endpoint/CheckEndpointStatusScheduler.java | 2 +- .../dlab/backendapi/service/AccessKeyService.java | 9 - .../dlab/backendapi/service/BillingService.java | 10 +- .../epam/dlab/backendapi/service/EdgeService.java | 35 -- .../dlab/backendapi/service/EndpointService.java | 3 +- .../backendapi/service/EnvironmentService.java | 4 - .../backendapi/service/ReuploadKeyService.java | 4 - .../backendapi/service/UserResourceService.java | 33 -- .../backendapi/service/aws/AwsBillingService.java | 6 +- .../service/aws/AwsInfrastructureInfoService.java | 40 -- .../aws/AwsInfrastructureTemplateService.java | 56 --- .../service/azure/AzureBillingService.java | 6 +- .../azure/AzureInfrastructureInfoService.java | 45 --- .../azure/AzureInfrastructureTemplateService.java | 37 -- .../backendapi/service/gcp/GcpBillingService.java | 6 +- .../service/gcp/GcpInfrastructureInfoService.java | 40 -- .../gcp/GcpInfrastructureTemplateService.java | 55 --- .../service/impl/AccessKeyServiceImpl.java | 119 ------ .../service/impl/ComputationalServiceImpl.java | 40 +- .../backendapi/service/impl/EdgeServiceImpl.java | 153 -------- .../service/impl/EndpointServiceImpl.java | 41 ++- .../service/impl/EnvironmentServiceImpl.java | 36 +- .../service/impl/ExploratoryServiceImpl.java | 29 +- .../service/impl/GitCredentialServiceImpl.java | 7 +- .../service/impl/ImageExploratoryServiceImpl.java | 7 +- .../service/impl/InactivityServiceImpl.java | 21 +- ...ase.java => InfrastructureInfoServiceImpl.java} | 59 ++- ...java => InfrastructureTemplateServiceImpl.java} | 80 +++- .../service/impl/LibraryServiceImpl.java | 22 +- .../service/impl/ProjectServiceImpl.java | 25 +- .../service/impl/ReuploadKeyServiceImpl.java | 58 +-- .../service/impl/UserResourceServiceImpl.java | 95 ----- .../epam/dlab/backendapi/util/RequestBuilder.java | 258 ++++++------- ...fServiceCloudConfigurationSequenceProvider.java | 28 -- .../management/endpoints/endpoints.component.scss | 3 + .../project-form/project-form.component.html | 2 +- .../project/project-form/project-form.component.ts | 3 +- .../services/applicationServiceFacade.service.ts | 34 +- .../services/dataengineConfiguration.service.ts | 8 +- .../src/app/core/services/userResource.service.ts | 18 +- .../webapp/src/app/login/login.component.html | 8 +- .../webapp/src/app/login/login.component.ts | 5 - .../reporting-grid/reporting-grid.component.html | 32 +- .../src/app/reporting/reporting.component.ts | 24 +- .../cluster-details/cluster-details.component.html | 26 +- .../cluster-details/cluster-details.component.ts | 10 +- ...utational-resource-create-dialog.component.html | 13 +- ...mputational-resource-create-dialog.component.ts | 24 +- .../computational-resource-create.model.ts | 13 +- .../computational-resources-list.component.ts | 18 +- .../ami-create-dialog.component.html | 10 +- .../ami-create-dialog.component.ts | 7 +- .../cost-details-dialog.component.html | 22 +- .../cost-details-dialog.component.ts | 2 + .../create-environment.component.html | 10 +- .../create-environment.component.ts | 2 +- .../detail-dialog/detail-dialog.component.html | 14 +- .../detail-dialog/detail-dialog.component.ts | 1 + .../manage-ungit/manage-ungit.component.html | 2 +- .../resources-grid/resources-grid.component.html | 10 +- .../resources-grid/resources-grid.component.scss | 5 +- .../resources-grid/resources-grid.component.ts | 9 +- .../resources-grid/resources-grid.model.ts | 27 +- .../src/app/shared/navbar/navbar.component.ts | 1 - .../webapp/src/dictionary/aws.dictionary.ts | 41 +-- .../webapp/src/dictionary/azure.dictionary.ts | 42 +-- .../webapp/src/dictionary/gcp.dictionary.ts | 43 +-- .../webapp/src/dictionary/global.dictionary.ts | 43 ++- .../backendapi/resources/EdgeResourceTest.java | 164 --------- .../resources/EnvironmentResourceTest.java | 98 ----- .../resources/KeyUploaderResourceTest.java | 405 --------------------- .../service/aws/AwsBillingServiceTest.java | 29 +- .../aws/AwsInfrastructureInfoServiceTest.java | 47 --- .../aws/AwsInfrastructureTemplateServiceTest.java | 84 ----- .../service/azure/AzureBillingServiceTest.java | 28 +- .../azure/AzureInfrastructureInfoServiceTest.java | 57 --- .../AzureInfrastructureTemplateServiceTest.java | 38 -- .../gcp/GcpInfrastructureInfoServiceTest.java | 47 --- .../gcp/GcpInfrastructureTemplateServiceTest.java | 81 ----- .../service/impl/AccessKeyServiceImplTest.java | 311 ---------------- .../service/impl/ComputationalServiceImplTest.java | 49 +-- .../service/impl/EdgeServiceImplTest.java | 241 ------------ .../service/impl/EnvironmentServiceImplTest.java | 126 +------ .../service/impl/ExploratoryServiceImplTest.java | 30 +- .../service/impl/GitCredentialServiceImplTest.java | 12 +- .../impl/ImageExploratoryServiceImplTest.java | 13 +- .../InfrastructureTemplateServiceBaseTest.java | 22 +- .../service/impl/LibraryServiceImplTest.java | 29 +- .../service/impl/ReuploadKeyServiceImplTest.java | 276 +------------- .../service/impl/UserResourceServiceImplTest.java | 109 ------ 161 files changed, 1036 insertions(+), 5585 deletions(-) delete mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/healthcheck/ProvisioningHealthCheck.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/KeyDAO.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsKeyDao.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureKeyDao.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpKeyDao.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EnvStatusListener.java copy services/self-service/src/main/java/com/epam/dlab/backendapi/modules/{GcpSelfServiceModule.java => CloudProviderModule.java} (59%) rename services/self-service/src/main/java/com/epam/dlab/backendapi/resources/{gcp/BillingResourceGcp.java => BillingResource.java} (75%) delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EdgeResource.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/KeyUploaderResource.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/SecurityResource.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/BillingResourceAws.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/BillingResourceAzure.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/aws/EdgeCallbackAws.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/aws/KeyUploaderCallbackAws.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/azure/EdgeCallbackAzure.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/azure/KeyUploaderCallbackAzure.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/base/EdgeCallback.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/base/KeyUploaderCallback.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/gcp/EdgeCallbackGcp.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/gcp/KeyUploaderCallbackGcp.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/aws/AwsBillingFilter.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/azure/AzureBillingFilter.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/gcp/GcpBillingFilter.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/EdgeService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserResourceService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsInfrastructureInfoService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsInfrastructureTemplateService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/azure/AzureInfrastructureInfoService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/azure/AzureInfrastructureTemplateService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpInfrastructureInfoService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpInfrastructureTemplateService.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImpl.java rename services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/{InfrastructureInfoServiceBase.java => InfrastructureInfoServiceImpl.java} (66%) rename services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/{InfrastructureTemplateServiceBase.java => InfrastructureTemplateServiceImpl.java} (68%) delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserResourceServiceImpl.java delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/validation/SelfServiceCloudConfigurationSequenceProvider.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/resources/EdgeResourceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/resources/KeyUploaderResourceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsInfrastructureInfoServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsInfrastructureTemplateServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/azure/AzureInfrastructureInfoServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/azure/AzureInfrastructureTemplateServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/gcp/GcpInfrastructureInfoServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/gcp/GcpInfrastructureTemplateServiceTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/AccessKeyServiceImplTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImplTest.java delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserResourceServiceImplTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org