config v2

Author: mcanoy

src/main/java/com/redhat/labs/omp/resource/ConfigResource.java

@@ -6,21 +6,44 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.redhat.labs.omp.models.gitlab.File;
 import com.redhat.labs.omp.service.ConfigService;
 
-@Path("/api/v1/config")
+@Path("/api")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public class ConfigResource {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigResource.class);
 
     @Inject
     ConfigService configService;
 
     @GET
+    @Path("/v1/config")
     public File get() {
         return configService.getConfigFile();
     }
 
+    @GET
+    @Path("/v2/config")
+    public Response getJson() {
+        File configFile = configService.getConfigFile();
+        ObjectMapper om = new ObjectMapper(new YAMLFactory());
+        try {
+            LOGGER.debug(configFile.getContent());
+            Object content =  om.readValue(configFile.getContent(), Object.class);
+            return Response.ok(content).build();
+        } catch (JsonProcessingException e) {
+            LOGGER.error(String.format("Error processing config file %s", configFile.getFilePath()), e);
+            return Response.serverError().build();
+        }
+    }
 }

src/test/java/com/redhat/labs/omp/resource/ConfigResourceTest.java

@@ -19,4 +19,19 @@ public void testGetConfigFileSuccess() {
 
     }
 
+    @Test
+    public void testGetConfigFileSuccessV2() {
+
+        given().when().contentType(ContentType.JSON).get("/api/v2/config").then().statusCode(200).body(is(
+                "{\"providers\":[{\"label\":\"AWS\",\"value\":\"ec2\",\"regions\":[{\"label\":\"US East 1 (N. Virginia)\","
+                + "\"value\":\"us-east-1\"},{\"label\":\"US East 2 (Ohio)\",\"value\":\"us-east-2\"}]}],\"openshift\":"
+                + "{\"versions\":[{\"label\":\"v4.1\",\"value\":\"4.1.31\"},{\"label\":\"v4.2\",\"value\":\"4.2.16\"},"
+                + "{\"label\":\"v4.3\",\"value\":\"4.3.0\"}],\"persistent-storage\":[{\"label\":\"None\",\"value\":\"none\"},"
+                + "{\"label\":\"50GB\",\"value\":\"50G\"},{\"label\":\"100GB\",\"value\":\"100G\"},{\"label\":\"250GB\",\"value\":"
+                + "\"250G\"},{\"label\":\"500GB\",\"value\":\"500G\"}],\"cluster-size\":[{\"label\":\"Small\",\"value\":\"small\"}]},"
+                + "\"user-management\":{\"rbac\":{\"roles\":[{\"label\":\"Developer\",\"value\":\"developer\"},{\"label\":\"Observer\",\"value\":\"observer\"},"
+                + "{\"label\":\"Admin\",\"value\":\"admin\"}]}}}"));
+
+    }
+
 }