From 17389acef000c0bb413faefb45f07cce1fa0b9ea Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Sat, 17 Aug 2024 10:51:24 -0500 Subject: [PATCH] Update elasticsearch docker image to 8.15.0 (#3132) --- .github/workflows/build.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- docker-compose.yml | 2 +- .../elastic4s/requests/cluster/ClusterInfoTest.scala | 4 ++-- .../elastic4s/requests/snapshots/SnapshotTest.scala | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2610e51e4..02a9897a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests run: sbt ++2.12.19 test @@ -47,7 +47,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests run: sbt ++2.13.14 test @@ -67,7 +67,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 84e38dca1..442c3941a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests timeout-minutes: 30 @@ -44,7 +44,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests timeout-minutes: 30 @@ -65,7 +65,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/docker-compose.yml b/docker-compose.yml index 3a5458475..534a5db64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4 + image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/cluster/ClusterInfoTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/cluster/ClusterInfoTest.scala index cd6b5552a..a9cbd0b63 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/cluster/ClusterInfoTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/cluster/ClusterInfoTest.scala @@ -31,7 +31,7 @@ class ClusterInfoTest extends AnyWordSpec with Matchers with DockerTests with Be Symbol("seeds") (Seq("127.0.0.1:9300", "127.0.0.2:9300")), Symbol("maxConnectionsPerCluster") (3), Symbol("initialConnectTimeout") ("30s"), - Symbol("skipUnavailable") (false) + Symbol("skipUnavailable") (true) ) info.valueAt("cluster_two") should have( @@ -39,7 +39,7 @@ class ClusterInfoTest extends AnyWordSpec with Matchers with DockerTests with Be // Symbol("numNodesConnected") (0), Symbol("maxConnectionsPerCluster") (3), Symbol("initialConnectTimeout") ("30s"), - Symbol("skipUnavailable") (false)) + Symbol("skipUnavailable") (true)) } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/snapshots/SnapshotTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/snapshots/SnapshotTest.scala index d96eed91f..933302e75 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/snapshots/SnapshotTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/snapshots/SnapshotTest.scala @@ -62,7 +62,7 @@ class SnapshotTest extends AnyFlatSpec with Matchers with DockerTests { it should "error when the repo does not exist" in { client.execute { getSnapshot(snapshotName, "bbbbb") - }.await.result.failures("bbbbb").`type` shouldBe "repository_missing_exception" + }.await.error.`type` shouldBe "repository_missing_exception" } "restore snapshot" should "error when an index clashes" in {