This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 8017a10 [DLAB-1614] Convey Grafana credentials to DevOps
8017a10 is described below
commit 8017a10e85b775f4af07afc25c824cc7ea4516ad
Author: Oleh Fuks <[email protected]>
AuthorDate: Tue Mar 10 15:35:22 2020 +0200
[DLAB-1614] Convey Grafana credentials to DevOps
---
.../com/epam/dlab/dto/odahu/ActionOdahuDTO.java | 8 ++++++
.../com/epam/dlab/backendapi/dao/OdahuDAO.java | 3 +++
.../com/epam/dlab/backendapi/dao/OdahuDAOImpl.java | 29 +++++++++++++++++++---
.../dlab/backendapi/domain/OdahuFieldsDTO.java} | 23 +++++++++--------
.../backendapi/service/impl/OdahuServiceImpl.java | 4 ++-
.../epam/dlab/backendapi/util/RequestBuilder.java | 8 +++++-
6 files changed, 58 insertions(+), 17 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
index bf9bf1e..2b24540 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
@@ -33,4 +33,12 @@ public class ActionOdahuDTO extends
ResourceBaseDTO<ActionOdahuDTO> {
private final String project;
@JsonProperty("endpoint_name")
private final String endpoint;
+ @JsonProperty("grafana_admin")
+ private String grafanaAdmin;
+ @JsonProperty("grafana_pass")
+ private String grafanaPassword;
+ @JsonProperty("oauth_cookie_secret")
+ private String oauthCookieSecret;
+ @JsonProperty("odahuflow_connection_decrypt_token")
+ private String decryptToken;
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAO.java
index 9f75cf0..f323dbc 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAO.java
@@ -20,6 +20,7 @@
package com.epam.dlab.backendapi.dao;
import com.epam.dlab.backendapi.domain.OdahuDTO;
+import com.epam.dlab.backendapi.domain.OdahuFieldsDTO;
import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.base.odahu.OdahuResult;
@@ -29,6 +30,8 @@ import java.util.Optional;
public interface OdahuDAO {
Optional<OdahuDTO> getByProjectEndpoint(String project, String endpoint);
+ OdahuFieldsDTO getFields(String name, String project, String endpoint);
+
List<OdahuDTO> findOdahuClusters();
boolean create(OdahuDTO odahuDTO);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAOImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAOImpl.java
index b8787db..5ba4c80 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/OdahuDAOImpl.java
@@ -20,15 +20,18 @@
package com.epam.dlab.backendapi.dao;
import com.epam.dlab.backendapi.domain.OdahuDTO;
+import com.epam.dlab.backendapi.domain.OdahuFieldsDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.dto.ResourceURL;
import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.base.odahu.OdahuResult;
+import com.fasterxml.jackson.core.type.TypeReference;
import com.mongodb.BasicDBObject;
import com.mongodb.client.result.UpdateResult;
import org.bson.Document;
import org.bson.conversions.Bson;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -62,16 +65,30 @@ public class OdahuDAOImpl extends BaseDAO implements
OdahuDAO {
@Override
public Optional<OdahuDTO> getByProjectEndpoint(String project, String
endpoint) {
- Optional<ProjectDTO> one = findOne(PROJECTS_COLLECTION,
odahuProjectEndpointCondition(project, endpoint),
+ Optional<ProjectDTO> projectDTO = findOne(PROJECTS_COLLECTION,
odahuProjectEndpointCondition(project, endpoint),
fields(include(ODAHU_FIELD), excludeId()),
ProjectDTO.class);
- return one.flatMap(projectDTO -> projectDTO.getOdahu().stream()
+ return projectDTO.flatMap(p -> p.getOdahu()
+ .stream()
.filter(odahu -> project.equals(odahu.getProject()) &&
endpoint.equals(odahu.getEndpoint()))
.findAny());
}
@Override
+ public OdahuFieldsDTO getFields(String name, String project, String
endpoint) {
+ Optional<Document> one = findOne(PROJECTS_COLLECTION,
odahuProjectEndpointCondition(name, project, endpoint),
+ fields(include(ODAHU_FIELD), excludeId()));
+ OdahuFieldsDTO odahuFields = null;
+ if (one.isPresent()) {
+ List<OdahuFieldsDTO> list =
convertFromDocument(one.get().get(ODAHU_FIELD, ArrayList.class), new
TypeReference<List<OdahuFieldsDTO>>() {
+ });
+ odahuFields = list.get(0);
+ }
+ return odahuFields;
+ }
+
+ @Override
public List<OdahuDTO> findOdahuClusters() {
List<ProjectDTO> projectDTOS = find(PROJECTS_COLLECTION,
ProjectDTO.class);
return projectDTOS.stream()
@@ -105,8 +122,12 @@ public class OdahuDAOImpl extends BaseDAO implements
OdahuDAO {
dbObject.put(ODAHU_FIELD + ".$." + GRAFANA_PASSWORD_FIELD,
result.getGrafanaPassword());
dbObject.put(ODAHU_FIELD + ".$." + OAUTH_COOKIE_SECRET_FIELD,
result.getOauthCookieSecret());
dbObject.put(ODAHU_FIELD + ".$." + DECRYPT_TOKEN_FIELD,
result.getDecryptToken());
- updateOne(PROJECTS_COLLECTION, and(elemMatch(ODAHU_FIELD,
eq(NAME_FIELD, result.getName())),
- odahuProjectEndpointCondition(result.getProjectName(),
result.getEndpointName())), new Document(SET, dbObject));
+ updateOne(PROJECTS_COLLECTION,
odahuProjectEndpointCondition(result.getName(), result.getProjectName(),
result.getEndpointName()),
+ new Document(SET, dbObject));
+ }
+
+ private Bson odahuProjectEndpointCondition(String name, String
projectName, String endpointName) {
+ return and(elemMatch(ODAHU_FIELD, eq(NAME_FIELD, name)),
odahuProjectEndpointCondition(projectName, endpointName));
}
private Bson odahuProjectEndpointCondition(String projectName, String
endpointName) {
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuFieldsDTO.java
similarity index 64%
copy from
services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
copy to
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuFieldsDTO.java
index bf9bf1e..7a71795 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuFieldsDTO.java
@@ -17,20 +17,21 @@
* under the License.
*/
-package com.epam.dlab.dto.odahu;
+package com.epam.dlab.backendapi.domain;
-import com.epam.dlab.dto.ResourceBaseDTO;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
import lombok.Data;
@Data
-@Builder
-public class ActionOdahuDTO extends ResourceBaseDTO<ActionOdahuDTO> {
- @JsonProperty("odahu_cluster_name")
- private final String name;
- @JsonProperty("project_name")
- private final String project;
- @JsonProperty("endpoint_name")
- private final String endpoint;
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OdahuFieldsDTO {
+ @JsonProperty("grafana_admin")
+ private String grafanaAdmin;
+ @JsonProperty("grafana_pass")
+ private String grafanaPassword;
+ @JsonProperty("oauth_cookie_secret")
+ private String oauthCookieSecret;
+ @JsonProperty("odahuflow_connection_decrypt_token")
+ private String decryptToken;
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
index c122f40..eb2fcf5 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
@@ -26,6 +26,7 @@ import com.epam.dlab.backendapi.dao.OdahuDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.OdahuCreateDTO;
import com.epam.dlab.backendapi.domain.OdahuDTO;
+import com.epam.dlab.backendapi.domain.OdahuFieldsDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.backendapi.service.EndpointService;
@@ -155,10 +156,11 @@ public class OdahuServiceImpl implements OdahuService {
String url = null;
EndpointDTO endpointDTO = endpointService.get(endpoint);
try {
+ OdahuFieldsDTO fields = odahuDAO.getFields(name, project,
endpoint);
url = endpointDTO.getUrl() + uri;
String uuid =
provisioningService.post(url, user.getAccessToken(),
- requestBuilder.newOdahuAction(user, name, project,
endpointDTO), String.class);
+ requestBuilder.newOdahuAction(user, name, project,
endpointDTO, fields), String.class);
requestId.put(user.getName(), uuid);
} catch (Exception e) {
log.error("Can not perform {} due to: {}, {}", url,
e.getMessage(), e);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index 72f371b..10fda13 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -25,6 +25,7 @@ import com.epam.dlab.backendapi.dao.SettingsDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ExploratoryLibCache;
import com.epam.dlab.backendapi.domain.OdahuCreateDTO;
+import com.epam.dlab.backendapi.domain.OdahuFieldsDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.dto.BackupFormDTO;
import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO;
@@ -633,11 +634,16 @@ public class RequestBuilder {
.withCloudSettings(cloudSettings(user,
endpointDTO.getCloudProvider()));
}
- public ActionOdahuDTO newOdahuAction(UserInfo user, String name, String
project, EndpointDTO endpointDTO) {
+ public ActionOdahuDTO newOdahuAction(UserInfo user, String name, String
project, EndpointDTO endpointDTO,
+
OdahuFieldsDTO odahuFields) {
return ActionOdahuDTO.builder()
.name(name)
.project(project)
.endpoint(endpointDTO.getName())
+ .grafanaAdmin(odahuFields.getGrafanaAdmin())
+
.grafanaPassword(odahuFields.getGrafanaPassword())
+
.oauthCookieSecret(odahuFields.getOauthCookieSecret())
+ .decryptToken(odahuFields.getDecryptToken())
.build()
.withEdgeUserName(getEdgeUserName(user,
endpointDTO.getCloudProvider()))
.withCloudSettings(cloudSettings(user,
endpointDTO.getCloudProvider()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]