Skip to content

Commit 6d753c3

Browse files
artem-vartem-v
committed
Updated parent pom, clean up vault-config classes
1 parent 19aa382 commit 6d753c3

File tree

9 files changed

+32
-40
lines changed

9 files changed

+32
-40
lines changed

‎config-examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
56

67
<parent>
78
<groupId>io.scalecube</groupId>
89
<artifactId>scalecube-config-parent</artifactId>
910
<version>0.4.21-SNAPSHOT</version>
1011
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1212

1313
<artifactId>scalecube-config-examples</artifactId>
1414

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ 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-
3329
@Override
3430
public String getToken(VaultConfig config) {
3531
try (Stream<String> stream = Files.lines(Paths.get(serviceAccountTokenPath))) {
@@ -59,7 +55,7 @@ public static class Builder {
5955
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("SERVICE_ACCOUNT_TOKEN_PATH"))
6056
.orElse("/var/run/secrets/kubernetes.io/serviceaccount/token");
6157

62-
private Builder() {}
58+
public Builder() {}
6359

6460
public Builder vaultRole(String vaultRole) {
6561
this.vaultRole = vaultRole;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ private String getToken0() {
8080
+ "ignoring EnvironmentVaultTokenSupplier "
8181
+ "(specify either vaultToken or vaultRole, not both)");
8282
}
83-
vaultTokenSupplier = KubernetesVaultTokenSupplier.builder().vaultRole(vaultRole).build();
83+
vaultTokenSupplier =
84+
new KubernetesVaultTokenSupplier.Builder().vaultRole(vaultRole).build();
8485
vaultConfig = new VaultConfig().address(vaultAddress).build();
8586
} else {
8687
vaultTokenSupplier = new EnvironmentVaultTokenSupplier();

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ public Map<String, ConfigProperty> loadConfig() {
7070
return result;
7171
}
7272

73-
public static Builder builder() {
74-
return new Builder();
75-
}
76-
7773
public static final class Builder {
7874

7975
private Function<VaultInvoker.Builder, VaultInvoker.Builder> builderFunction =
@@ -90,7 +86,7 @@ public static final class Builder {
9086
.map(HashSet::new)
9187
.orElseGet(HashSet::new);
9288

93-
private Builder() {}
89+
public Builder() {}
9490

9591
/**
9692
* Appends {@code secretsPath} to {@code secretsPaths}.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ public class VaultInvoker {
3636
private Vault vault;
3737
private Timer timer;
3838

39-
public static Builder builder() {
40-
return new Builder();
41-
}
42-
4339
private VaultInvoker(Builder builder) {
4440
this.builder = builder;
4541
}
@@ -221,6 +217,8 @@ public static class Builder {
221217

222218
private VaultTokenSupplier tokenSupplier = new EnvironmentVaultTokenSupplier();
223219

220+
public Builder() {}
221+
224222
public Builder options(UnaryOperator<VaultConfig> config) {
225223
this.options = this.options.andThen(config);
226224
return this;

‎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-
VaultInvoker.builder()
64+
new VaultInvoker.Builder()
6565
.options(config -> config.address(vaultAddr).engineVersion(vaultEngineVersion));
6666

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

‎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-
VaultConfigSource.builder()
56+
new 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-
VaultConfigSource.builder()
73+
new 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-
VaultConfigSource.builder()
90+
new 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-
VaultConfigSource.builder()
123+
new 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-
VaultConfigSource.builder()
138+
new 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-
VaultConfigSource.builder()
148+
new 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-
VaultConfigSource.builder()
160+
new 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-
VaultConfigSource.builder()
181+
new 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-
VaultConfigSource.builder()
215+
new 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-
VaultConfigSource.builder()
247+
new 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-
VaultConfigSource.builder()
274+
new VaultConfigSource.Builder()
275275
.config(vaultConfig -> vaultConfig.address(address).token(rootToken))
276276
.secretsPath(VAULT_SECRETS_PATH1)
277277
.build())
@@ -319,7 +319,7 @@ void testRenewableToken() throws InterruptedException {
319319
.getAuthClientToken();
320320

321321
VaultConfigSource vaultConfigSource =
322-
VaultConfigSource.builder()
322+
new 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-
VaultConfigSource.builder()
350+
new 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-
VaultConfigSource.builder()
388+
new 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-
VaultConfigSource.builder()
426+
new 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-
VaultConfigSource.builder()
452+
new 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-
VaultConfigSource.builder()
485+
new 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-
VaultConfigSource.builder()
518+
new VaultConfigSource.Builder()
519519
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
520520
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
521521
.addSecretsPath(VAULT_SECRETS_PATH1)

‎config/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
56

67
<parent>
78
<groupId>io.scalecube</groupId>
89
<artifactId>scalecube-config-parent</artifactId>
910
<version>0.4.21-SNAPSHOT</version>
1011
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1212

1313
<artifactId>scalecube-config</artifactId>
1414

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.scalecube</groupId>
99
<artifactId>scalecube-parent</artifactId>
10-
<version>0.2.21.test.rc3</version>
10+
<version>0.2.21.test.rc4</version>
1111
</parent>
1212

1313
<artifactId>scalecube-config-parent</artifactId>
@@ -52,6 +52,7 @@
5252

5353
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-config
5454
</distributionManagement.url>
55+
<checkstyle.suppressions.location>checkstyle-suppressions.xml</checkstyle.suppressions.location>
5556
</properties>
5657

5758
<modules>

0 commit comments

Comments
 (0)