diff --git a/README.md b/README.md index b132732..d120a4d 100644 --- a/README.md +++ b/README.md @@ -30,18 +30,12 @@ How to verify the most important user journeys are not broken without writing a @Provides @Singleton def getTip(config: Config): Tip = { - val now = DateTimeFormat - .forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'") - .withZone(DateTimeZone.UTC) - .print(DateTime.now()) - val tipConfig = TipConfig( owner = "guardian", repo = "identity", personalAccessToken = config.Tip.personalAccessToken, // set to empty string "" if you do not need GitHub label functionality label = "Verified in PROD", - boardSha = BuildInfo.GitHeadSha, - deployTime = now + boardSha = BuildInfo.GitHeadSha ) if (config.App.stage == "PROD") diff --git a/cloud/tip-create-board.js b/cloud/tip-create-board.js index 143be56..7da5d9d 100644 --- a/cloud/tip-create-board.js +++ b/cloud/tip-create-board.js @@ -2,7 +2,7 @@ const AWS = require('aws-sdk'); AWS.config.update({region: 'eu-west-1'}); const ddb = new AWS.DynamoDB.DocumentClient(); -function registerBoard(sha, board, repo, deployTime) { +function registerBoard(sha, board, repo) { return ddb.put( { TableName: 'TipCloud-PROD', @@ -10,7 +10,7 @@ function registerBoard(sha, board, repo, deployTime) { sha: sha, board: board, repo: repo, - deployTime: deployTime + deployTime: (new Date()).toISOString() } } ).promise(); @@ -22,8 +22,7 @@ exports.handler = (event, context, callback) => { const board = body.board; const sha = body.sha; const repo = body.repo; - const deployTime = body.deployTime; - registerBoard(sha, board, repo, deployTime) + registerBoard(sha, board, repo) .then(() => callback(null, {statusCode: 200, body: `{"field": "value"}`})); }; diff --git a/src/main/scala/com/gu/tip/Configuration.scala b/src/main/scala/com/gu/tip/Configuration.scala index c239db2..f86b70c 100644 --- a/src/main/scala/com/gu/tip/Configuration.scala +++ b/src/main/scala/com/gu/tip/Configuration.scala @@ -12,14 +12,11 @@ import scala.io.Source // $COVERAGE-OFF$ -case class TipConfig( - owner: String, - repo: String, - personalAccessToken: String, - label: String, - boardSha: String = "", - deployTime: String = "" -) +case class TipConfig(owner: String, + repo: String, + personalAccessToken: String, + label: String, + boardSha: String = "") class TipConfigurationException( msg: String = "Missing TiP config. Please refer to README.") diff --git a/src/main/scala/com/gu/tip/Tip.scala b/src/main/scala/com/gu/tip/Tip.scala index 8d5eed4..21d4862 100644 --- a/src/main/scala/com/gu/tip/Tip.scala +++ b/src/main/scala/com/gu/tip/Tip.scala @@ -123,8 +123,7 @@ object Tip val sha = configuration.tipConfig.boardSha val repo = s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}" - val deployTime = configuration.tipConfig.deployTime - createBoard(sha, repo, deployTime).run.attempt + createBoard(sha, repo).run.attempt .unsafeRunSync() } } @@ -139,8 +138,7 @@ object TipFactory { val sha = configuration.tipConfig.boardSha val repo = s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}" - val deployTime = configuration.tipConfig.deployTime - createBoard(sha, repo, deployTime).run.attempt + createBoard(sha, repo).run.attempt .unsafeRunSync() } } @@ -155,8 +153,7 @@ object TipFactory { val sha = configuration.tipConfig.boardSha val repo = s"${configuration.tipConfig.owner}/${configuration.tipConfig.repo}" - val deployTime = configuration.tipConfig.deployTime - createBoard(sha, repo, deployTime).run.attempt + createBoard(sha, repo).run.attempt .unsafeRunSync() } } diff --git a/src/main/scala/com/gu/tip/cloud/TipCloudApi.scala b/src/main/scala/com/gu/tip/cloud/TipCloudApi.scala index f671daf..85d18d4 100644 --- a/src/main/scala/com/gu/tip/cloud/TipCloudApi.scala +++ b/src/main/scala/com/gu/tip/cloud/TipCloudApi.scala @@ -8,9 +8,7 @@ import com.typesafe.scalalogging.LazyLogging import net.liftweb.json._ trait TipCloudApiIf { this: HttpClientIf with ConfigurationIf => - def createBoard(sha: String, - repo: String, - deployTime: String): WriterT[IO, List[Log], String] + def createBoard(sha: String, repo: 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] } @@ -21,10 +19,8 @@ trait TipCloudApi extends TipCloudApiIf with LazyLogging { val tipCloudApiRoot = "https://i2i2l4x9kl.execute-api.eu-west-1.amazonaws.com/PROD" - override def createBoard( - sha: String, - repo: String, - deployTime: String): WriterT[IO, List[Log], String] = { + override def createBoard(sha: String, + repo: String): WriterT[IO, List[Log], String] = { val paths = configuration.readPaths("tip.yaml") val board = paths.map { path => @@ -41,7 +37,6 @@ trait TipCloudApi extends TipCloudApiIf with LazyLogging { |{ | "sha": "$sha", | "repo": "$repo", - | "deployTime": "$deployTime", | "board": [ | ${board.mkString(",")} | ]