Merge branch 'eclipse:master' into Issue-Fix-eclipse-jkube#2640

l3002 · Feb 16, 2024 · e05a082 · e05a082
2 parents e901070 + 34503a1
commit e05a082
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 36 deletions.
diff --git a/...c/test/java/org/eclipse/jkube/kit/build/service/docker/access/hc/unix/UnixSocketTest.java b/...c/test/java/org/eclipse/jkube/kit/build/service/docker/access/hc/unix/UnixSocketTest.java
@@ -53,42 +53,45 @@ void close() {
     @Test
     void shouldReturnValuesFromSocket() throws IOException {
         // GIVEN
-        UnixSocket unixSocket = new UnixSocket();
-        doReturn(KEEP_ALIVE).when(socket).getKeepAlive();
-        doReturn(SO_TIMEOUT).when(socket).getSoTimeout();
+        try (UnixSocket unixSocket = new UnixSocket()) {
+            doReturn(KEEP_ALIVE).when(socket).getKeepAlive();
+            doReturn(SO_TIMEOUT).when(socket).getSoTimeout();
 
-        // WHEN
-        boolean keepAlive = unixSocket.getKeepAlive();
-        int soTimeout = unixSocket.getSoTimeout();
+            // WHEN
+            boolean keepAlive = unixSocket.getKeepAlive();
+            int soTimeout = unixSocket.getSoTimeout();
 
-        // THEN
-        assertThat(keepAlive).isEqualTo(KEEP_ALIVE);
-        assertThat(soTimeout).isEqualTo(SO_TIMEOUT);
+            // THEN
+            assertThat(keepAlive).isEqualTo(KEEP_ALIVE);
+            assertThat(soTimeout).isEqualTo(SO_TIMEOUT);
+        }
     }
 
     @Test
     void shouldPassExceptionsFromSocket() throws IOException {
         // GIVEN
-        UnixSocket unixSocket = new UnixSocket();
-        doThrow(new SocketException()).when(socket).getKeepAlive();
-        doThrow(new SocketException()).when(socket).getSoTimeout();
+        try (UnixSocket unixSocket = new UnixSocket()) {
+            doThrow(new SocketException()).when(socket).getKeepAlive();
+            doThrow(new SocketException()).when(socket).getSoTimeout();
 
-        // WHEN & THEN
-        assertThatThrownBy(unixSocket::getKeepAlive).isInstanceOf(SocketException.class);
-        assertThatThrownBy(unixSocket::getSoTimeout).isInstanceOf(SocketException.class);
+            // WHEN & THEN
+            assertThatThrownBy(unixSocket::getKeepAlive).isInstanceOf(SocketException.class);
+            assertThatThrownBy(unixSocket::getSoTimeout).isInstanceOf(SocketException.class);
+        }
     }
 
     @Test
     void shouldForwardValuesToSocket() throws IOException {
         // GIVEN
-        UnixSocket unixSocket = new UnixSocket();
+        try (UnixSocket unixSocket = new UnixSocket()) {
 
-        // WHEN
-        unixSocket.setKeepAlive(KEEP_ALIVE);
-        unixSocket.setSoTimeout(SO_TIMEOUT);
+            // WHEN
+            unixSocket.setKeepAlive(KEEP_ALIVE);
+            unixSocket.setSoTimeout(SO_TIMEOUT);
 
-        // THEN
-        verify(socket).setKeepAlive(KEEP_ALIVE);
-        verify(socket).setSoTimeout(SO_TIMEOUT);
+            // THEN
+            verify(socket).setKeepAlive(KEEP_ALIVE);
+            verify(socket).setSoTimeout(SO_TIMEOUT);
+        }
     }
 }
diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/FileUtilTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/FileUtilTest.java
@@ -161,6 +161,7 @@ void copy_whenFileCopied_shouldPreserveLastModifiedTimestamp() throws IOExceptio
     Files.write(sourceFile.toPath(), "testdata".getBytes(StandardCharsets.UTF_8));
     long originalTimestamp = new Date().getTime() - 10;
     assertThat(sourceFile.setLastModified(originalTimestamp)).isTrue();
