rollback

wellcomecollection · Apr 15, 2024 · da363b8 · da363b8
1 parent 425a115
commit da363b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/bag_replicator/docker-compose.yml b/bag_replicator/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     image: "public.ecr.aws/localstack/localstack:3.0.0"
     environment:
       - SERVICES=sqs
-      - USE_SINGLE_REGION=1
-      - DEFAULT_REGION=eu-west-1
     ports:
       - "4566:4566"
   s3:

diff --git a/bag_replicator/src/main/scala/weco/storage_service/bag_replicator/Main.scala b/bag_replicator/src/main/scala/weco/storage_service/bag_replicator/Main.scala
@@ -4,7 +4,7 @@ import akka.actor.ActorSystem
 import com.azure.storage.blob.{BlobServiceClient, BlobServiceClientBuilder}
 import com.typesafe.config.Config
 
-import software.amazon.awssdk.services.s3.{S3AsyncClient, S3Client}
+import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.presigner.S3Presigner
 import software.amazon.awssdk.services.sqs.SqsAsyncClient
 import software.amazon.awssdk.transfer.s3.S3TransferManager
@@ -46,12 +46,8 @@ object Main extends WellcomeTypesafeApp {
     implicit val s3Client: S3Client =
       S3Client.builder().build()
 
-
-    implicit val s3AsyncClient: S3AsyncClient =
-      S3AsyncClient.crtCreate
-
     implicit val s3TransferManager: S3TransferManager =
-      S3TransferManager.builder().s3Client(s3AsyncClient).build()
+      S3TransferManager.builder().build()
 
     implicit val s3Presigner: S3Presigner =
       S3Presigner.builder().build()

diff --git a/bag_replicator/src/test/scala/weco/storage/transfer/fixtures/S3TransferManagerFixtures.scala b/bag_replicator/src/test/scala/weco/storage/transfer/fixtures/S3TransferManagerFixtures.scala
@@ -9,7 +9,7 @@ import java.net.URI
 trait S3TransferManagerFixtures extends S3Fixtures {
   def createS3TransferManagerWithEndpoint(endpoint: String): S3TransferManager = {
     val s3AsyncClient =
-      S3AsyncClient.crtBuilder()
+      S3AsyncClient.builder()
         .credentialsProvider(s3Credentials)
         .forcePathStyle(true)
         .endpointOverride(new URI(endpoint))