fix(testkit): remove modification of proxy name (#1574)

* fix(testkit): remove modification of proxy name

* fixing flaky test

---------

Co-authored-by: Andrzej Ludwikowski <[email protected]>

Author: efgpinto

sdk/java-sdk-protobuf-testkit/src/main/java/kalix/javasdk/testkit/KalixProxyContainer.java

@@ -41,7 +41,7 @@ public class KalixProxyContainer extends GenericContainer<KalixProxyContainer> {
   static {
     String customImage = System.getenv("KALIX_TESTKIT_PROXY_IMAGE");
     if (customImage == null) {
-      DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(BuildInfo.proxyImage()).withTag(BuildInfo.proxyVersion().replace("-SNAPSHOT", ""));
+      DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(BuildInfo.proxyImage()).withTag(BuildInfo.proxyVersion());
     } else {
       Logger logger = LoggerFactory.getLogger(KalixProxyContainer.class);
       DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(customImage);

sdk/java-sdk-spring/src/it/java/com/example/wiring/workflowentities/SpringWorkflowIntegrationTest.java

@@ -301,8 +301,12 @@ public void shouldRecoverFailingCounterWorkflowWithDefaultRecoverStrategy() {
           assertThat(counterValue).isEqualTo(3);
         });
 
-    var state = getWorkflowState(path);
-    assertThat(state.finished()).isTrue();
+    await()
+        .atMost(10, TimeUnit.of(SECONDS))
+        .untilAsserted(() -> {
+          var state = getWorkflowState(path);
+          assertThat(state.finished()).isTrue();
+        });
   }
 
   @Test
@@ -329,8 +333,12 @@ public void shouldRecoverFailingCounterWorkflowWithRecoverStrategy() {
           assertThat(counterValue).isEqualTo(3);
         });
 
-    var state = getWorkflowState(path);
-    assertThat(state.finished()).isTrue();
+    await()
+        .atMost(10, TimeUnit.of(SECONDS))
+        .untilAsserted(() -> {
+          var state = getWorkflowState(path);
+          assertThat(state.finished()).isTrue();
+        });
   }
 
   @Test
@@ -357,8 +365,12 @@ public void shouldRecoverWorkflowTimeout() {
           assertThat(counterValue).isEqualTo(3);
         });
 
-    var state = getWorkflowState(path);
-    assertThat(state.finished()).isTrue();
+    await()
+        .atMost(10, TimeUnit.of(SECONDS))
+        .untilAsserted(() -> {
+          var state = getWorkflowState(path);
+          assertThat(state.finished()).isTrue();
+        });
   }
 
   @Test