Bump the SBT version from 1.4.1 to 1.9.8

bags_api/src/main/scala/weco/storage_service/bags_api/BagsApi.scala

@@ -22,16 +22,45 @@ trait BagsApi
 
   protected val s3PresignedUrls: S3PresignedUrls
 
-  private val routes: Route = pathPrefix("bags") {
-    concat(
-      // We look for /versions at the end of the path: this means we should
-      // return a list of versions, not the complete manifest.
-      //
-      // The trailing slash is significant: it causes Akka to consume "/versions",
-      // rather than "versions".  If you omit it, the externalIdentifier gets a
-      // slash appended!
-      //
-      pathSuffix("versions" /) {
+  private val routes: Route = concat(
+    pathPrefix("bags") {
+      concat(
+        // We look for /versions at the end of the path: this means we should
+        // return a list of versions, not the complete manifest.
+        //
+        // The trailing slash is significant: it causes Akka to consume "/versions",
+        // rather than "versions".  If you omit it, the externalIdentifier gets a
+        // slash appended!
+        //
+        pathSuffix("versions" /) {
+          path(Segment / Remaining) {
+            (space, remaining) =>
+              get {
+                Try { decodeExternalIdentifier(remaining) } match {
+                  case Success(externalIdentifier) =>
+                    val bagId = BagId(
+                      space = StorageSpace(space),
+                      externalIdentifier = externalIdentifier
+                    )
+
+                    parameter('before.as[String] ?) { maybeBefore =>
+                      withFuture {
+                        lookupVersions(
+                          bagId = bagId,
+                          maybeBeforeString = maybeBefore
+                        )
+                      }
+                    }
+
+                  case Failure(_) =>
+                    notFound(
+                      s"No storage manifest versions found for $space/$remaining"
+                    )
+                }
+              }
+          }
+        },
+        // Look up a single manifest.
         path(Segment / Remaining) {
           (space, remaining) =>
             get {
@@ -42,84 +71,65 @@ trait BagsApi
                     externalIdentifier = externalIdentifier
                   )
 
-                  parameter('before.as[String] ?) { maybeBefore =>
-                    withFuture {
-                      lookupVersions(
-                        bagId = bagId,
-                        maybeBeforeString = maybeBefore
+                  val chemistAndDruggist = BagId(
+                    space = StorageSpace("digitised"),
+                    externalIdentifier = ExternalIdentifier("b19974760")
+                  )
+
+                  // This is some special casing to handle Chemist & Druggist, which
+                  // is enormous.  If somebody tries to retrieve it, direct them straight
+                  // to the cached response.
+                  //
+                  // We should fix the bags API so retrieving this API doesn't cause the
+                  // app to run out of heap space/memory.
+                  //
+                  // See https://github.com/wellcomecollection/platform/issues/4549
+                  bagId match {
+                    case id if id == chemistAndDruggist =>
+                      val url = s3PresignedUrls
+                        .getPresignedGetURL(
+                          location = S3ObjectLocation(
+                            bucket =
+                              "wellcomecollection-storage-prod-large-response-cache",
+                            key = "responses/digitised/b19974760/v1"
+                          ),
+                          expiryLength = 1 days
+                        )
+                        .right
+                        .get
+
+                      complete(
+                        HttpResponse(
+                          status = StatusCodes.TemporaryRedirect,
+                          headers = Location(url.toExternalForm) :: Nil
+                        )
                       )
-                    }
+                    case _ =>
+                      parameter('version.as[String] ?) { maybeVersionString =>
+                        withFuture {
+                          lookupBag(
+                            bagId = bagId,
+                            maybeVersionString = maybeVersionString
+                          )
+                        }
+                      }
                   }
 
                 case Failure(_) =>
-                  notFound(
-                    s"No storage manifest versions found for $space/$remaining"
-                  )
+                  notFound(s"Storage manifest $space/$remaining not found")
               }
             }
         }
-      },
-      // Look up a single manifest.
-      path(Segment / Remaining) { (space, remaining) =>
+      )
+    },
+    pathPrefix("management") {
+      path("healthcheck") {
         get {
-          Try { decodeExternalIdentifier(remaining) } match {
-            case Success(externalIdentifier) =>
-              val bagId = BagId(
-                space = StorageSpace(space),
-                externalIdentifier = externalIdentifier
-              )
-
-              val chemistAndDruggist = BagId(
-                space = StorageSpace("digitised"),
-                externalIdentifier = ExternalIdentifier("b19974760")
-              )
-
-              // This is some special casing to handle Chemist & Druggist, which
-              // is enormous.  If somebody tries to retrieve it, direct them straight
-              // to the cached response.
-              //
-              // We should fix the bags API so retrieving this API doesn't cause the
-              // app to run out of heap space/memory.
-              //
-              // See https://github.com/wellcomecollection/platform/issues/4549
-              bagId match {
-                case id if id == chemistAndDruggist =>
-                  val url = s3PresignedUrls
-                    .getPresignedGetURL(
-                      location = S3ObjectLocation(
-                        bucket =
-                          "wellcomecollection-storage-prod-large-response-cache",
-                        key = "responses/digitised/b19974760/v1"
-                      ),
-                      expiryLength = 1 days
-                    )
-                    .right
-                    .get
-
-                  complete(
-                    HttpResponse(
-                      status = StatusCodes.TemporaryRedirect,
-                      headers = Location(url.toExternalForm) :: Nil
-                    )
-                  )
-                case _ =>
-                  parameter('version.as[String] ?) { maybeVersionString =>
-                    withFuture {
-                      lookupBag(
-                        bagId = bagId,
-                        maybeVersionString = maybeVersionString
-                      )
-                    }
-                  }
-              }
-
-            case Failure(_) =>
-              notFound(s"Storage manifest $space/$remaining not found")
-          }
+          complete("ok")
         }
       }
-    )
-  }
+    }
+  )
 
   val bags: Route = wrapLargeResponses(routes)
 }

