Merge pull request #7 from project-streamzi/proprerties

Gets default properties from server

Author: sjwoodman

manager/pom.xml

@@ -45,5 +45,6 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
         </dependency>
+
     </dependencies>
 </project>

manager/src/main/java/io/streamzi/openshift/API.java

@@ -1,9 +1,10 @@
 package io.streamzi.openshift;
 
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.openshift.api.model.DeploymentConfig;
-import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
 import io.streamzi.openshift.dataflow.model.ProcessorFlow;
 import io.streamzi.openshift.dataflow.model.ProcessorNodeTemplate;
 import io.streamzi.openshift.dataflow.model.serialization.ProcessorFlowReader;
@@ -15,10 +16,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.ws.rs.*;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,6 +31,8 @@ public class API {
     @EJB(beanInterface = ClientContainer.class)
     private ClientContainer container;
 
+    private final String bootstrapServersDefault = "my-cluster-kafka";
+
     @GET
     @Path("/pods")
     @Produces("application/json")
@@ -98,6 +98,25 @@ public List<String> listProcessors() {
         //todo: look at applying labels to imagestreams and getting the necessary data from there.
         //todo: could apply special labels to the deployment configs to hold the graph structure.
 
+//        List<ImageStream> images = container.getOSClient().imageStreams().inAnyNamespace().withLabel("streamzi.io/kind", "processor").list().getItems();
+//        for (ImageStream image : images) {
+//            Map<String, String> labels = image.getMetadata().getLabels();
+//            final ProcessorNodeTemplate template = new ProcessorNodeTemplate();
+//            template.setId(labels.get("streamzi.io/processor/id"));
+//            template.setDescription(labels.get("streamzi.io/processor/description"));
+//            template.setName(labels.get("streamzi.io/processor/label"));
+//            template.setImageName(labels.get("streamzi.io/processor/imagename"));
+//
+//            String[] inputsLabel = labels.get("inputs").split(",");
+//            List<String> inputs = new ArrayList<>(Arrays.asList(inputsLabel));
+//
+//            String[] outputsLabel = labels.get("outputs").split(",");
+//            List<String> outputs = new ArrayList<>(Arrays.asList(outputsLabel));
+//
+//            template.setInputs(inputs);
+//            template.setOutputs(outputs);
+//        }
+
         File[] templates = container.getTemplateDir().listFiles();
         if (templates != null) {
             for (File f : templates) {
@@ -202,16 +221,16 @@ public void postFlow(String flowJson) {
 
             //remove DCs that are no longer required.
             List<DeploymentConfig> existingDCs = container.getOSClient().deploymentConfigs().inNamespace(container.getNamespace()).withLabel("app", flow.getName()).list().getItems();
-            for(DeploymentConfig existingDC : existingDCs){
+            for (DeploymentConfig existingDC : existingDCs) {
 
                 boolean found = false;
-                for(DeploymentConfig  newDC : deploymentConfigs){
-                    if(existingDC.getMetadata().getName().equals(newDC.getMetadata().getName())){
+                for (DeploymentConfig newDC : deploymentConfigs) {
+                    if (existingDC.getMetadata().getName().equals(newDC.getMetadata().getName())) {
                         found = true;
                     }
                 }
 
-                if(!found){
+                if (!found) {
                     logger.info("Removing DeploymentConfig: " + container.getNamespace() + "/" + existingDC.getMetadata().getName());
                     container.getOSClient().deploymentConfigs().inNamespace(container.getNamespace()).withName(existingDC.getMetadata().getName()).delete();
                 }
@@ -221,4 +240,26 @@ public void postFlow(String flowJson) {
             logger.log(Level.SEVERE, "Error parsing JSON flow data: " + e.getMessage(), e);
         }
     }
+
+    @GET
+    @Path("/globalproperties")
+    @Produces("application/json")
+    public String getGlobalProperties() {
+        final Properties props = new Properties();
+
+        String bootstrapServers = EnvironmentResolver.get("bootstrap.servers");
+        if (bootstrapServers != null && !bootstrapServers.equals("")) {
+            props.put("bootstrap_servers", bootstrapServers);
+        } else {
+            props.put("bootstrap_servers", bootstrapServersDefault);
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.writeValueAsString(props);
+        } catch (JsonProcessingException e) {
+            logger.severe(e.getMessage());
+            return "{}";
+        }
+    }
 }

manager/src/main/java/io/streamzi/openshift/EnvironmentResolver.java

@@ -0,0 +1,51 @@
+package io.streamzi.openshift;
+
+/**
+ * Simple class to look for an environment variable and then System.properties
+ * if it doesn't exist
+ *
+ * @author hhiden
+ */
+public class EnvironmentResolver {
+
+    public static String get(String key) {
+        String resolved = resolve(key);
+        if (resolved != null) {
+            return resolved;
+        }
+
+        resolved = resolve(key.toUpperCase());
+        if (resolved != null) {
+            return resolved;
+        }
+
+        resolved = resolve(key.replace(".", "_"));
+        if (resolved != null) {
+            return resolved;
+        }
+
+        resolved = resolve(key.replace(".", "_").replace("-", "_"));
+        if (resolved != null) {
+            return resolved;
+        }
+
+        resolved = resolve(key
+                .replace(".", "_")
+                .replace("-", "_")
+                .toUpperCase());
+
+        return resolved;
+    }
+
+    private static String resolve(String key) {
+
+        String value = System.getenv(key);
+
+        if (value != null) {
+            return value;
+        } else {
+            return System.getProperty(key);
+        }
+
+    }
+}

manager/src/main/webapp/js/ui.js

@@ -1,6 +1,7 @@
 blocks = new Blocks();
 blocks.scale = 1.4;
 var templateMap = {};
+var defaults = {};
 
 
 // Override the addBlock method to add some more stuff
@@ -40,6 +41,11 @@ blocks.addBlock = function (name, x, y){
         blocks.run('#blocks');
     });
 
+    fetchDefaults(function(data){
+      defaults = data;
+      console.log(defaults);
+    });
+
     //setupBlocksJs(data);
 
 
@@ -210,7 +216,7 @@ function exportJson(flowName) {
         links: linksArray,
         settings: {},
         globalSettings: {
-            STREAMZI_KAFKA_BOOTSTRAP_SERVER: "my-cluster-kafka-bootstrap:9092"
+            STREAMZI_KAFKA_BOOTSTRAP_SERVER: defaults.bootstrap_servers
         }
     };
 
@@ -312,6 +318,18 @@ function fetchNodeYaml(callback) {
     });
 }
 
+function fetchDefaults(callback) {
+
+    var promise = $.ajax({
+        url: "rest/api/globalproperties",
+        type: 'GET',
+        dataType: "json",
+        contentType: "application/json; charset=utf-8"
+    }).then(function (data) {
+        callback(data);
+    });
+}
+
 // THIS ISN'T A GUID
 function guid() {
   function s4() {