Merge branch 'ld/java-sdk-upgrade-s3' into ld/java-sdk-iam

Author: lindseydew

app/controllers/IconikController.scala

@@ -6,7 +6,13 @@ import com.gu.pandahmac.HMACAuthActions
 import com.typesafe.config.Config
 import data.{DataStores, UnpackedDataStores}
 import play.api.libs.json.Json
-import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
+import play.api.mvc.{
+  Action,
+  AnyContent,
+  BaseController,
+  ControllerComponents,
+  Cookie
+}
 import util.AWSConfig
 
 class IconikController(
@@ -20,7 +26,15 @@ class IconikController(
     with JsonRequestParsing
     with Logging {
 
-  import authActions.{APIAuthAction, APIHMACAuthAction}
+  import authActions.{APIAuthAction, APIHMACAuthAction, AuthAction}
+
+  def switchShowIconikUiOn(): Action[AnyContent] = AuthAction { implicit req =>
+    Redirect("/", FOUND).withCookies(Cookie("showIconik", "true"))
+  }
+
+  def switchShowIconikUiOff(): Action[AnyContent] = AuthAction { implicit req =>
+    Redirect("/", FOUND).withCookies(Cookie("showIconik", "false"))
+  }
 
   def getWorkingGroup(groupId: String): Action[AnyContent] = APIAuthAction {
     stores.iconikDataStore.getWorkingGroup(groupId) match {

app/controllers/VideoUIApp.scala

@@ -8,7 +8,13 @@ import com.gu.pandomainauth.model.User
 import model.{ClientConfig, Presence}
 import play.api.Configuration
 import play.api.libs.json.Json
-import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
+import play.api.mvc.{
+  Action,
+  AnyContent,
+  BaseController,
+  ControllerComponents,
+  Cookie
+}
 import util.{AWSConfig, TrainingMode}
 import views.html.helper.CSRF
 
@@ -30,6 +36,11 @@ class VideoUIApp(
 
   def index(id: String = ""): Action[AnyContent] = AuthAction { implicit req =>
     val isTrainingMode = isInTrainingMode(req)
+    val shouldShowIconikUi = req.cookies.get("showIconik") match {
+      case Some(cookie) if cookie.value == "true"  => true
+      case Some(cookie) if cookie.value == "false" => false
+      case None => conf.get[String]("stage") != "PROD"
+    }
 
     val jsFileName = "video-ui/build/app.js"
 
@@ -61,7 +72,7 @@ class VideoUIApp(
       workflowUrl = awsConfig.workflowUrl,
       targetingUrl = awsConfig.targetingUrl,
       tagManagerUrl = awsConfig.tagManagerUrl,
-      showIconik = conf.get[String]("stage") != "PROD"
+      showIconik = shouldShowIconikUi
     )
 
     Ok(

app/model/commands/UpdateAtomCommand.scala

@@ -8,6 +8,10 @@ import com.gu.contentatom.thrift.{
   EventType,
   ChangeRecord => ThriftChangeRecord
 }
+import com.gu.media.iconik.{
+  IconikProjectAssignedToAtomMessage,
+  IconikUploadActions
+}
 import com.gu.media.logging.Logging
 import com.gu.media.model.{
   AtomAssignedProjectMessage,
@@ -20,7 +24,10 @@ import com.gu.media.util.MediaAtomImplicits
 import com.gu.pandomainauth.model.{User => PandaUser}
 import data.DataStores
 import model.commands.CommandExceptions._
-import model.commands.UpdateAtomCommand.createDiffString
+import model.commands.UpdateAtomCommand.{
+  createDiffString,
+  shouldNotifyThirdPartyServices
+}
 import org.joda.time.DateTime
 import util.AWSConfig
 
@@ -131,8 +138,7 @@ case class UpdateAtomCommand(
 
               val existingMediaAtom = MediaAtom.fromThrift(existingAtom)
               val updatedMediaAtom = MediaAtom.fromThrift(thrift)
-              processPlutoData(existingMediaAtom, updatedMediaAtom)
-
+              updateThirdPaties(existingMediaAtom, updatedMediaAtom)
               AuditMessage(
                 atom.id,
                 "Update",
@@ -157,16 +163,31 @@ case class UpdateAtomCommand(
       )
   }
 
-  private def processPlutoData(oldAtom: MediaAtom, newAtom: MediaAtom) = {
-    (
-      oldAtom.plutoData.flatMap(_.projectId),
-      newAtom.plutoData.flatMap(_.projectId)
-    ) match {
-      case (Some(oldProject), Some(newProject)) if oldProject != newProject =>
-        notifyPluto(newAtom)
-      case (None, Some(_)) => notifyPluto(newAtom)
-      case (_, _)          => None
+  private def updateThirdPaties(oldAtom: MediaAtom, newAtom: MediaAtom) = {
+    val oldIconikId = oldAtom.iconikData.flatMap(_.projectId)
+    val newIconikId = newAtom.iconikData.flatMap(_.projectId)
+    if (shouldNotifyThirdPartyServices(oldIconikId, newIconikId)) {
+      notifyIconik(newAtom)
     }
+
+    val oldPlutoId = oldAtom.plutoData.flatMap(_.projectId)
+    val newPlutoId = newAtom.plutoData.flatMap(_.projectId)
+    if (shouldNotifyThirdPartyServices(oldPlutoId, newPlutoId)) {
+      notifyPluto(newAtom)
+    }
+  }
+
+  private def notifyIconik(newAtom: MediaAtom) = {
+    val iconikUploadActions = new IconikUploadActions(awsConfig)
+    newAtom.iconikData.foreach(iconikData =>
+      iconikUploadActions.sendMessage(
+        IconikProjectAssignedToAtomMessage(
+          newAtom.id,
+          newAtom.assets,
+          iconikData
+        )
+      )
+    )
   }
 
   private def notifyPluto(newAtom: MediaAtom) = {
@@ -202,4 +223,16 @@ object UpdateAtomCommand {
       "Updated atom fields"
     } else s"Updated atom fields (${changedFields.mkString(", ")})"
   }
+
+  def shouldNotifyThirdPartyServices(
+      oldProjectId: Option[String],
+      newProjectId: Option[String]
+  ): Boolean = {
+    (oldProjectId, newProjectId) match {
+      case (Some(oldProject), Some(newProject)) if oldProject != newProject =>
+        true
+      case (None, Some(_)) => true
+      case (_, _)          => false
+    }
+  }
 }

app/util/PlutoMessageConsumer.scala

@@ -71,20 +71,9 @@ case class PlutoMessageConsumer(val stores: DataStores, awsConfig: AWSConfig)
 
     (bodyJson \ "Message").validate[PlutoMessage] match {
       case JsSuccess(plutoMessage, _) => {
-
-        awsConfig.s3Client.deleteObject(
-          DeleteObjectRequest
-            .builder()
-            .bucket(awsConfig.userUploadBucket)
-            .key(plutoMessage.s3Key)
-            .build()
+        log.info(
+          s"Processing Pluto message to delete asset for s3Key: ${plutoMessage.s3Key}. nb. Deletion is currently disabled so this is a no-op."
         )
-
-        stores.pluto.get(plutoMessage.s3Key) match {
-          case Some(upload) => stores.pluto.delete(plutoMessage.s3Key)
-          case _            =>
-        }
-
       }
       case undefined =>
         log.error(

app/util/UploadBuilder.scala

@@ -30,6 +30,7 @@ object UploadBuilder {
       region = aws.awsV2Region.id(),
       title = atom.title,
       pluto = plutoData,
+      iconikData = atom.iconikData,
       selfHost = request.selfHost,
       runtime = getRuntimeMetadata(request.selfHost, atom.channelId),
       asset = getAsset(

common/src/main/scala/com/gu/media/aws/SQSAccess.scala

@@ -6,10 +6,12 @@ import com.gu.media.Settings
 trait SQSAccess { this: Settings with AwsAccess =>
 
   lazy val plutoQueueUrl: String = getMandatoryString("aws.sqs.plutoQueueUrl")
+  lazy val iconikQueueUrl: String = getMandatoryString("aws.sqs.iconikQueueUrl")
 
   lazy val sqsClient =
     SqsClient
       .builder()
       .credentialsProvider(credentials.instance.awsV2Creds)
+      .region(awsV2Region)
       .build()
 }

common/src/main/scala/com/gu/media/iconik/IconikUploadActions.scala

@@ -0,0 +1,58 @@
+package com.gu.media.iconik
+
+import com.gu.media.Settings
+import com.gu.media.aws.SQSAccess
+import com.gu.media.model.{Asset, IconikData}
+import play.api.libs.json.{Json, OFormat}
+import com.gu.media.logging.Logging
+import software.amazon.awssdk.services.sqs.model.SendMessageRequest
+
+sealed trait IconikMessage {
+  def atomId: String
+  def toJsonString: String
+}
+
+case class IconikProjectAssignedToAtomMessage(
+    atomId: String,
+    assets: List[Asset],
+    iconikData: IconikData
+) extends IconikMessage {
+  override def toJsonString: String =
+    Json.stringify(Json.toJson(this))
+}
+
+object IconikProjectAssignedToAtomMessage {
+  implicit val format: OFormat[IconikProjectAssignedToAtomMessage] =
+    Json.format[IconikProjectAssignedToAtomMessage]
+}
+
+case class AssetUploadedToAtomMessage(
+    atomId: String,
+    uploadS3Key: String,
+    iconikData: Option[IconikData]
+) extends IconikMessage {
+  override def toJsonString: String =
+    Json.stringify(Json.toJson(this))
+}
+
+object AssetUploadedToAtomMessage {
+  implicit val format: OFormat[AssetUploadedToAtomMessage] =
+    Json.format[AssetUploadedToAtomMessage]
+}
+
+class IconikUploadActions(config: Settings with SQSAccess) extends Logging {
+  def sendMessage(message: IconikMessage) = {
+    val payload = message.toJsonString
+    log.info(
+      s"Updating Iconik with latest change for atom: $payload"
+    )
+    config.sqsClient.sendMessage(
+      SendMessageRequest
+        .builder()
+        .queueUrl(config.iconikQueueUrl)
+        .messageBody(payload)
+        .build()
+    )
+  }
+
+}

common/src/main/scala/com/gu/media/upload/model/UploadMetadata.scala

@@ -3,14 +3,20 @@ package com.gu.media.upload.model
 import com.gu.ai.x.play.json.Jsonx
 import com.gu.ai.x.play.json.Encoders._
 import play.api.libs.json.Format
-import com.gu.media.model.{PlutoSyncMetadataMessage, VideoAsset, VideoSource}
+import com.gu.media.model.{
+  IconikData,
+  PlutoSyncMetadataMessage,
+  VideoAsset,
+  VideoSource
+}
 
 case class UploadMetadata(
     user: String,
     bucket: String,
     region: String,
     title: String,
     pluto: PlutoSyncMetadataMessage,
+    iconikData: Option[IconikData],
     runtime: RuntimeUploadMetadata,
     version: Option[Long] = None,
     selfHost: Boolean = false,

common/src/main/scala/com/gu/media/youtube/package.scala

@@ -47,7 +47,8 @@ package object youtube {
     "science" -> "gdnpfpscience",
     "athletics" -> "gdnpfpsportother",
     "basketball" -> "gdnpfpsportus",
-    "sport-2-0" -> "gdnpfpsport20"
+    "sport-2-0" -> "gdnpfpsport20",
+    "full-story-podcast" -> "gdnpfpausfullstorypodcast"
   )
 
   case class YouTubeVideoCategory(id: Int, title: String)

common/src/test/scala/com/gu/media/upload/UploadTest.scala

@@ -116,6 +116,7 @@ class UploadTest
     region = "local",
     title = "my-video",
     pluto = plutoMessage,
+    iconikData = None,
     runtime = SelfHostedUploadMetadata(Nil),
     subtitleVersion = Some(12),
     subtitleSource =
@@ -128,6 +129,7 @@ class UploadTest
     region = "local",
     title = "my-video",
     pluto = plutoMessage,
+    iconikData = None,
     runtime = SelfHostedUploadMetadata(Nil)
   )
 }