ingests/ingests_api/src/main/scala/weco/storage_service/ingests_api/IngestsApi.scala

@@ -10,15 +10,24 @@ trait IngestsApi[UnpackerDestination]
     extends CreateIngest[UnpackerDestination]
     with LookupIngest {
 
-  val ingests: Route = pathPrefix("ingests") {
-    post {
-      entity(as[RequestDisplayIngest]) { ingest =>
-        withFuture { createIngest(ingest) }
+  val ingests: Route = concat(
+    pathPrefix("ingests") {
+      post {
+        entity(as[RequestDisplayIngest]) { ingest =>
+          withFuture { createIngest(ingest) }
+        }
+      } ~ path(JavaUUID) { id: UUID =>
+        get {
+          withFuture { lookupIngest(id) }
+        }
       }
-    } ~ path(JavaUUID) { id: UUID =>
-      get {
-        withFuture { lookupIngest(id) }
+    },
+    pathPrefix("management") {
+      path("healthcheck") {
+        get {
+          complete("ok")
+        }
       }
     }
-  }
+  )
 }

project/Dependencies.scala

@@ -98,7 +98,7 @@ object ExternalDependencies {
 
     // This should match the version of circe used in scala-json; see
     // https://github.com/wellcomecollection/scala-json/blob/master/project/Dependencies.scala
-    val circeOptics = "0.13.0"
+    val circeOptics = "0.14.1"
 
     // This should match the version of aws used in scala-libs; see
     // https://github.com/wellcomecollection/scala-libs/blob/main/project/Dependencies.scala

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.1
+sbt.version=1.9.8

project/build.sbt

@@ -1 +1 @@
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.15"

project/plugins.sbt

@@ -1,4 +1,6 @@
+
 addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
 addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
 addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0")
+addDependencyTreePlugin

terraform/modules/service/bags/main.tf

@@ -40,7 +40,7 @@ module "base" {
 }
 
 module "nginx_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/nginx/apigw?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/nginx/apigw?ref=v4.0.0"
 
   forward_port      = var.container_port
   log_configuration = module.base.log_configuration
@@ -51,7 +51,7 @@ module "nginx_container" {
 }
 
 module "app_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v4.0.0"
   name   = "app"
 
   image = var.api_container_image
@@ -62,7 +62,7 @@ module "app_container" {
 }
 
 module "tracker_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v4.0.0"
   name   = "tracker"
 
   image = var.tracker_container_image

terraform/modules/service/bags/target_group.tf

@@ -14,7 +14,9 @@ resource "aws_lb_target_group" "tcp" {
   deregistration_delay = 90
 
   health_check {
-    protocol = "TCP"
+    protocol = "HTTP"
+    path     = var.healthcheck_path
+    matcher  = "200"
   }
 }
 

terraform/modules/service/bags/variables.tf

@@ -80,3 +80,8 @@ variable "nginx_container" {
     container_tag      = string
   })
 }
+
+variable "healthcheck_path" {
+  type    = string
+  default = "/management/healthcheck"
+}

terraform/modules/service/base/main.tf

@@ -1,5 +1,5 @@
 module "log_router_container" {
-  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/firelens?ref=v3.13.1"
+  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/firelens?ref=v4.0.0"
   namespace = var.service_name
 
   container_registry = var.logging_container["container_registry"]
@@ -8,13 +8,13 @@ module "log_router_container" {
 }
 
 module "log_router_container_secrets_permissions" {
-  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v3.13.1"
+  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v4.0.0"
   secrets   = module.log_router_container.shared_secrets_logging
   role_name = module.task_definition.task_execution_role_name
 }
 
 module "task_definition" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/task_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/task_definition?ref=v4.0.0"
 
   cpu    = var.cpu
   memory = var.memory
@@ -27,7 +27,7 @@ module "task_definition" {
 }
 
 module "service" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/service?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/service?ref=v4.0.0"
 
   cluster_arn  = var.cluster_arn
   service_name = var.service_name

terraform/modules/service/ingest/main.tf

@@ -45,7 +45,7 @@ module "base" {
 }
 
 module "nginx_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/nginx/apigw?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/nginx/apigw?ref=v4.0.0"
 
   forward_port      = var.external_api_container_port
   log_configuration = module.base.log_configuration
@@ -56,7 +56,7 @@ module "nginx_container" {
 }
 
 module "external_api_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v4.0.0"
   name   = "api"
 
   image = var.external_api_container_image
@@ -68,13 +68,13 @@ module "external_api_container" {
 }
 
 module "external_api_container_secrets_permissions" {
-  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v3.13.1"
+  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v4.0.0"
   secrets   = var.external_api_secrets
   role_name = module.base.task_execution_role_name
 }
 
 module "worker_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v4.0.0"
   name   = "worker"
 
   image = var.worker_container_image
@@ -86,13 +86,13 @@ module "worker_container" {
 }
 
 module "worker_container_secrets_permissions" {
-  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v3.13.1"
+  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v4.0.0"
   secrets   = var.worker_secrets
   role_name = module.base.task_execution_role_name
 }
 
 module "internal_api_container" {
-  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v3.13.1"
+  source = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/container_definition?ref=v4.0.0"
   name   = "tracker"
 
   image = var.internal_api_container_image
@@ -104,7 +104,7 @@ module "internal_api_container" {
 }
 
 module "internal_api_container_secrets_permissions" {
-  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v3.13.1"
+  source    = "git::github.com/wellcomecollection/terraform-aws-ecs-service.git//modules/secrets?ref=v4.0.0"
   secrets   = var.internal_api_secrets
   role_name = module.base.task_execution_role_name
 }

terraform/modules/service/ingest/target_group.tf

@@ -14,7 +14,9 @@ resource "aws_lb_target_group" "tcp" {
   deregistration_delay = 90
 
   health_check {
-    protocol = "TCP"
+    protocol = "HTTP"
+    path     = var.healthcheck_path
+    matcher  = "200"
   }
 }