Update elasticsearch docker image to 8.15.0 (#3132)

Philippus · Aug 17, 2024 · 17389ac · 17389ac
1 parent e0db370
commit 17389ac
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -31,15 +31,15 @@ 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(
       //  Symbol("connected") (false),
       //  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
@@ -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 {