This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new 1bfc7b6 [DLAB-1604] Make Cluster name unique per project
1bfc7b6 is described below
commit 1bfc7b68f2dfa66095764c7f2814e81513b9685e
Author: Oleh Fuks <[email protected]>
AuthorDate: Thu Mar 5 15:14:02 2020 +0200
[DLAB-1604] Make Cluster name unique per project
---
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 4 ++
.../resources/aws/ComputationalResourceAws.java | 16 ++++-
.../azure/ComputationalResourceAzure.java | 38 +++++-----
.../resources/dto/ComputationalTemplatesDTO.java | 35 +++++++++
.../resources/gcp/ComputationalResourceGcp.java | 24 +++++--
.../backendapi/service/ComputationalService.java | 3 +
.../service/impl/ComputationalServiceImpl.java | 83 ++++++++++++++++------
7 files changed, 156 insertions(+), 47 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
index 160ccce..93ed1d3 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
@@ -155,6 +155,10 @@ public class ExploratoryDAO extends BaseDAO {
return getUserInstances(and(eq(PROJECT, project)), false);
}
+ public List<UserInstanceDTO>
fetchExploratoryFieldsForProjectWithComp(String project) {
+ return getUserInstances(and(eq(PROJECT, project)), true);
+ }
+
/**
* Finds and returns the info of all user's notebooks whose status is
present among predefined ones.
*
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
index d2ed15d..1a53577 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
@@ -34,13 +34,18 @@ import com.epam.dlab.exceptions.DlabException;
import com.epam.dlab.rest.contracts.ComputationalAPI;
import com.google.inject.Inject;
import io.dropwizard.auth.Auth;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List;
@@ -57,12 +62,17 @@ import static
com.epam.dlab.dto.base.DataEngineType.SPARK_STANDALONE;
@Produces(MediaType.APPLICATION_JSON)
@Slf4j
public class ComputationalResourceAws implements ComputationalAPI {
-
@Inject
private SelfServiceApplicationConfiguration configuration;
@Inject
private ComputationalService computationalService;
+ @GET
+ @Path("/{project}/{endpoint}/templates")
+ public Response getTemplates(@Auth @Parameter(hidden = true) UserInfo
userInfo, @PathParam("project") String project,
+
@PathParam("endpoint") String endpoint) {
+ return
Response.ok(computationalService.getComputationalNamesAndTemplates(userInfo,
project, endpoint)).build();
+ }
/**
* Asynchronously creates EMR cluster
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java
index 1ba09d8..56c539f 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java
@@ -21,26 +21,27 @@ package com.epam.dlab.backendapi.resources.azure;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.auth.rest.UserSessionDurationAuthorizer;
-import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
-import com.epam.dlab.backendapi.dao.ComputationalDAO;
-import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm;
import com.epam.dlab.backendapi.roles.RoleType;
import com.epam.dlab.backendapi.roles.UserRoles;
import com.epam.dlab.backendapi.service.ComputationalService;
-import com.epam.dlab.constants.ServiceConsts;
import com.epam.dlab.dto.aws.computational.ClusterConfig;
import com.epam.dlab.exceptions.DlabException;
-import com.epam.dlab.rest.client.RESTService;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import io.dropwizard.auth.Auth;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.security.RolesAllowed;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List;
@@ -53,22 +54,19 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON)
@Slf4j
public class ComputationalResourceAzure {
+ private final ComputationalService computationalService;
@Inject
- private ExploratoryDAO exploratoryDAO;
-
- @Inject
- private ComputationalDAO computationalDAO;
-
- @Inject
- @Named(ServiceConsts.PROVISIONING_SERVICE_NAME)
- private RESTService provisioningService;
-
- @Inject
- private SelfServiceApplicationConfiguration configuration;
+ public ComputationalResourceAzure(ComputationalService
computationalService) {
+ this.computationalService = computationalService;
+ }
- @Inject
- private ComputationalService computationalService;
+ @GET
+ @Path("/{project}/{endpoint}/templates")
+ public Response getTemplates(@Auth @Parameter(hidden = true) UserInfo
userInfo, @PathParam("project") String project,
+
@PathParam("endpoint") String endpoint) {
+ return
Response.ok(computationalService.getComputationalNamesAndTemplates(userInfo,
project, endpoint)).build();
+ }
/**
* Asynchronously creates computational Spark cluster.
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalTemplatesDTO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalTemplatesDTO.java
new file mode 100644
index 0000000..9871918
--- /dev/null
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalTemplatesDTO.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.epam.dlab.backendapi.resources.dto;
+
+import com.epam.dlab.dto.base.computational.FullComputationalTemplate;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ComputationalTemplatesDTO {
+ private final List<FullComputationalTemplate> templates;
+ @JsonProperty("user_computations")
+ private final List<String> userComputations;
+ @JsonProperty("project_computations")
+ private final List<String> projectComputations;
+}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
index 43fca4a..6dc59c1 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
@@ -39,7 +39,13 @@ import lombok.extern.slf4j.Slf4j;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List;
@@ -55,12 +61,22 @@ import static com.epam.dlab.dto.UserInstanceStatus.CREATING;
@Produces(MediaType.APPLICATION_JSON)
@Slf4j
public class ComputationalResourceGcp implements ComputationalAPI {
+ private final SelfServiceApplicationConfiguration configuration;
+ private final ComputationalService computationalService;
@Inject
- private SelfServiceApplicationConfiguration configuration;
- @Inject
- private ComputationalService computationalService;
+ public ComputationalResourceGcp(SelfServiceApplicationConfiguration
configuration, ComputationalService computationalService) {
+ this.configuration = configuration;
+ this.computationalService = computationalService;
+ }
+
+ @GET
+ @Path("/{project}/{endpoint}/templates")
+ public Response getTemplates(@Auth @Parameter(hidden = true) UserInfo
userInfo, @PathParam("project") String project,
+
@PathParam("endpoint") String endpoint) {
+ return
Response.ok(computationalService.getComputationalNamesAndTemplates(userInfo,
project, endpoint)).build();
+ }
/**
* Asynchronously creates Dataproc cluster
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java
index 217e18e..4c489d0 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java
@@ -21,6 +21,7 @@ package com.epam.dlab.backendapi.service;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO;
+import com.epam.dlab.backendapi.resources.dto.ComputationalTemplatesDTO;
import com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm;
import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.aws.computational.ClusterConfig;
@@ -31,6 +32,8 @@ import java.util.List;
import java.util.Optional;
public interface ComputationalService {
+ ComputationalTemplatesDTO getComputationalNamesAndTemplates(UserInfo
user, String project, String endpoint);
+
/**
* Asynchronously triggers creation of Spark cluster
*
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java
index 52decf8..4f6f98a 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java
@@ -29,9 +29,11 @@ import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO;
+import com.epam.dlab.backendapi.resources.dto.ComputationalTemplatesDTO;
import com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm;
import com.epam.dlab.backendapi.service.ComputationalService;
import com.epam.dlab.backendapi.service.EndpointService;
+import com.epam.dlab.backendapi.service.InfrastructureTemplateService;
import com.epam.dlab.backendapi.service.ProjectService;
import com.epam.dlab.backendapi.service.TagService;
import com.epam.dlab.backendapi.util.RequestBuilder;
@@ -41,7 +43,12 @@ import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.aws.computational.ClusterConfig;
import com.epam.dlab.dto.base.DataEngineType;
import com.epam.dlab.dto.base.computational.ComputationalBase;
-import com.epam.dlab.dto.computational.*;
+import com.epam.dlab.dto.base.computational.FullComputationalTemplate;
+import com.epam.dlab.dto.computational.ComputationalClusterConfigDTO;
+import com.epam.dlab.dto.computational.ComputationalStatusDTO;
+import com.epam.dlab.dto.computational.ComputationalTerminateDTO;
+import com.epam.dlab.dto.computational.SparkStandaloneClusterResource;
+import com.epam.dlab.dto.computational.UserComputationalResource;
import com.epam.dlab.exceptions.DlabException;
import com.epam.dlab.exceptions.ResourceNotFoundException;
import com.epam.dlab.rest.client.RESTService;
@@ -51,12 +58,19 @@ import com.google.inject.Singleton;
import com.google.inject.name.Named;
import lombok.extern.slf4j.Slf4j;
+import java.util.Collection;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
-import static com.epam.dlab.dto.UserInstanceStatus.*;
+import java.util.stream.Collectors;
+
+import static com.epam.dlab.dto.UserInstanceStatus.CREATING;
+import static com.epam.dlab.dto.UserInstanceStatus.FAILED;
+import static com.epam.dlab.dto.UserInstanceStatus.RECONFIGURING;
+import static com.epam.dlab.dto.UserInstanceStatus.STARTING;
+import static com.epam.dlab.dto.UserInstanceStatus.STOPPING;
+import static com.epam.dlab.dto.UserInstanceStatus.TERMINATING;
import static com.epam.dlab.dto.base.DataEngineType.CLOUD_SERVICE;
import static com.epam.dlab.dto.base.DataEngineType.SPARK_STANDALONE;
import static
com.epam.dlab.rest.contracts.ComputationalAPI.COMPUTATIONAL_CREATE_CLOUD_SPECIFIC;
@@ -78,24 +92,54 @@ public class ComputationalServiceImpl implements
ComputationalService {
DATA_ENGINE_TYPE_TERMINATE_URLS.put(CLOUD_SERVICE,
ComputationalAPI.COMPUTATIONAL_TERMINATE_CLOUD_SPECIFIC);
}
+ private final ProjectService projectService;
+ private final ExploratoryDAO exploratoryDAO;
+ private final ComputationalDAO computationalDAO;
+ private final RESTService provisioningService;
+ private final RequestBuilder requestBuilder;
+ private final RequestId requestId;
+ private final TagService tagService;
+ private final EndpointService endpointService;
+ private final InfrastructureTemplateService templateService;
+
@Inject
- private ProjectService projectService;
- @Inject
- private ExploratoryDAO exploratoryDAO;
- @Inject
- private ComputationalDAO computationalDAO;
- @Inject
- @Named(ServiceConsts.PROVISIONING_SERVICE_NAME)
- private RESTService provisioningService;
- @Inject
- private RequestBuilder requestBuilder;
- @Inject
- private RequestId requestId;
- @Inject
- private TagService tagService;
- @Inject
- private EndpointService endpointService;
+ public ComputationalServiceImpl(ProjectService projectService,
ExploratoryDAO exploratoryDAO, ComputationalDAO computationalDAO,
+
@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService,
+
RequestBuilder requestBuilder, RequestId requestId, TagService tagService,
+
EndpointService endpointService, InfrastructureTemplateService templateService)
{
+ this.projectService = projectService;
+ this.exploratoryDAO = exploratoryDAO;
+ this.computationalDAO = computationalDAO;
+ this.provisioningService = provisioningService;
+ this.requestBuilder = requestBuilder;
+ this.requestId = requestId;
+ this.tagService = tagService;
+ this.endpointService = endpointService;
+ this.templateService = templateService;
+ }
+
+ @Override
+ public ComputationalTemplatesDTO
getComputationalNamesAndTemplates(UserInfo user, String project, String
endpoint) {
+ List<FullComputationalTemplate> computationalTemplates =
templateService.getComputationalTemplates(user, project, endpoint);
+ List<UserInstanceDTO> userInstances =
exploratoryDAO.fetchExploratoryFieldsForProjectWithComp(project);
+
+ List<String> projectComputations = userInstances
+ .stream()
+ .map(UserInstanceDTO::getResources)
+ .flatMap(Collection::stream)
+
.map(UserComputationalResource::getComputationalName)
+ .collect(Collectors.toList());
+ List<String> userComputations = userInstances
+ .stream()
+ .filter(instance ->
instance.getUser().equalsIgnoreCase(user.getName()))
+ .map(UserInstanceDTO::getResources)
+ .flatMap(Collection::stream)
+
.map(UserComputationalResource::getComputationalName)
+ .collect(Collectors.toList());
+
+ return new ComputationalTemplatesDTO(computationalTemplates,
userComputations, projectComputations);
+ }
@BudgetLimited
@Override
@@ -367,5 +411,4 @@ public class ComputationalServiceImpl implements
ComputationalService {
compResource.getDataEngineType() ==
SPARK_STANDALONE &&
compResource.getComputationalName().equals(computationalName);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]