Warns when vault binding has missing or unrecognized method

Signed-off-by: Emily Casey <ecasey@vmware.com>
This commit is contained in:
Emily Casey
2020-06-23 19:04:43 -04:00
parent 99574f3653
commit 663c8095c2
2 changed files with 15 additions and 2 deletions

View File

@@ -16,8 +16,11 @@
package org.springframework.cloud.bindings.boot;
import org.springframework.boot.context.event.ApplicationPreparedEvent;
import org.springframework.boot.logging.DeferredLog;
import org.springframework.cloud.bindings.Binding;
import org.springframework.cloud.bindings.Bindings;
import org.springframework.context.ApplicationListener;
import org.springframework.core.env.Environment;
import java.util.Map;
@@ -27,13 +30,15 @@ import static org.springframework.cloud.bindings.boot.Guards.isKindEnabled;
/**
* An implementation of {@link BindingsPropertiesProcessor} that detects {@link Binding}s of kind: {@value KIND}.
*/
public final class VaultBindingsPropertiesProcessor implements BindingsPropertiesProcessor {
public final class VaultBindingsPropertiesProcessor implements BindingsPropertiesProcessor, ApplicationListener<ApplicationPreparedEvent> {
/**
* The {@link Binding} kind that this processor is interested in: {@value}.
**/
public static final String KIND = "Vault";
private static final DeferredLog LOG = new DeferredLog();
@Override
public void process(Environment environment, Bindings bindings, Map<String, Object> properties) {
if (!isKindEnabled(environment, KIND)) {
@@ -47,6 +52,7 @@ public final class VaultBindingsPropertiesProcessor implements BindingsPropertie
String authenticationMethod = binding.getSecret().get("method");
if (authenticationMethod == null) {
LOG.warn(String.format("Key 'method' is missing from secret of binding '%s'", binding.getName()));
return;
}
properties.put("spring.cloud.vault.authentication", authenticationMethod);
@@ -102,8 +108,14 @@ public final class VaultBindingsPropertiesProcessor implements BindingsPropertie
map.from("role").to("spring.cloud.vault.kubernetes.role");
map.from("kubernetes-path").to("spring.cloud.vault.kubernetes.kubernetes-path");
break;
default:
LOG.warn(String.format("Binding '%s' contains unrecognized 'method'", binding.getName()));
}
});
}
@Override
public void onApplicationEvent(ApplicationPreparedEvent event) {
LOG.switchTo(getClass());
}
}

View File

@@ -1,6 +1,7 @@
org.springframework.context.ApplicationListener=\
org.springframework.cloud.bindings.boot.BindingFlattenedEnvironmentPostProcessor, \
org.springframework.cloud.bindings.boot.BindingSpecificEnvironmentPostProcessor
org.springframework.cloud.bindings.boot.BindingSpecificEnvironmentPostProcessor, \
org.springframework.cloud.bindings.boot.VaultBindingsPropertiesProcessor
org.springframework.boot.env.EnvironmentPostProcessor=\
org.springframework.cloud.bindings.boot.BindingFlattenedEnvironmentPostProcessor, \
org.springframework.cloud.bindings.boot.BindingSpecificEnvironmentPostProcessor