Skip to content

Commit

Permalink
Updated VaultConfigSource (changed set to list)
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-v committed Sep 29, 2020
1 parent 0ee75d1 commit b55cfa4
Showing 1 changed file with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
Expand All @@ -35,9 +36,9 @@ public class VaultConfigSource implements ConfigSource {
private static final String PATHS_SEPARATOR = ":";

private final VaultInvoker vault;
private final List<String> secretsPaths;
private final Collection<String> secretsPaths;

private VaultConfigSource(VaultInvoker vault, List<String> secretsPaths) {
private VaultConfigSource(VaultInvoker vault, Collection<String> secretsPaths) {
this.vault = vault;
this.secretsPaths = new ArrayList<>(secretsPaths);
}
Expand Down Expand Up @@ -72,13 +73,14 @@ public static final class Builder {

private VaultInvoker invoker;

private List<String> secretsPaths =
private Set<String> secretsPaths =
Optional.ofNullable(
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("VAULT_SECRETS_PATH"))
.orElse(ENVIRONMENT_LOADER.loadVariable("VAULT_SECRETS_PATHS")))
.map(s -> s.split(PATHS_SEPARATOR))
.map(Arrays::asList)
.orElseGet(ArrayList::new);
.map(HashSet::new)
.orElseGet(HashSet::new);

private Builder() {}

Expand Down Expand Up @@ -120,11 +122,10 @@ public Builder secretsPaths(Collection<String> secretsPaths) {
return this;
}

private static List<String> toSecretsPaths(Collection<String> secretsPaths) {
private static Set<String> toSecretsPaths(Collection<String> secretsPaths) {
return secretsPaths.stream()
.flatMap(s -> Arrays.stream(s.split(PATHS_SEPARATOR)))
.distinct()
.collect(Collectors.toList());
.collect(Collectors.toSet());
}

public Builder invoker(VaultInvoker invoker) {
Expand Down

0 comments on commit b55cfa4

Please sign in to comment.