Skip to content

Fixing 'null' CONTAINER_FILTER env variable check #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomaszmichalak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing 'null' CONTAINER_FILTER env variable check #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/test/java/com/dajudge/kindcontainer/util/ContainerVersionHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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,
Expand Down