Merge branch 'main' into dependabot/npm_and_yarn/monitoring/ingest_in…

…spector/frontend/next-14.2.10

bag_unpacker/src/main/scala/weco/storage_service/bag_unpacker/storage/Unarchiver.scala

@@ -73,7 +73,7 @@ object Unarchiver {
       }
 
       override def next(): (ArchiveEntry, InputStream) =
-        (latest, new CloseShieldInputStream(archiveInputStream))
+        (latest, CloseShieldInputStream.wrap(archiveInputStream))
     }
 
   private def uncompress(

build.sbt

@@ -1,8 +1,6 @@
 import java.io.File
 import java.util.UUID
 
-import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider
-
 def setupProject(
   project: Project,
   folder: String,
@@ -195,13 +193,3 @@ lazy val ingests_indexer = setupProject(
   localDependencies = Seq(display, indexer_common),
   description = "Indexes information about ingests in an Elasticsearch cluster"
 )
-
-// AWS Credentials to read from S3
-
-s3CredentialsProvider := { _ =>
-  val builder = new STSAssumeRoleSessionCredentialsProvider.Builder(
-    "arn:aws:iam::760097843905:role/terraform-20210811133135108800000001",
-    UUID.randomUUID().toString
-  )
-  builder.build()
-}

common/src/main/scala/weco/storage/services/azure/AzureRangedReader.scala

@@ -35,7 +35,7 @@ class AzureRangedReader(implicit blobServiceClient: BlobServiceClient)
     }
 
     Try {
-      blobClient.downloadWithResponse(
+      blobClient.downloadStreamWithResponse(
         stream,
         blobRange,
         new DownloadRetryOptions,

indexer/reindexing/requirements.txt

@@ -1,6 +1,6 @@
 boto3==1.24.68
 botocore==1.27.68
-certifi==2022.6.15
+certifi==2024.7.4
 click==8.1.3
 elastic-transport==8.4.0
 elasticsearch==8.4.1

project/Dependencies.scala

@@ -1,98 +1,92 @@
 import sbt._
 
 object WellcomeDependencies {
-  val defaultVersion = "32.42.0" // This is automatically bumped by the scala-libs release process, do not edit this line manually
-
   lazy val versions = new {
-    val fixtures = defaultVersion
-    val http = defaultVersion
-    val json = defaultVersion
-    val elasticsearch = defaultVersion
-    val messaging = defaultVersion
-    val monitoring = defaultVersion
-    val storage = defaultVersion
-    val typesafe = defaultVersion
+    val typesafe = "32.42.1"
+    val fixtures = "32.42.1"
+    val http = "32.42.1"
+    val json = "32.42.1"
+    val messaging = "32.42.1"
+    val monitoring = "32.42.1"
+    val storage = "32.42.1"
+    val elasticsearch = "32.42.1"
+    val sierra = "32.42.1"
   }
 
-  val jsonLibrary: Seq[ModuleID] = library(
-    name = "json",
-    version = versions.json
+  val jsonLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "json" % versions.json,
+    "org.wellcomecollection" %% "json" % versions.json % "test" classifier "tests"
   )
 
-  val fixturesLibrary: Seq[ModuleID] = library(
-    name = "fixtures",
-    version = versions.fixtures
+  val fixturesLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "fixtures" % versions.fixtures,
+    "org.wellcomecollection" %% "fixtures" % versions.fixtures % "test" classifier "tests"
   )
 
-  val elasticsearchLibrary: Seq[ModuleID] = library(
-    name = "elasticsearch",
-    version = versions.elasticsearch
+  val messagingLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "messaging" % versions.messaging,
+    "org.wellcomecollection" %% "messaging" % versions.messaging % "test" classifier "tests"
   )
 
-  val messagingLibrary: Seq[ModuleID] = library(
-    name = "messaging",
-    version = versions.messaging
+  val elasticsearchLibrary: Seq[ModuleID] =  Seq(
+    "org.wellcomecollection" %% "elasticsearch" % versions.elasticsearch,
+    "org.wellcomecollection" %% "elasticsearch" % versions.elasticsearch % "test" classifier "tests"
   )
 
-  val monitoringLibrary: Seq[ModuleID] = library(
-    name = "monitoring",
-    version = versions.monitoring
+  val elasticsearchTypesafeLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "elasticsearch_typesafe" % versions.elasticsearch,
+    "org.wellcomecollection" %% "elasticsearch_typesafe" % versions.elasticsearch % "test" classifier "tests"
   )
 
-  val storageLibrary: Seq[ModuleID] = library(
-    name = "storage",
-    version = versions.storage
+  val httpLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "http" % versions.http,
+    "org.wellcomecollection" %% "http" % versions.http % "test" classifier "tests"
   )
 
-  val httpLibrary: Seq[ModuleID] = library(
-    name = "http",
-    version = versions.http
+  val httpTypesafeLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "http_typesafe" % versions.http,
+    "org.wellcomecollection" %% "http_typesafe" % versions.http % "test" classifier "tests"
   )
 
-  val httpTypesafeLibrary: Seq[ModuleID] = library(
-    name = "http_typesafe",
-    version = versions.http
+  val monitoringLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "monitoring" % versions.monitoring,
+    "org.wellcomecollection" %% "monitoring" % versions.monitoring % "test" classifier "tests"
   )
 
-  val typesafeLibrary: Seq[ModuleID] = library(
-    name = "typesafe_app",
-    version = versions.typesafe
-  ) ++ fixturesLibrary
-
-  val monitoringTypesafeLibrary: Seq[ModuleID] = library(
-    name = "monitoring_typesafe",
-    version = versions.monitoring
+  val monitoringTypesafeLibrary: Seq[ModuleID] = monitoringLibrary ++ Seq(
+    "org.wellcomecollection" %% "monitoring_typesafe" % versions.monitoring,
+    "org.wellcomecollection" %% "monitoring_typesafe" % versions.monitoring % "test" classifier "tests"
   )
 
-  val elasticsearchTypesafeLibrary: Seq[ModuleID] = library(
-    name = "elasticsearch_typesafe",
-    version = versions.elasticsearch
+  val storageLibrary: Seq[ModuleID] = Seq(
+    "org.wellcomecollection" %% "storage" % versions.storage,
+    "org.wellcomecollection" %% "storage" % versions.storage % "test" classifier "tests"
   )
 
-  val messagingTypesafeLibrary: Seq[ModuleID] = library(
-    name = "messaging_typesafe",
-    version = versions.messaging
-  )
+  val typesafeLibrary: Seq[ModuleID] =  Seq(
+    "org.wellcomecollection" %% "typesafe_app" % versions.typesafe,
+    "org.wellcomecollection" %% "typesafe_app" % versions.typesafe % "test" classifier "tests"
+  ) ++ fixturesLibrary
 
-  val storageTypesafeLibrary: Seq[ModuleID] = library(
-    name = "storage_typesafe",
-    version = versions.storage
-  )
+  val messagingTypesafeLibrary: Seq[ModuleID] = messagingLibrary ++ Seq(
+    "org.wellcomecollection" %% "messaging_typesafe" % versions.messaging,
+    "org.wellcomecollection" %% "messaging_typesafe" % versions.messaging % "test" classifier "tests"
+  ) ++ monitoringLibrary
 
-  private def library(name: String, version: String): Seq[ModuleID] = Seq(
-    "weco" %% name % version,
-    "weco" %% name % version % "test" classifier "tests"
+  val storageTypesafeLibrary: Seq[ModuleID] = storageLibrary ++ Seq(
+    "org.wellcomecollection" %% "storage_typesafe" % versions.storage,
+    "org.wellcomecollection" %% "storage_typesafe" % versions.storage % "test" classifier "tests"
   )
 }
 
 object ExternalDependencies {
   lazy val versions = new {
 
-    val azure = "12.7.0"
+    val azure = "12.25.3"
     val commonsCompress = "1.5"
-    val commonsIO = "2.6"
-    val mockito = "1.9.5"
-    val scalatest = "3.2.3"
+    val commonsIO = "2.16.1"
+    val mockito = "1.10.19"
+    val scalatest = "3.2.18"
     val scalatestPlus = "3.1.2.0"
     val scalatestPlusMockitoArtifactId = "mockito-3-2"
 
@@ -107,7 +101,7 @@ object ExternalDependencies {
     // These are the "Common Runtime Libraries", which you're encouraged to use for
     // better performance.
     // See https://docs.aws.amazon.com/sdkref/latest/guide/common-runtime.html
-    val awsCrt = "0.29.16"
+    val awsCrt = "0.29.17"
   }
 
   val azureDependencies: Seq[ModuleID] = Seq(
@@ -139,7 +133,7 @@ object ExternalDependencies {
   )
 
   val nettyDependencies: Seq[ModuleID] = Seq(
-    "io.netty" % "netty-tcnative" % "2.0.61.Final"
+    "io.netty" % "netty-tcnative" % "2.0.65.Final"
   )
 
   val awsTransferManagerDependencies: Seq[ModuleID] = Seq(

project/build.properties

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

project/build.sbt

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

project/plugins.sbt

@@ -1,6 +1,5 @@
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34")
-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
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
+addDependencyTreePlugin