Merge pull request #80 from hmrc/BDOG-302

BDOG-302 added jdk vendor information

Author: christopherjturner

app/uk/gov/hmrc/cataloguefrontend/connector/model/JDKVersion.scala

@@ -19,14 +19,16 @@ package uk.gov.hmrc.cataloguefrontend.connector.model
 import play.api.libs.json.{OFormat, __}
 import play.api.libs.functional.syntax._
 
-case class JDKVersion(name:String, version: String)
+case class JDKVersion(name:String, version: String, vendor: String, kind: String)
 
 trait JDKVersionFormats {
 
   val jdkFormat: OFormat[JDKVersion] =
     (
-      (__ \ "name"     ).format[String]
-    ~ (__ \ "jdkVersion" ).format[String]
+      (__ \ "name"    ).format[String]
+    ~ (__ \ "version" ).format[String]
+    ~ (__ \ "vendor"  ).format[String]
+    ~ (__ \ "kind"    ).format[String]
     )(JDKVersion.apply, unlift(JDKVersion.unapply))
 }
 

app/views/JdkVersionPage.scala.html

@@ -36,7 +36,17 @@ <h1 id="jdk-header">JDK Versions: @selected.asString</h1>
         <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
     </header>
 
-    <div id="chart_div"></div>
+    <div class="row">
+        <div class="col-sm-6" >
+            <h4>Versions</h4>
+            <div id="chart_div"></div>
+        </div>
+        <div class="col-sm-6" >
+            <h4>Vendors</h4>
+            <div id="chart_vendor_div"></div>
+        </div>
+    </div>
+
     <hr>
     <div>
     <form class="form-inline">
@@ -55,6 +65,7 @@ <h1 id="jdk-header">JDK Versions: @selected.asString</h1>
             <thead>
                 <tr>
                     <th>Service</th>
+                    <th>JDK Vendor</th>
                     <th>JDK Version</th>
                 </tr>
             </thead>
@@ -67,7 +78,14 @@ <h1 id="jdk-header">JDK Versions: @selected.asString</h1>
 
     <script type="text/javascript">
             google.charts.load('current', {'packages': ['corechart']});
-            google.charts.setOnLoadCallback(drawChart);
+            google.charts.setOnLoadCallback(drawAll);
+
+            function drawAll() {
+                drawChart();
+                drawVendorChart()
+            }
+
+            // draw jdk version chart
             function drawChart() {
 
                 var data = new google.visualization.DataTable();
@@ -79,21 +97,48 @@ <h1 id="jdk-header">JDK Versions: @selected.asString</h1>
                     }
                 ].sort());
 
-                var options = { 'title'    : 'JDK Usage',
-                    'width'    : "80%",
+                var options = {
+                    'width'    : "40%",
                     'height'   : 200,
-                    'chartArea': { 'width': '100%',
-                        'height': '100%'}};
+                    'chartArea': {
+                        'width': '100%',
+                        'height': '95%'
+                    }
+                };
                 var chart = new google.visualization.PieChart(document.getElementById('chart_div'));
                 chart.draw(data, options);
             }
 
+            function drawVendorChart() {
+                var data = new google.visualization.DataTable();
+                data.addColumn('string', 'Version');
+                data.addColumn('number', 'Count');
+                data.addRows([
+                    @for(r <- jdkVersions.groupBy(_.vendor).mapValues(_.length)) {
+                    ['@r._1', @r._2],
+                    }
+                ].sort());
+
+                var options = {
+                    'width'    : "40%",
+                    'height'   : 200,
+                    'chartArea': {
+                        'width': '100%',
+                        'height': '95%'
+                    }
+                };
+                var chart = new google.visualization.PieChart(document.getElementById('chart_vendor_div'));
+                chart.draw(data, options);
+            }
+
+
     </script>
 }
 
 @jdkVersion(version: JDKVersion) = {
     <tr id="jdk-slug-@version.name">
         <td><a href="@routes.CatalogueController.repository(version.name)">@version.name</a></td>
+        <td>@version.vendor</td>
         <td>@version.version</td>
     </tr>
 }

test/uk/gov/hmrc/cataloguefrontend/connector/ServiceDependenciesConnectorSpec.scala

@@ -322,6 +322,32 @@ class ServiceDependenciesConnectorSpec
     }
   }
 
