From 13ae381c8d071527b703c402dd48401c3b6aa331 Mon Sep 17 00:00:00 2001
From: Tomasz Michalak <8047609+tomaszmichalak@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:18:28 +0100
Subject: [PATCH] #262 Fixing 'null' CONTAINER_FILTER env variable check

---
 .../kindcontainer/util/ContainerVersionHelpers.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java b/src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java
index 6126ca6c..ccf74ea6 100644
--- a/src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java
+++ b/src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java
@@ -99,7 +99,7 @@ private static <T extends KubernetesContainer<?>> Stream<DynamicTest> testFactor
 
     private static <T extends KubernetesVersionEnum<?>> Predicate<T> isInContainerFilter(final T defaultVersion) {
         assert defaultVersion != null;
-        return Optional.ofNullable(System.getenv("CONTAINER_FILTER"))
+        return Optional.ofNullable(getEnv("CONTAINER_FILTER"))
                 .map(filter -> (Predicate<T>) version -> {
                     final String[] parts = filter.split(" ", 2);
                     final String container = parts[0];
@@ -112,6 +112,12 @@ private static <T extends KubernetesVersionEnum<?>> Predicate<T> isInContainerFi
                 .orElse(version -> version.descriptor().equals(version.descriptor()));
     }
 
+    private static String getEnv(String key) {
+        String value = System.getenv(key);
+        // Fix for https://github.com/dajudge/kindcontainer/issues/262
+        return "null".equals(value) ? null : value;
+    }
+
     private static <T extends KubernetesContainer<?>> KubernetesTestPackage<T> containerFactory(
             final Function<VersionEnumModifier, T> factory,
             final String containerClassName,