chore(deps): Bump com.marcnuri.helm-java:helm-java from 0.0.15 to 0.0.16 (3749)

chore(deps): Bump com.marcnuri.helm-java:helm-java from 0.0.15 to 0.0.16
---
fix(tests): start remote OCI server in setup and improve readiness check

Author: manusa

jkube-kit/build/service/jib/src/test/java/org/eclipse/jkube/kit/service/jib/JibServiceTest.java

@@ -63,6 +63,7 @@ class JibServiceTest {
   @BeforeEach
   void setUp() {
     remoteOciServer = new TestOciServer();
+    remoteOciServer.start();
     jibLogger = new JibLogger(new KitLogger.SilentLogger());
     testAuthConfigFactory = new TestAuthConfigFactory();
     configuration = JKubeConfiguration.builder()

jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/TestOciServer.java

@@ -25,13 +25,11 @@
 import java.net.URL;
 import java.time.Duration;
 
-import static org.eclipse.jkube.kit.common.util.AsyncUtil.await;
-import static org.eclipse.jkube.kit.common.util.AsyncUtil.get;
-
 @Getter
 public class TestOciServer implements Closeable {
 
-  private static final Duration TIMEOUT = Duration.ofSeconds(5);
+  private static final Duration TIMEOUT = Duration.ofSeconds(10);
+  private static final Duration RETRY_INTERVAL = Duration.ofMillis(100);
   private static final String DEFAULT_USER = "oci-user";
   private static final String DEFAULT_PASSWORD = "oci-password";
 
@@ -46,7 +44,7 @@ private static HelmLib getHelmLib() {
 
   private final String user;
   private final String password;
-  private final String url;
+  private String url;
 
   public TestOciServer() {
     this(DEFAULT_USER, DEFAULT_PASSWORD);
@@ -55,28 +53,69 @@ public TestOciServer() {
   public TestOciServer(String user, String password) {
     this.user = user;
     this.password = password;
-    url = get(await(this::startServer).apply(this::waitForServer), TIMEOUT);
+  }
+
+  /**
+   * Starts the OCI server and waits until it is ready to accept connections.
+   * This method blocks until the server is ready or the timeout is reached.
+   *
+   * @throws IllegalStateException if the server fails to start within the timeout period
+   */
+  public void start() {
+    if (url != null) {
+      throw new IllegalStateException("Server is already started");
+    }
+
+    url = getHelmLib().RepoOciServerStart(
+      new RepoServerOptions(null, user, password)
+    ).out;
+
+    waitForServerReady();
   }
 
   @Override
   public void close() throws IOException {
-    // No effect yet https://github.com/manusa/helm-java/blob/f44a88ed1ad351b2b5a00b5e735deb5cb35b32f7/native/internal/helm/repotest.go#L138
-    getHelmLib().RepoServerStop(url);
+    if (url != null) {
+      // No effect yet https://github.com/manusa/helm-java/blob/f44a88ed1ad351b2b5a00b5e735deb5cb35b32f7/native/internal/helm/repotest.go#L138
+      getHelmLib().RepoServerStop(url);
+      url = null;
+    }
   }
 
-  private String startServer() {
-    return getHelmLib().RepoOciServerStart(
-      new RepoServerOptions(null, user, password)
-    ).out;
+  private void waitForServerReady() {
+    final long startTime = System.currentTimeMillis();
+    final long timeoutMillis = TIMEOUT.toMillis();
+    final long retryIntervalMillis = RETRY_INTERVAL.toMillis();
+
+    while (System.currentTimeMillis() - startTime < timeoutMillis) {
+      if (isServerReady()) {
+        return;
+      }
+
+      try {
+        Thread.sleep(retryIntervalMillis);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        throw new IllegalStateException("Interrupted while waiting for OCI server to start", e);
+      }
+    }
+
+    throw new IllegalStateException(
+      String.format("OCI server at %s failed to become ready within %d milliseconds", url, timeoutMillis)
+    );
   }
 
-  private boolean waitForServer(String serverUrl) {
+  private boolean isServerReady() {
     try {
-      final HttpURLConnection connection = (HttpURLConnection) new URL("http://" + serverUrl + "/v2/")
+      final HttpURLConnection connection = (HttpURLConnection) new URL("http://" + url + "/v2/")
         .openConnection();
       connection.setRequestProperty("Authorization", "Basic " + Base64Util.encodeToString(String.join(":", user, password)));
+      connection.setConnectTimeout((int) RETRY_INTERVAL.toMillis());
+      connection.setReadTimeout((int) RETRY_INTERVAL.toMillis());
       connection.connect();
-      return connection.getResponseCode() == HttpURLConnection.HTTP_OK;
+      final int responseCode = connection.getResponseCode();
+      connection.disconnect();
+      return responseCode == HttpURLConnection.HTTP_OK;
     } catch (IOException e) {
       return false;
     }

jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/kubernetes/JibImageBuildServicePushTest.java

@@ -75,6 +75,7 @@ void setUp() throws Exception {
 
     // Setup OCI server
     remoteOciServer = new TestOciServer();
+    remoteOciServer.start();
 
     // Configure OCI server in image and JKube
     imageConfiguration = ImageConfiguration.builder()

pom.xml

@@ -96,7 +96,7 @@
     <version.gradle-api-maven-plugin>0.0.7</version.gradle-api-maven-plugin>
     <version.groovy>3.0.23</version.groovy>
     <version.guava>33.4.0-jre</version.guava>
-    <version.helm-java>0.0.15</version.helm-java>
+    <version.helm-java>0.0.16</version.helm-java>
     <version.jackson>2.18.3</version.jackson>
     <version.jacoco>0.8.12</version.jacoco>
     <version.json-smart>2.5.2</version.json-smart> <!-- Transitive dependency  required by citrus -->