+  "getJDKVersions" - {
+    "returns JDK versions with vendor" in new Setup {
+      serviceEndpoint(
+        GET,
+        s"/api/jdkVersions?flag=${SlugInfoFlag.Production.asString}",
+        willRespondWith = (
+          200,
+          Some(
+            """[
+              | {"name":"something-api",  "version":"1.8.0_181", "vendor": "Oracle", "kind": "JDK"}
+              |,{"name":"service-backend","version":"1.8.0_191", "vendor": "OpenJDK", "kind": "JRE"}
+              |]""".stripMargin)))
+
+      val response = serviceDependenciesConnector.getJDKVersions(SlugInfoFlag.Production).futureValue
+
+      response.head.name    shouldBe "something-api"
+      response.head.version shouldBe "1.8.0_181"
+      response.head.vendor  shouldBe "Oracle"
+
+      response(1).name    shouldBe "service-backend"
+      response(1).version shouldBe "1.8.0_191"
+      response(1).vendor  shouldBe "OpenJDK"
+
+    }
+  }
+
   private trait Setup {
     implicit val headerCarrier: HeaderCarrier = HeaderCarrier()
   }

test/uk/gov/hmrc/cataloguefrontend/service/DependenciesServiceSpec.scala

@@ -85,10 +85,10 @@ class SlugInfoServiceSpec
 
       when(boot.mockedServiceDependenciesConnector.getJDKVersions(SlugInfoFlag.Latest))
         .thenReturn(Future(List(
-          JDKVersion("test1", "1.181.1"),
-          JDKVersion("test2", "1.181.1"),
-          JDKVersion("test3", "1.191.1"),
-          JDKVersion("test4", "1.121.1"))))
+          JDKVersion(name = "test1", version = "1.181.1", vendor = "Oracle", kind = "JDK"),
+          JDKVersion(name = "test2", version = "1.181.1", vendor = "Oracle", kind = "JDK"),
+          JDKVersion(name = "test3", version = "1.191.1", vendor = "OpenJDK", kind = "JRE"),
+          JDKVersion(name = "test4", version = "1.121.1", vendor = "OpenJDK", kind = "JRE"))))
 
       await(boot.service.getJDKCountsForEnv(SlugInfoFlag.Latest)) shouldBe JDKUsageByEnv(SlugInfoFlag.Latest.asString, Map("1.181.1"-> 2, "1.191.1"->1, "1.121.1" -> 1))
     }

test/view/JDKVersionPageSpec.scala

@@ -36,22 +36,25 @@ class JDKVersionPageSpec extends WordSpec with MockitoSugar with Matchers {
     "show a list of slugs and what JDK they're using" in {
       implicit val request = FakeRequest()
 
-      val versions = List(JDKVersion("test-slug", "1.181.0"), JDKVersion("thing-service", "1.171.0"))
+      val versions = List(
+          JDKVersion(name = "test-slug",     version = "1.181.0", vendor = "OpenJDK", kind = "JDK")
+        , JDKVersion(name = "thing-service", version = "1.171.0", vendor = "Oracle", kind = "JRE"  ))
+
       val document = asDocument(new JdkVersionPage(msg)(versions, SlugInfoFlag.values, Latest))
 
       val slug1 = document.select("#jdk-slug-test-slug")
       val slug2 = document.select("#jdk-slug-thing-service")
 
-      slug1.select("#jdk-slug-test-slug").text() shouldBe "test-slug 1.181.0"
-      slug2.select("#jdk-slug-thing-service").text() shouldBe "thing-service 1.171.0"
+      slug1.select("#jdk-slug-test-slug").text() shouldBe "test-slug OpenJDK 1.181.0"
+      slug2.select("#jdk-slug-thing-service").text() shouldBe "thing-service Oracle 1.171.0"
 
     }
 
 
     "include a link to the repository" in {
       implicit val request = FakeRequest()
 
-      val versions = List(JDKVersion("thing-service", "1.171.0"))
+      val versions = List(JDKVersion(name= "thing-service", version = "1.171.0", vendor = "Oracle", kind = "JDK"))
       val document = asDocument(new JdkVersionPage(msg)(versions, SlugInfoFlag.values, Latest))
 
       val slug = document.select("#jdk-slug-thing-service")