diff --git a/bag_register/docker-compose.yml b/bag_register/docker-compose.yml index 96b959542..fd855db0b 100644 --- a/bag_register/docker-compose.yml +++ b/bag_register/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/bag_replicator/docker-compose.yml b/bag_replicator/docker-compose.yml index 0a34e490d..c3ae4b88c 100644 --- a/bag_replicator/docker-compose.yml +++ b/bag_replicator/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=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 index 3b3dd8912..7933aa52a 100644 --- 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 @@ -3,7 +3,7 @@ package weco.storage_service.bag_replicator import akka.actor.ActorSystem import com.azure.storage.blob.{BlobServiceClient, BlobServiceClientBuilder} import com.typesafe.config.Config -import software.amazon.awssdk.services.s3.S3Client +import software.amazon.awssdk.services.s3.{S3AsyncClient, S3Client} import software.amazon.awssdk.services.s3.presigner.S3Presigner import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.transfer.s3.S3TransferManager @@ -52,8 +52,13 @@ object Main extends WellcomeTypesafeApp { implicit val s3Client: S3Client = S3Client.builder().build() + + implicit val s3AsyncClient: S3AsyncClient = + S3AsyncClient.crtBuilder().build() + implicit val s3TransferManager: S3TransferManager = - S3TransferManager.builder().build() + S3TransferManager.builder().s3Client(s3AsyncClient).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 index 12fa2e42b..12ffe60da 100644 --- 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.builder() + S3AsyncClient.crtBuilder() .credentialsProvider(s3Credentials) .forcePathStyle(true) .endpointOverride(new URI(endpoint)) diff --git a/bag_root_finder/docker-compose.yml b/bag_root_finder/docker-compose.yml index 96b959542..fd855db0b 100644 --- a/bag_root_finder/docker-compose.yml +++ b/bag_root_finder/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/bag_tagger/docker-compose.yml b/bag_tagger/docker-compose.yml index 0a34e490d..c3ae4b88c 100644 --- a/bag_tagger/docker-compose.yml +++ b/bag_tagger/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/bag_unpacker/docker-compose.yml b/bag_unpacker/docker-compose.yml index 96b959542..fd855db0b 100644 --- a/bag_unpacker/docker-compose.yml +++ b/bag_unpacker/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/bag_verifier/docker-compose.yml b/bag_verifier/docker-compose.yml index 55dbfd0b1..95d6ae6ac 100644 --- a/bag_verifier/docker-compose.yml +++ b/bag_verifier/docker-compose.yml @@ -1,9 +1,10 @@ version: "2.1" services: localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/bag_versioner/docker-compose.yml b/bag_versioner/docker-compose.yml index 536eff3ea..a1e5f61c7 100644 --- a/bag_versioner/docker-compose.yml +++ b/bag_versioner/docker-compose.yml @@ -1,7 +1,8 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" dynamodb: diff --git a/builds/run_sbt_task_in_docker.sh b/builds/run_sbt_task_in_docker.sh index 896c811dd..5e4b17362 100755 --- a/builds/run_sbt_task_in_docker.sh +++ b/builds/run_sbt_task_in_docker.sh @@ -56,4 +56,4 @@ docker run --tty --rm \ --net host \ --volume "$ROOT:$ROOT" \ --workdir "$ROOT" \ - "$ECR_REGISTRY/wellcome/sbt_wrapper" "$@" + "$ECR_REGISTRY/wellcome/sbt_wrapper:no_alpine" "$@" diff --git a/common/docker-compose.yml b/common/docker-compose.yml index 3b4c3fc1c..bdbea4513 100644 --- a/common/docker-compose.yml +++ b/common/docker-compose.yml @@ -1,9 +1,10 @@ version: "2.1" services: localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" s3: diff --git a/indexer/bag_indexer/docker-compose.yml b/indexer/bag_indexer/docker-compose.yml index 29afed8e8..132d672a6 100644 --- a/indexer/bag_indexer/docker-compose.yml +++ b/indexer/bag_indexer/docker-compose.yml @@ -11,8 +11,9 @@ elasticsearch: - "discovery.type=single-node" - "xpack.security.enabled=false" localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/indexer/file_finder/docker-compose.yml b/indexer/file_finder/docker-compose.yml index 45ca56c7a..ce4d0ec51 100644 --- a/indexer/file_finder/docker-compose.yml +++ b/indexer/file_finder/docker-compose.yml @@ -1,6 +1,7 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/indexer/file_indexer/docker-compose.yml b/indexer/file_indexer/docker-compose.yml index 29afed8e8..132d672a6 100644 --- a/indexer/file_indexer/docker-compose.yml +++ b/indexer/file_indexer/docker-compose.yml @@ -11,8 +11,9 @@ elasticsearch: - "discovery.type=single-node" - "xpack.security.enabled=false" localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/indexer/ingests_indexer/docker-compose.yml b/indexer/ingests_indexer/docker-compose.yml index 29afed8e8..132d672a6 100644 --- a/indexer/ingests_indexer/docker-compose.yml +++ b/indexer/ingests_indexer/docker-compose.yml @@ -11,8 +11,9 @@ elasticsearch: - "discovery.type=single-node" - "xpack.security.enabled=false" localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/ingests/ingests_worker/docker-compose.yml b/ingests/ingests_worker/docker-compose.yml index 45ca56c7a..ce4d0ec51 100644 --- a/ingests/ingests_worker/docker-compose.yml +++ b/ingests/ingests_worker/docker-compose.yml @@ -1,6 +1,7 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/notifier/docker-compose.yml b/notifier/docker-compose.yml index 45ca56c7a..ce4d0ec51 100644 --- a/notifier/docker-compose.yml +++ b/notifier/docker-compose.yml @@ -1,6 +1,7 @@ localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d6c485394..89ec7ecbf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object WellcomeDependencies { - val defaultVersion = "32.40.4" // This is automatically bumped by the scala-libs release process, do not edit this line manually + val defaultVersion = "32.41.0" // This is automatically bumped by the scala-libs release process, do not edit this line manually lazy val versions = new { val fixtures = defaultVersion @@ -102,12 +102,12 @@ object ExternalDependencies { // This should match the version of aws used in scala-libs; see // https://github.com/wellcomecollection/scala-libs/blob/main/project/Dependencies.scala - val aws = "2.19.0" + val aws = "2.25.28" // 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.20.3" + val awsCrt = "0.29.16" } val azureDependencies: Seq[ModuleID] = Seq( diff --git a/replica_aggregator/docker-compose.yml b/replica_aggregator/docker-compose.yml index 3e59669e7..c753c8f55 100644 --- a/replica_aggregator/docker-compose.yml +++ b/replica_aggregator/docker-compose.yml @@ -3,8 +3,9 @@ dynamodb: ports: - "45678:8000" localstack: - image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack" + image: "public.ecr.aws/localstack/localstack:3.0.0" environment: - SERVICES=sqs + - ALLOW_NONSTANDARD_REGIONS=1 ports: - "4566:4566"