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 006e244  [DLAB-1614] Convey Grafana credentials to FE
006e244 is described below

commit 006e2443b3741740e0891c9dbcf0de7dffbc0801
Author: Oleh Fuks <[email protected]>
AuthorDate: Tue Mar 10 13:46:34 2020 +0200

    [DLAB-1614] Convey Grafana credentials to FE
---
 .../java/com/epam/dlab/dto/base/odahu/OdahuResult.java |  8 ++++++++
 .../core/response/handlers/OdahuCallbackHandler.java   | 15 ++++++++++++---
 .../main/resources/mock_response/aws/odahu_create.json |  6 +++++-
 .../resources/mock_response/azure/odahu_create.json    |  6 +++++-
 .../main/resources/mock_response/gcp/odahu_create.json |  6 +++++-
 .../java/com/epam/dlab/backendapi/dao/OdahuDAO.java    |  4 ++--
 .../com/epam/dlab/backendapi/dao/OdahuDAOImpl.java     | 18 +++++++++++++-----
 .../java/com/epam/dlab/backendapi/domain/OdahuDTO.java |  5 +++++
 .../dlab/backendapi/service/impl/OdahuServiceImpl.java |  3 +--
 9 files changed, 56 insertions(+), 15 deletions(-)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/odahu/OdahuResult.java
 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/odahu/OdahuResult.java
index 3398101..88349ed 100644
--- 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/odahu/OdahuResult.java
+++ 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/odahu/OdahuResult.java
@@ -35,6 +35,14 @@ public class OdahuResult extends StatusBaseDTO<OdahuResult> {
     private String projectName;
     @JsonProperty("endpoint_name")
     private String endpointName;
+    @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;
     @JsonProperty("odahu_urls")
     private List<ResourceURL> resourceUrls;
 }
diff --git 
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/OdahuCallbackHandler.java
 
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/OdahuCallbackHandler.java
index 4e4fd52..1c63819 100644
--- 
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/OdahuCallbackHandler.java
+++ 
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/OdahuCallbackHandler.java
@@ -35,6 +35,10 @@ import java.util.Objects;
 public class OdahuCallbackHandler extends ResourceCallbackHandler<OdahuResult> 
{
 
     private static final String ODAHU_URLS_FIELD = "odahu_urls";
+    private static final String GRAFANA_ADMIN = "grafana_admin";
+    private static final String GRAFANA_PASSWORD = "grafana_pass";
+    private static final String OAUTH_COOKIE_SECRET = "oauth_cookie_secret";
+    private static final String DECRYPT_TOKEN = 
"odahuflow_connection_decrypt_token";
     private final String callbackUri;
     private final String name;
     private final String projectName;
@@ -63,11 +67,16 @@ public class OdahuCallbackHandler extends 
ResourceCallbackHandler<OdahuResult> {
         if (resultNode == null) {
             return result;
         }
-        final JsonNode nodeUrl = resultNode.get(ODAHU_URLS_FIELD);
+        result.setGrafanaAdmin(getTextValue(resultNode.get(GRAFANA_ADMIN)));
+        
result.setGrafanaPassword(getTextValue(resultNode.get(GRAFANA_PASSWORD)));
+        
result.setOauthCookieSecret(getTextValue(resultNode.get(OAUTH_COOKIE_SECRET)));
+        result.setDecryptToken(getTextValue(resultNode.get(DECRYPT_TOKEN)));
+
+        final JsonNode odahuUrls = resultNode.get(ODAHU_URLS_FIELD);
         List<ResourceURL> urls = null;
-        if (nodeUrl != null) {
+        if (odahuUrls != null) {
             try {
-                urls = mapper.readValue(nodeUrl.toString(), new 
TypeReference<List<ResourceURL>>() {
+                urls = mapper.readValue(odahuUrls.toString(), new 
TypeReference<List<ResourceURL>>() {
                 });
                 result.setResourceUrls(urls);
             } catch (IOException e) {
diff --git 
a/services/provisioning-service/src/main/resources/mock_response/aws/odahu_create.json
 
b/services/provisioning-service/src/main/resources/mock_response/aws/odahu_create.json
index c0bc7f5..955d08b 100644
--- 
a/services/provisioning-service/src/main/resources/mock_response/aws/odahu_create.json
+++ 
b/services/provisioning-service/src/main/resources/mock_response/aws/odahu_create.json
@@ -11,7 +11,11 @@
           "url": "http://10.10.16.2:8085/";,
           "description": "Documentation"
         }
-      ]
+      ],
+      "oauth_cookie_secret": "WlFRZzhhZTJxbTFNa0JpUw==",
+      "odahuflow_connection_decrypt_token": "qfY2k5bA2M",
+      "grafana_pass": "7h0uum1EGe",
+      "grafana_admin": "grafana_admin"
     },
     "log": "/var/log/dlab/odahu/odahu_${EDGE_USER_NAME}_${REQUEST_ID}.log"
   },
diff --git 
a/services/provisioning-service/src/main/resources/mock_response/azure/odahu_create.json
 
b/services/provisioning-service/src/main/resources/mock_response/azure/odahu_create.json
index c0bc7f5..955d08b 100644
--- 
a/services/provisioning-service/src/main/resources/mock_response/azure/odahu_create.json
+++ 
b/services/provisioning-service/src/main/resources/mock_response/azure/odahu_create.json
@@ -11,7 +11,11 @@
           "url": "http://10.10.16.2:8085/";,
           "description": "Documentation"
         }
-      ]
+      ],
+      "oauth_cookie_secret": "WlFRZzhhZTJxbTFNa0JpUw==",
+      "odahuflow_connection_decrypt_token": "qfY2k5bA2M",
+      "grafana_pass": "7h0uum1EGe",
+      "grafana_admin": "grafana_admin"
     },
     "log": "/var/log/dlab/odahu/odahu_${EDGE_USER_NAME}_${REQUEST_ID}.log"
   },
