diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5f7d3e0aa..56bbba133 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,7 @@ concurrency: env: IMG2VEC: cr.weaviate.io/semitechnologies/img2vec-pytorch:resnet50 - MINIO: minio/minio + MINIO: cgr.dev/chainguard/minio MODEL2VEC: cr.weaviate.io/semitechnologies/model2vec-inference:minishlab-potion-base-4M DOCKER_IMAGES_TAR: docker-images.tar diff --git a/pom.xml b/pom.xml index b5f40deb4..4e726f405 100644 --- a/pom.xml +++ b/pom.xml @@ -52,26 +52,26 @@ 17 17 17 - 1.18.42 - 2.13.2 - 5.6.1 - 3.20.0 + 1.18.48 + 2.14.0 + 5.6.5 + 3.21.0 4.13.2 - 2.0.3 + 2.0.5 3.27.7 1.0.4 - 5.21.0 - 2.0.17 + 5.24.0 + 2.0.20 1.5.18 5.14.0 - 2.21 - 11.33 - 5.15.0 - 4.33.5 - 4.33.5 - 1.79.0 - 1.79.0 - 1.79.0 + 2.22 + 11.38.2 + 9.1.0 + 4.36.2 + 4.36.2 + 1.85.1 + 1.85.1 + 1.85.1 6.0.53 @@ -462,7 +462,7 @@ maven-project-info-reports-plugin - 3.1.1my + 3.9.0 diff --git a/src/it/java/io/weaviate/containers/MinIo.java b/src/it/java/io/weaviate/containers/MinIo.java index 86d0d649a..cdfb652fd 100644 --- a/src/it/java/io/weaviate/containers/MinIo.java +++ b/src/it/java/io/weaviate/containers/MinIo.java @@ -1,9 +1,10 @@ package io.weaviate.containers; import org.testcontainers.containers.MinIOContainer; +import org.testcontainers.utility.DockerImageName; public class MinIo extends MinIOContainer { - private static final String DOCKER_IMAGE = "minio/minio"; + private static final String DOCKER_IMAGE = "cgr.dev/chainguard/minio"; public static final String ACCESS_KEY = "minioadmin"; public static final String SECRET_KEY = "minioadmin"; @@ -15,7 +16,8 @@ static MinIo createDefault() { } private MinIo() { - super(DOCKER_IMAGE); + super(DockerImageName.parse(DOCKER_IMAGE) + .asCompatibleSubstituteFor("minio/minio")); withUserName(ACCESS_KEY); withPassword(SECRET_KEY); withCreateContainerCmdModifier(cmd -> cmd.withHostName("minio")); diff --git a/src/test/java/io/weaviate/client6/v1/internal/rest/ProxyTest.java b/src/test/java/io/weaviate/client6/v1/internal/rest/ProxyTest.java index 2a61e51e8..f1575df2a 100644 --- a/src/test/java/io/weaviate/client6/v1/internal/rest/ProxyTest.java +++ b/src/test/java/io/weaviate/client6/v1/internal/rest/ProxyTest.java @@ -1,9 +1,11 @@ package io.weaviate.client6.v1.internal.rest; -import io.weaviate.client6.v1.api.WeaviateApiException; -import io.weaviate.client6.v1.api.Config; -import io.weaviate.client6.v1.api.WeaviateClient; -import io.weaviate.client6.v1.internal.Proxy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockserver.model.HttpForward.forward; + +import java.io.IOException; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -11,11 +13,10 @@ import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; -import java.io.IOException; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockserver.model.HttpForward.forward; +import io.weaviate.client6.v1.api.Config; +import io.weaviate.client6.v1.api.WeaviateApiException; +import io.weaviate.client6.v1.api.WeaviateClient; +import io.weaviate.client6.v1.internal.Proxy; public class ProxyTest { private ClientAndServer targetServer; @@ -31,7 +32,7 @@ public void setUp() { targetServer.when( HttpRequest.request() .withMethod("GET") - .withPath("/v1/.well-known/live")) + .withPath("/v1/\\.well-known/live")) .respond( HttpResponse.response() .withStatusCode(200)); @@ -61,8 +62,7 @@ public void setUp() { .grpcHost("localhost") .grpcPort(targetServer.getLocalPort()) .proxy(new Proxy("localhost", proxyServer.getLocalPort())) - .timeout(5) - ); + .timeout(5)); client = new WeaviateClient(config); } @@ -76,7 +76,7 @@ public void testClientInitializationWithProxy() { // Since setUp() already creates a client using the proxy, we just need to // verify it was initialized correctly. assertThat(client).isNotNull(); - + // Verify that the initialization calls went through the proxy proxyServer.verify( HttpRequest.request() @@ -124,7 +124,7 @@ public void testGrpcProxy() { // we focus on ensuring the client is correctly initialized with the proxy. assertThatThrownBy(() -> client.collections.use("Test").size()) .isInstanceOf(WeaviateApiException.class) - .hasMessageContaining("UNAVAILABLE: Network closed"); + .hasMessageContaining("UNIMPLEMENTED"); } @After