Merge pull request #39 from guardian/remove-commit-message-from-TipCo…

…nfig

Remove commit message from tip config

cloud/tip-create-board.js

@@ -10,7 +10,6 @@ function registerBoard(sha, board, repo, commitMessage, deployTime) {
                 sha: sha,
                 board: board,
                 repo: repo,
-                commitMessage: commitMessage,
                 deployTime: deployTime
             }
         }
@@ -23,9 +22,8 @@ exports.handler = (event, context, callback) => {
     const board = body.board;
     const sha = body.sha;
     const repo = body.repo;
-    const commitMessage = body.commitMessage;
     const deployTime = body.deployTime;
 
-    registerBoard(sha, board, repo, commitMessage, deployTime)
+    registerBoard(sha, board, repo, deployTime)
         .then(() => callback(null, {statusCode: 200, body: `{"field": "value"}`}));
 };

cloud/tip-get-board.js

@@ -31,7 +31,6 @@ function renderBoard(data) {
 
         const sha = data.Item.sha;
         const repo = data.Item.repo;
-        const commitMessage = data.Item.commitMessage.replace(/\n/g, '<br />');
         const numberOfVerifiedPaths = data.Item.board.filter( path => path.verified == true).length;
         const coverage = Math.round((100 * numberOfVerifiedPaths) / data.Item.board.length);
         const deployTime = data.Item.deployTime
@@ -110,11 +109,7 @@ function renderBoard(data) {
             <div id="container">
                 <h3>
                 <a href="${linkToCommit}">${repo} ${sha}</a>
-                
                 </h3>
-                <p>
-                ${commitMessage}
-                </p> 
                 
                 <hr>
                 

project/Dependencies.scala

@@ -1,7 +1,7 @@
 import sbt._
 
 object Dependencies {
-  val http4sVersion = "0.18.0-M7"
+  val http4sVersion = "0.18.15"
   val akkaVersion = "2.5.8"
 
   lazy val scalaTest =      "org.scalatest"               %%  "scalatest"           % "3.0.4"         % Test

src/main/scala/com/gu/tip/Configuration.scala

@@ -8,7 +8,7 @@ import net.ceedubs.ficus.readers.ArbitraryTypeReader._
 import net.jcazevedo.moultingyaml._
 
 import scala.util.Try
-import scala.io.Source.fromFile
+import scala.io.Source
 
 // $COVERAGE-OFF$
 
@@ -18,7 +18,6 @@ case class TipConfig(
     personalAccessToken: String,
     label: String,
     boardSha: String = "",
-    commitMessage: String = "",
     deployTime: String = ""
 )
 
@@ -59,11 +58,8 @@ class Configuration(config: TipConfig) {
   val tipConfig = config
 
   private def readFile(filename: String): String =
-    Option(getClass.getClassLoader.getResource(filename))
-      .map { path =>
-        fromFile(path.getPath).mkString
-      }
-      .getOrElse(throw new FileNotFoundException(
+    Try(Source.fromResource(filename).getLines.mkString("\n")).getOrElse(
+      throw new FileNotFoundException(
         s"Path definition file not found on the classpath: $filename"))
 
   def readPaths(filename: String): List[Path] =

src/main/scala/com/gu/tip/Tip.scala

@@ -122,9 +122,8 @@ object Tip
     val sha = configuration.tipConfig.boardSha
     val repo =
       s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}"
-    val commitMessage = configuration.tipConfig.commitMessage
-    val deployTime    = configuration.tipConfig.deployTime
-    createBoard(sha, repo, commitMessage, deployTime).run.attempt
+    val deployTime = configuration.tipConfig.deployTime
+    createBoard(sha, repo, deployTime).run.attempt
       .unsafeRunSync()
   }
 }
@@ -139,9 +138,8 @@ object TipFactory {
         val sha = configuration.tipConfig.boardSha
         val repo =
           s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}"
-        val commitMessage = configuration.tipConfig.commitMessage
-        val deployTime    = configuration.tipConfig.deployTime
-        createBoard(sha, repo, commitMessage, deployTime).run.attempt
+        val deployTime = configuration.tipConfig.deployTime
+        createBoard(sha, repo, deployTime).run.attempt
           .unsafeRunSync()
       }
     }
@@ -156,9 +154,8 @@ object TipFactory {
         val sha = configuration.tipConfig.boardSha
         val repo =
           s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}"
-        val commitMessage = configuration.tipConfig.commitMessage
-        val deployTime    = configuration.tipConfig.deployTime
-        createBoard(sha, repo, commitMessage, deployTime).run.attempt
+        val deployTime = configuration.tipConfig.deployTime
+        createBoard(sha, repo, deployTime).run.attempt
           .unsafeRunSync()
       }
     }

src/main/scala/com/gu/tip/cloud/TipCloudApi.scala

@@ -10,22 +10,20 @@ import net.liftweb.json._
 trait TipCloudApiIf { this: HttpClientIf with ConfigurationIf =>
   def createBoard(sha: String,
                   repo: String,
-                  commitMessage: String,
                   deployTime: String): WriterT[IO, List[Log], String]
   def verifyPath(sha: String, name: String): WriterT[IO, List[Log], String]
   def getBoard(sha: String): WriterT[IO, List[Log], String]
-
-  val tipCloudApiRoot =
-    "https://1g3v0a5b5h.execute-api.eu-west-1.amazonaws.com/PROD"
 }
 
 trait TipCloudApi extends TipCloudApiIf with LazyLogging {
   this: HttpClientIf with ConfigurationIf =>
 
+  val tipCloudApiRoot =
+    "https://1g3v0a5b5h.execute-api.eu-west-1.amazonaws.com/PROD"
+
   override def createBoard(
       sha: String,
       repo: String,
-      commitMessage: String,
       deployTime: String): WriterT[IO, List[Log], String] = {
     val paths = configuration.readPaths("tip.yaml")
 
@@ -43,8 +41,7 @@ trait TipCloudApi extends TipCloudApiIf with LazyLogging {
          |{
          |   "sha": "$sha",
          |   "repo": "$repo",
-         |   "commitMessage": "$commitMessage",
-         |   "deployTime": "$deployTime"
+         |   "deployTime": "$deployTime",
          |   "board": [
          |     ${board.mkString(",")}
          |   ]

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.4.3-SNAPSHOT"
+version in ThisBuild := "0.4.4-SNAPSHOT"