diff --git 
a/services/provisioning-service/src/main/resources/mock_response/gcp/odahu_create.json
 
b/services/provisioning-service/src/main/resources/mock_response/gcp/odahu_create.json
index c0bc7f5..955d08b 100644
--- 
a/services/provisioning-service/src/main/resources/mock_response/gcp/odahu_create.json
+++ 
b/services/provisioning-service/src/main/resources/mock_response/gcp/odahu_create.json
@@ -11,7 +11,11 @@
           "url": "http://10.10.16.2:8085/";,
           "description": "Documentation"
         }
-      ]
+      ],
+      "oauth_cookie_secret": "WlFRZzhhZTJxbTFNa0JpUw==",
+      "odahuflow_connection_decrypt_token": "qfY2k5bA2M",
+      "grafana_pass": "7h0uum1EGe",
+      "grafana_admin": "grafana_admin"
     },
     "log": "/var/log/dlab/odahu/odahu_${EDGE_USER_NAME}_${REQUEST_ID}.log"
   },
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 a2b3895..9f75cf0 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,8 +20,8 @@
 package com.epam.dlab.backendapi.dao;
 
 import com.epam.dlab.backendapi.domain.OdahuDTO;
-import com.epam.dlab.dto.ResourceURL;
 import com.epam.dlab.dto.UserInstanceStatus;
+import com.epam.dlab.dto.base.odahu.OdahuResult;
 
 import java.util.List;
 import java.util.Optional;
@@ -35,5 +35,5 @@ public interface OdahuDAO {
 
     void updateStatus(String name, String project, String endpoint, 
UserInstanceStatus status);
 
-    void updateStatusAndUrls(String name, String project, String endpoint, 
List<ResourceURL> urls, UserInstanceStatus status);
+    void updateStatusAndUrls(OdahuResult result, UserInstanceStatus status);
 }
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 a84ad1d..b8787db 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
@@ -23,6 +23,7 @@ import com.epam.dlab.backendapi.domain.OdahuDTO;
 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.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
@@ -51,6 +52,10 @@ public class OdahuDAOImpl extends BaseDAO implements 
OdahuDAO {
     private static final String ENDPOINT_FIELD = "endpoint";
     private static final String PROJECT_FIELD = "project";
     private static final String STATUS_FIELD = "status";
+    private static final String GRAFANA_ADMIN_FIELD = "grafana_admin";
+    private static final String GRAFANA_PASSWORD_FIELD = "grafana_pass";
+    private static final String OAUTH_COOKIE_SECRET_FIELD = 
"oauth_cookie_secret";
+    private static final String DECRYPT_TOKEN_FIELD = 
"odahuflow_connection_decrypt_token";
     private static final String URLS_FIELD = "urls";
     private static final String COMPUTATIONAL_URL_DESC = "description";
     private static final String COMPUTATIONAL_URL_URL = "url";
@@ -92,13 +97,16 @@ public class OdahuDAOImpl extends BaseDAO implements 
OdahuDAO {
     }
 
     @Override
-    public void updateStatusAndUrls(String name, String project, String 
endpoint, List<ResourceURL> urls,
-                                    UserInstanceStatus status) {
+    public void updateStatusAndUrls(OdahuResult result, UserInstanceStatus 
status) {
         BasicDBObject dbObject = new BasicDBObject();
         dbObject.put(ODAHU_FIELD + ".$." + STATUS_FIELD, status.name());
-        dbObject.put(ODAHU_FIELD + ".$." + URLS_FIELD, 
getResourceUrlData(urls));
-        updateOne(PROJECTS_COLLECTION, and(elemMatch(ODAHU_FIELD, 
eq(NAME_FIELD, name)),
-                odahuProjectEndpointCondition(project, endpoint)), new 
Document(SET, dbObject));
+        dbObject.put(ODAHU_FIELD + ".$." + URLS_FIELD, 
getResourceUrlData(result.getResourceUrls()));
+        dbObject.put(ODAHU_FIELD + ".$." + GRAFANA_ADMIN_FIELD, 
result.getGrafanaAdmin());
+        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));
     }
 
     private Bson odahuProjectEndpointCondition(String projectName, String 
endpointName) {
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuDTO.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuDTO.java
index 2df13ac..6ecf35c 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuDTO.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/OdahuDTO.java
@@ -22,6 +22,7 @@ package com.epam.dlab.backendapi.domain;
 import com.epam.dlab.dto.ResourceURL;
 import com.epam.dlab.dto.UserInstanceStatus;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -35,6 +36,10 @@ public class OdahuDTO {
     private final String name;
     private final String project;
     private final String endpoint;
+    @JsonProperty("grafana_admin")
+    private String grafanaAdmin;
+    @JsonProperty("grafana_pass")
+    private String grafanaPassword;
     private final List<ResourceURL> urls = new ArrayList<>();
     private final UserInstanceStatus status;
     private final Map<String, String> tags;
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 6bd6cf8..c122f40 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
@@ -137,8 +137,7 @@ public class OdahuServiceImpl implements OdahuService {
     @Override
     public void updateStatus(OdahuResult result, UserInstanceStatus status) {
         if (Objects.nonNull(result.getResourceUrls()) && 
!result.getResourceUrls().isEmpty()) {
-            odahuDAO.updateStatusAndUrls(result.getName(), 
result.getProjectName(), result.getEndpointName(),
-                    result.getResourceUrls(), status);
+            odahuDAO.updateStatusAndUrls(result, status);
         } else {
             odahuDAO.updateStatus(result.getName(), result.getProjectName(), 
result.getEndpointName(), status);
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to