+    originalTimestamp = sourceFile.lastModified(); // Update last modified, because different platforms have different precision.
     Path targetFilePath = folder.toPath().resolve("target");
 
     // When

diff --git a/...e/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/KubernetesClientUtil.java b/...e/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/KubernetesClientUtil.java
@@ -119,13 +119,10 @@ public static String getPodStatusDescription(Pod pod) {
 
     public static String getPodStatusMessagePostfix(Watcher.Action action) {
         String message = "";
-        switch (action) {
-            case DELETED:
-                message = ": Pod Deleted";
-                break;
-            case ERROR:
-                message = ": Error";
-                break;
+        if (action == Watcher.Action.DELETED) {
+            message = ": Pod Deleted";
+        } else if (action == Watcher.Action.ERROR) {
+            message = ": Error";
         }
         return message;
     }

diff --git a/...c/test/java/org/eclipse/jkube/kit/config/service/kubernetes/KubernetesClientUtilTest.java b/...c/test/java/org/eclipse/jkube/kit/config/service/kubernetes/KubernetesClientUtilTest.java
@@ -21,16 +21,17 @@
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.kubernetes.client.Watcher;
 import org.eclipse.jkube.kit.config.access.ClusterAccess;
 import org.eclipse.jkube.kit.config.resource.ResourceConfig;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil.doDeleteAndWait;
+import static org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil.getPodStatusMessagePostfix;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
 @SuppressWarnings("unused")
 @EnableKubernetesMockClient(crud = true)
 class KubernetesClientUtilTest {
@@ -139,5 +140,28 @@ void resolveFallbackNamespace_whenNamespaceProvidedViaClusterAccess_shouldReturn
     // Then
     assertThat(resolvedNamespace).isEqualTo("ns1");
   }
+  @Test
+  void getPodStatusMessagePostfix_whenActionIsDeleted_shouldReturnPodDeletedMessage() {
+    // Given
+    Watcher.Action action = Watcher.Action.DELETED;
+
+    // When
+    String messagePostfix = KubernetesClientUtil.getPodStatusMessagePostfix(action);
+
+    // Then
+    assertThat(messagePostfix).isEqualTo(": Pod Deleted");
+  }
+
+  @Test
+  void getPodStatusMessagePostfix_whenActionIsError_shouldReturnErrorMessage() {
+    // Given
+    Watcher.Action action = Watcher.Action.ERROR;
+
+    // When
+    String messagePostfix = KubernetesClientUtil.getPodStatusMessagePostfix(action);
+
+    // Then
+    assertThat(messagePostfix).isEqualTo(": Error");
+  }
 
 }
diff --git a/...rc/main/java/org/eclipse/jkube/enricher/generic/openshift/ImageChangeTriggerEnricher.java b/...rc/main/java/org/eclipse/jkube/enricher/generic/openshift/ImageChangeTriggerEnricher.java
@@ -36,9 +36,9 @@
 
 public class ImageChangeTriggerEnricher extends BaseEnricher {
     private static final String ENRICHER_NAME = "jkube-openshift-imageChangeTrigger";
-    private final Boolean enableAutomaticTrigger;
-    private final Boolean enableImageChangeTrigger;
-    private final Boolean trimImageInContainerSpecFlag;
+    private final boolean enableAutomaticTrigger;
+    private final boolean enableImageChangeTrigger;
+    private final boolean trimImageInContainerSpecFlag;
 
 
     @AllArgsConstructor
@@ -111,12 +111,12 @@ public void visit(DeploymentConfigSpecBuilder builder) {
         });
     }
 
-    private Boolean isImageChangeTriggerNeeded(String containerName) {
+    private boolean isImageChangeTriggerNeeded(String containerName) {
         String containersFromConfig = Configs.asString(getConfig(Config.CONTAINERS));
-        Boolean enrichAll = getValueFromConfig(ENRICH_ALL_WITH_IMAGE_TRIGGERS, false);
+        boolean enrichAll = getValueFromConfig(ENRICH_ALL_WITH_IMAGE_TRIGGERS, false);
         JKubeBuildStrategy buildStrategy = getContext().getConfiguration().getJKubeBuildStrategy();
 
-        if (Boolean.TRUE.equals(enrichAll)) {
+        if (enrichAll) {
             return true;
         }