Skip to content

Commit 13ae381

Browse files
#262 Fixing 'null' CONTAINER_FILTER env variable check
1 parent e1ce4a0 commit 13ae381

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private static <T extends KubernetesContainer<?>> Stream<DynamicTest> testFactor
9999

100100
private static <T extends KubernetesVersionEnum<?>> Predicate<T> isInContainerFilter(final T defaultVersion) {
101101
assert defaultVersion != null;
102-
return Optional.ofNullable(System.getenv("CONTAINER_FILTER"))
102+
return Optional.ofNullable(getEnv("CONTAINER_FILTER"))
103103
.map(filter -> (Predicate<T>) version -> {
104104
final String[] parts = filter.split(" ", 2);
105105
final String container = parts[0];
@@ -112,6 +112,12 @@ private static <T extends KubernetesVersionEnum<?>> Predicate<T> isInContainerFi
112112
.orElse(version -> version.descriptor().equals(version.descriptor()));
113113
}
114114

115+
private static String getEnv(String key) {
116+
String value = System.getenv(key);
117+
// Fix for https://github.com/dajudge/kindcontainer/issues/262
118+
return "null".equals(value) ? null : value;
119+
}
120+
115121
private static <T extends KubernetesContainer<?>> KubernetesTestPackage<T> containerFactory(
116122
final Function<VersionEnumModifier, T> factory,
117123
final String containerClassName,

0 commit comments

Comments
 (0)