Skip to content

Commit ed9529b

Browse files
artem-vartem-v
authored
Merge pull request #213 from scalecube/change-builer
Changed builder approach
2 parents 4f28b5a + 67020a2 commit ed9529b

File tree

6 files changed

+41
-26
lines changed

6 files changed

+41
-26
lines changed

‎config-vault/src/main/java/io/scalecube/config/vault/KubernetesVaultTokenSupplier.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ private KubernetesVaultTokenSupplier(Builder builder) {
2626
Objects.requireNonNull(builder.serviceAccountTokenPath, "k8s service account token path");
2727
}
2828

29+
public static Builder builder() {
30+
return new Builder();
31+
}
32+
33+
public static KubernetesVaultTokenSupplier newInstance() {
34+
return builder().build();
35+
}
36+
2937
@Override
3038
public String getToken(VaultConfig config) {
3139
try (Stream<String> stream = Files.lines(Paths.get(serviceAccountTokenPath))) {
@@ -53,7 +61,7 @@ public static class Builder {
5361
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("SERVICE_ACCOUNT_TOKEN_PATH"))
5462
.orElse("/var/run/secrets/kubernetes.io/serviceaccount/token");
5563

56-
public Builder() {}
64+
private Builder() {}
5765

5866
public Builder vaultRole(String vaultRole) {
5967
this.vaultRole = vaultRole;

‎config-vault/src/main/java/io/scalecube/config/vault/VaultClientTokenSupplier.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public CompletableFuture<String> getToken() {
7474
+ "ignoring EnvironmentVaultTokenSupplier "
7575
+ "(specify either vaultToken or vaultRole, not both)");
7676
}
77-
vaultTokenSupplier =
78-
new KubernetesVaultTokenSupplier.Builder().vaultRole(vaultRole).build();
77+
vaultTokenSupplier = KubernetesVaultTokenSupplier.builder().vaultRole(vaultRole).build();
7978
vaultConfig = new VaultConfig().address(vaultAddress).build();
8079
} else {
8180
vaultTokenSupplier = new EnvironmentVaultTokenSupplier();

‎config-vault/src/main/java/io/scalecube/config/vault/VaultConfigSource.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ private VaultConfigSource(VaultInvoker vault, Collection<String> secretsPaths) {
4444
this.secretsPaths = new ArrayList<>(secretsPaths);
4545
}
4646

47+
public static Builder builder() {
48+
return new Builder();
49+
}
50+
4751
@Override
4852
public Map<String, ConfigProperty> loadConfig() {
4953
Map<String, ConfigProperty> propertyMap = new HashMap<>();
@@ -85,7 +89,7 @@ public static final class Builder {
8589
.map(HashSet::new)
8690
.orElseGet(HashSet::new);
8791

88-
public Builder() {}
92+
private Builder() {}
8993

9094
/**
9195
* Appends secrets paths (each path value may contain values separated by colons).
@@ -161,7 +165,7 @@ public Builder tokenSupplier(VaultTokenSupplier tokenSupplier) {
161165

162166
public VaultConfigSource build() {
163167
return new VaultConfigSource(
164-
invoker != null ? invoker : builderFunction.apply(new VaultInvoker.Builder()).build(),
168+
invoker != null ? invoker : builderFunction.apply(VaultInvoker.builder()).build(),
165169
secretsPaths);
166170
}
167171
}

‎config-vault/src/main/java/io/scalecube/config/vault/VaultInvoker.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ private VaultInvoker(Builder builder) {
4141
this.builder = builder;
4242
}
4343

44+
public static Builder builder() {
45+
return new Builder();
46+
}
47+
4448
/**
4549
* Invokes a given call with vault.
4650
*
@@ -213,7 +217,7 @@ public static class Builder {
213217

214218
private VaultTokenSupplier tokenSupplier = new EnvironmentVaultTokenSupplier();
215219

216-
public Builder() {}
220+
private Builder() {}
217221

218222
/**
219223
* Setter for {@link VaultConfig} operator.

‎config-vault/src/main/java/io/scalecube/config/vault/VaultInvokers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static VaultInvoker newVaultInvoker() {
6161
}
6262

6363
final VaultInvoker.Builder builder =
64-
new VaultInvoker.Builder()
64+
VaultInvoker.builder()
6565
.options(config -> config.address(vaultAddr).engineVersion(vaultEngineVersion));
6666

6767
if (!isNullOrNone(vaultRole)) {
@@ -71,7 +71,7 @@ public static VaultInvoker newVaultInvoker() {
7171
+ "ignoring EnvironmentVaultTokenSupplier "
7272
+ "(specify either VAULT_ROLE or VAULT_TOKEN, not both)");
7373
}
74-
builder.tokenSupplier(new KubernetesVaultTokenSupplier.Builder().build());
74+
builder.tokenSupplier(KubernetesVaultTokenSupplier.newInstance());
7575
} else {
7676
builder.tokenSupplier(new EnvironmentVaultTokenSupplier());
7777
}

‎config-vault/src/test/java/io/scalecube/config/vault/VaultConfigSourceTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static void beforeAll() {
5353
@Test
5454
void testFirstTenant() {
5555
VaultConfigSource vaultConfigSource =
56-
new VaultConfigSource.Builder()
56+
VaultConfigSource.builder()
5757
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
5858
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
5959
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -70,7 +70,7 @@ void testFirstTenant() {
7070
@Test
7171
void testSecondTenant() {
7272
VaultConfigSource vaultConfigSource =
73-
new VaultConfigSource.Builder()
73+
VaultConfigSource.builder()
7474
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
7575
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
7676
.addSecretsPath(VAULT_SECRETS_PATH2)
@@ -87,7 +87,7 @@ void testSecondTenant() {
8787
@Test
8888
void testMultiplePathsEnv() {
8989
VaultConfigSource vaultConfigSource =
90-
new VaultConfigSource.Builder()
90+
VaultConfigSource.builder()
9191
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
9292
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
9393
.addSecretsPath(VAULT_SECRETS_PATH1 + ":" + VAULT_SECRETS_PATH2)
@@ -120,7 +120,7 @@ void testMultiplePathsEnv() {
120120
@Test
121121
void testMissingProperty() {
122122
VaultConfigSource vaultConfigSource =
123-
new VaultConfigSource.Builder()
123+
VaultConfigSource.builder()
124124
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
125125
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
126126
.addSecretsPath(VAULT_SECRETS_PATH3)
@@ -135,7 +135,7 @@ void testMissingProperty() {
135135

136136
@Test
137137
void testMissingTenant() {
138-
new VaultConfigSource.Builder()
138+
VaultConfigSource.builder()
139139
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
140140
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
141141
.addSecretsPath("secrets/unknown/path")
@@ -145,7 +145,7 @@ void testMissingTenant() {
145145
@Test
146146
void testInvalidAddress() {
147147
VaultConfigSource vaultConfigSource =
148-
new VaultConfigSource.Builder()
148+
VaultConfigSource.builder()
149149
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
150150
.config(c -> c.address("http://invalid.host.local:8200"))
151151
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -157,7 +157,7 @@ void testInvalidAddress() {
157157
@Test
158158
void testInvalidToken() {
159159
VaultConfigSource vaultConfigSource =
160-
new VaultConfigSource.Builder()
160+
VaultConfigSource.builder()
161161
.config(c -> c.token("zzzzzz"))
162162
.config(c -> c.address("http://invalid.host.local:8200"))
163163
.addSecretsPath("secrets/unknown/path")
@@ -178,7 +178,7 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsRunning() throws InterruptedExcep
178178
ConfigRegistrySettings.builder()
179179
.addLastSource(
180180
"vault",
181-
new VaultConfigSource.Builder()
181+
VaultConfigSource.builder()
182182
.config(vaultConfig -> vaultConfig.address(address).token(rootToken))
183183
.addSecretsPath(VAULT_SECRETS_PATH1)
184184
.build())
@@ -212,7 +212,7 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsDown() {
212212
ConfigRegistrySettings.builder()
213213
.addLastSource(
214214
"vault",
215-
new VaultConfigSource.Builder()
215+
VaultConfigSource.builder()
216216
.config(vaultConfig -> vaultConfig.address(address).token(rootToken))
217217
.addSecretsPath(VAULT_SECRETS_PATH1)
218218
.build())
@@ -244,7 +244,7 @@ void testSealed() throws Throwable {
244244
vault.seal().seal();
245245
assumeTrue(vault.seal().sealStatus().getSealed(), "vault seal status");
246246

247-
new VaultConfigSource.Builder()
247+
VaultConfigSource.builder()
248248
.config(c -> c.token("ROOT"))
249249
.config(c -> c.address(vaultInstance.address()))
250250
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -271,7 +271,7 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsUnSealed() throws InterruptedExce
271271
ConfigRegistrySettings.builder()
272272
.addLastSource(
273273
"vault",
274-
new VaultConfigSource.Builder()
274+
VaultConfigSource.builder()
275275
.config(vaultConfig -> vaultConfig.address(address).token(rootToken))
276276
.addSecretsPath(VAULT_SECRETS_PATH1)
277277
.build())
@@ -319,7 +319,7 @@ void testRenewableToken() throws InterruptedException {
319319
.getAuthClientToken();
320320

321321
VaultConfigSource vaultConfigSource =
322-
new VaultConfigSource.Builder()
322+
VaultConfigSource.builder()
323323
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
324324
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
325325
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -347,7 +347,7 @@ void testNonrenewableToken() {
347347
.getAuthClientToken();
348348

349349
VaultConfigSource vaultConfigSource =
350-
new VaultConfigSource.Builder()
350+
VaultConfigSource.builder()
351351
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
352352
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
353353
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -385,7 +385,7 @@ void testRenewableTokenWithExplicitMaxTtl() {
385385
.getAuthClientToken();
386386

387387
VaultConfigSource vaultConfigSource =
388-
new VaultConfigSource.Builder()
388+
VaultConfigSource.builder()
389389
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
390390
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
391391
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -423,7 +423,7 @@ void testRenewableTokenWithUseLimit() {
423423
.getAuthClientToken();
424424

425425
VaultConfigSource vaultConfigSource =
426-
new VaultConfigSource.Builder()
426+
VaultConfigSource.builder()
427427
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
428428
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
429429
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -449,7 +449,7 @@ void testRenewableTokenWithUseLimit() {
449449
@Test
450450
void testTokenSupplierGeneratesNewRenewableTokenWithExplicitMaxTtl() throws Exception {
451451
VaultConfigSource vaultConfigSource =
452-
new VaultConfigSource.Builder()
452+
VaultConfigSource.builder()
453453
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
454454
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
455455
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -482,7 +482,7 @@ void testRenewableTokenWhichWillBeRevoked() {
482482
.getAuthClientToken();
483483

484484
VaultConfigSource vaultConfigSource =
485-
new VaultConfigSource.Builder()
485+
VaultConfigSource.builder()
486486
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
487487
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
488488
.addSecretsPath(VAULT_SECRETS_PATH1)
@@ -515,7 +515,7 @@ void testRenewableTokenWhichWillBeRevoked() {
515515
void testTokenSupplierGeneratesNewRenewableTokenWhichWillBeRevoked() throws Exception {
516516
AtomicReference<String> tokenRef = new AtomicReference<>();
517517
VaultConfigSource vaultConfigSource =
518-
new VaultConfigSource.Builder()
518+
VaultConfigSource.builder()
519519
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
520520
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
521521
.addSecretsPath(VAULT_SECRETS_PATH1)

0 commit comments

Comments
 (0)