Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions core/src/main/java/cz/xtf/core/helm/HelmBinaryManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,25 @@ String getHelmBinaryPath() {
}

public HelmBinary adminBinary() {
return getBinary(OpenShiftConfig.adminToken(), OpenShiftConfig.namespace());
String adminToken = validateToken(
OpenShiftConfig.adminToken(),
OpenShiftConfig.OPENSHIFT_ADMIN_TOKEN);
return getBinary(adminToken, OpenShiftConfig.namespace());
}

public HelmBinary masterBinary() {
return getBinary(OpenShiftConfig.masterToken(), OpenShiftConfig.namespace());
String masterToken = validateToken(
OpenShiftConfig.masterToken(),
OpenShiftConfig.OPENSHIFT_MASTER_TOKEN);
return getBinary(masterToken, OpenShiftConfig.namespace());
}

private String validateToken(String token, String propertyName) {
if (token == null || token.isEmpty()) {
throw new IllegalStateException(
"Token is not configured. Please set '" + propertyName + "' in your properties file.");
}
return token;
}

private static HelmBinary getBinary(String token, String namespace) {
Expand Down