Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Elasticsearch and Localstack versions #4935

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.permissions.model.Permission
import ch.epfl.bluebrain.nexus.delta.sdk.syntax._
import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label
import ch.epfl.bluebrain.nexus.testkit.CirceLiteral
import ch.epfl.bluebrain.nexus.testkit.minio.MinioDocker
import ch.epfl.bluebrain.nexus.testkit.scalatest.ClasspathResources

import java.nio.file.{Files, Paths}
Expand All @@ -32,7 +31,7 @@ trait StorageFixtures extends CirceLiteral {
// format: off
implicit val config: StorageTypeConfig = StorageTypeConfig(
disk = DiskStorageConfig(diskVolume, Set(diskVolume,tmpVolume), DigestAlgorithm.default, permissions.read, permissions.write, showLocation = false, 50),
amazon = Some(S3StorageConfig(DigestAlgorithm.default, "localhost", useDefaultCredentialProvider = false, Secret(MinioDocker.RootUser), Secret(MinioDocker.RootPassword),
amazon = Some(S3StorageConfig(DigestAlgorithm.default, "localhost", useDefaultCredentialProvider = false, Secret("my_key"), Secret("my_secret_key"),
permissions.read, permissions.write, showLocation = false, 60, defaultBucket = "potato", prefix = None)),
remoteDisk = Some(RemoteDiskStorageConfig(DigestAlgorithm.default, BaseUri("http://localhost", Label.unsafe("v1")), Anonymous, permissions.read, permissions.write, showLocation = false, 70, 50.millis)),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.model.DigestAlgori
import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.operations.s3.client.S3StorageClient
import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.permissions
import ch.epfl.bluebrain.nexus.testkit.Generators
import ch.epfl.bluebrain.nexus.testkit.minio.LocalStackS3
import ch.epfl.bluebrain.nexus.testkit.localstack.LocalStackS3
import fs2.io.file.Path
import io.laserdisc.pure.s3.tagless.S3AsyncClientOp
import munit.CatsEffectSuite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ElasticSearchContainer(password: String)
}

object ElasticSearchContainer {
private val Version = "8.13.0"
private val Version = "8.13.3"

val ElasticSearchUser = "elastic"
val ElasticSearchPassword = "password"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.epfl.bluebrain.nexus.testkit.minio
package ch.epfl.bluebrain.nexus.testkit.localstack

import cats.effect.{IO, Resource}
import com.dimafeng.testcontainers.LocalStackV2Container
Expand All @@ -10,7 +10,7 @@ import software.amazon.awssdk.services.s3.S3AsyncClient

object LocalStackS3 {
val ServiceType = Service.S3
val Version = "3.2"
val Version = "3.4"

def localstackS3(): Resource[IO, LocalStackV2Container] = {

Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion docs/src/main/paradox/docs/delta/api/assets/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"blazegraph": "2.1.6-RC",
"postgresql": "15.6",
"elasticsearch": "8.13.0",
"elasticsearch": "8.13.3",
"remoteStorage": "1.10.0"
},
"plugins": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ $ curl http://localhost/v1/version | jq
"delta": "1.10.0",
"dependencies": {
"blazegraph": "2.1.6-SNAPSHOT",
"elasticsearch": "8.13.0",
"elasticsearch": "8.13.3",
"postgres": "15.6"
},
"environment": "dev",
Expand Down
4 changes: 2 additions & 2 deletions tests/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services:
- 9090:8080

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.3
environment:
ES_JAVA_OPTS: "-Xmx2G"
discovery.type: "single-node"
Expand Down Expand Up @@ -160,7 +160,7 @@ services:
- ./config:/config

localstack:
image: localstack/localstack:3.2
image: localstack/localstack:3.4
environment:
AWS_ACCESS_KEY_ID: "MY_ACCESS_KEY"
AWS_SECRET_ACCESS_KEY: "CHUTCHUT"
Expand Down