Skip to content

Commit a2d19f0

Browse files
artem-vartem-v
authored
Merge pull request #208 from scalecube/cleanup-dependencies
Updated scalecube-parent to use jdk17. Get rid of dependency on slf4j. Cleanup and update vault-config classes.
2 parents 6581952 + 3e7500b commit a2d19f0

File tree

24 files changed

+439
-208
lines changed

24 files changed

+439
-208
lines changed

‎.github/workflows/branch-ci.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@ jobs:
1414
name: Branch CI
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/cache@v1
17+
- uses: actions/checkout@v4
18+
- uses: actions/cache@v3
1919
with:
2020
path: ~/.m2/repository
2121
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2222
restore-keys: |
2323
${{ runner.os }}-maven-
24-
- name: Set up JDK 1.8
25-
uses: actions/setup-java@v1
24+
- name: Set up JDK
25+
uses: actions/setup-java@v4
2626
with:
27-
java-version: 1.8
27+
java-version: 17
28+
distribution: zulu
2829
server-id: github
2930
server-username: GITHUB_ACTOR
3031
server-password: GITHUB_TOKEN
3132
- name: Maven Build
32-
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V
33+
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3334
env:
3435
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3536
- name: Maven Verify

‎.github/workflows/pre-release-ci.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ jobs:
99
name: Pre-release CI
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/cache@v1
12+
- uses: actions/checkout@v4
13+
- uses: actions/cache@v3
1414
with:
1515
path: ~/.m2/repository
1616
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
1717
restore-keys: |
1818
${{ runner.os }}-maven-
1919
- name: Set up Java for publishing to GitHub Packages
20-
uses: actions/setup-java@v1
20+
uses: actions/setup-java@v4
2121
with:
22-
java-version: 1.8
22+
java-version: 17
23+
distribution: zulu
2324
server-id: github
2425
server-username: GITHUB_ACTOR
2526
server-password: GITHUB_TOKEN
@@ -33,9 +34,10 @@ jobs:
3334
env:
3435
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3536
- name: Set up Java for publishing to Maven Central Repository
36-
uses: actions/setup-java@v1
37+
uses: actions/setup-java@v4
3738
with:
38-
java-version: 1.8
39+
java-version: 17
40+
distribution: zulu
3941
server-id: ossrh
4042
server-username: MAVEN_USERNAME
4143
server-password: MAVEN_PASSWORD

‎.github/workflows/release-ci.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ jobs:
99
name: Release CI
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- run: git checkout ${{ github.event.release.target_commitish }}
16-
- uses: actions/cache@v1
16+
- uses: actions/cache@v3
1717
with:
1818
path: ~/.m2/repository
1919
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2020
restore-keys: |
2121
${{ runner.os }}-maven-
2222
- name: Set up Java for publishing to GitHub Packages
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@v4
2424
with:
25-
java-version: 1.8
25+
java-version: 17
26+
distribution: zulu
2627
server-id: github
2728
server-username: GITHUB_ACTOR
2829
server-password: GITHUB_TOKEN
2930
- name: Maven Build
30-
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
31+
run: mvn clean install -DskipTests=true -B -V
3132
env:
3233
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3334
- name: Maven Verify
@@ -41,17 +42,18 @@ jobs:
4142
run: |
4243
mvn -B build-helper:parse-version release:prepare \
4344
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
44-
-Darguments="-DskipTests=true -Ddockerfile.skip=true"
45+
-Darguments="-DskipTests=true"
4546
echo release_tag=$(git describe --tags --abbrev=0) >> $GITHUB_OUTPUT
4647
- name: Perform release
47-
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github"
48+
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Pdeploy2Github"
4849
env:
4950
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5051
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
5152
- name: Set up Java for publishing to Maven Central Repository
52-
uses: actions/setup-java@v1
53+
uses: actions/setup-java@v4
5354
with:
54-
java-version: 1.8
55+
java-version: 17
56+
distribution: zulu
5557
server-id: ossrh
5658
server-username: MAVEN_USERNAME
5759
server-password: MAVEN_PASSWORD

‎checkstyle-suppressions.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
6+
7+
8+
<suppressions>
9+
<suppress checks="AbbreviationAsWordInName" files=".*"/>
10+
<suppress checks="MissingJavadocTypeCheck" files=".*"/>
11+
<suppress checks="MissingJavadocMethodCheck" files=".*"/>
12+
<suppress checks="MissingSwitchDefault" files=".*"/>
13+
<suppress checks="VariableDeclarationUsageDistance" files=".*"/>
14+
</suppressions>

‎config-examples/pom.xml‎

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

47
<parent>
58
<groupId>io.scalecube</groupId>
69
<artifactId>scalecube-config-parent</artifactId>
710
<version>0.4.21-SNAPSHOT</version>
811
</parent>
9-
<modelVersion>4.0.0</modelVersion>
1012

1113
<artifactId>scalecube-config-examples</artifactId>
1214

@@ -16,6 +18,14 @@
1618
<artifactId>scalecube-config</artifactId>
1719
<version>${project.version}</version>
1820
</dependency>
21+
<dependency>
22+
<groupId>org.apache.logging.log4j</groupId>
23+
<artifactId>log4j-core</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.apache.logging.log4j</groupId>
27+
<artifactId>log4j-jpl</artifactId>
28+
</dependency>
1929
</dependencies>
2030

2131
</project>

‎config-examples/src/main/java/io/scalecube/config/examples/ConfigRegistryExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.scalecube.config.ConfigRegistry;
44
import io.scalecube.config.ConfigRegistrySettings;
55
import io.scalecube.config.StringConfigProperty;
6-
import io.scalecube.config.audit.Slf4JConfigEventListener;
6+
import io.scalecube.config.audit.LoggingConfigEventListener;
77
import io.scalecube.config.source.ClassPathConfigSource;
88
import io.scalecube.config.source.FileDirectoryConfigSource;
99
import java.nio.file.Path;
@@ -28,7 +28,7 @@ public static void main(String[] args) {
2828
.addLastSource("classpath", new ClassPathConfigSource(propsPredicate))
2929
.addLastSource(
3030
"configDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
31-
.addListener(new Slf4JConfigEventListener())
31+
.addListener(new LoggingConfigEventListener())
3232
.jmxEnabled(true)
3333
.jmxMBeanName("config.exporter:name=ConfigRegistry")
3434
.build());

‎config-examples/src/main/java/io/scalecube/config/examples/DemoConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.scalecube.config.ConfigRegistry;
44
import io.scalecube.config.ConfigRegistrySettings;
55
import io.scalecube.config.StringConfigProperty;
6-
import io.scalecube.config.audit.Slf4JConfigEventListener;
6+
import io.scalecube.config.audit.LoggingConfigEventListener;
77
import io.scalecube.config.source.FileDirectoryConfigSource;
88
import java.nio.file.Path;
99
import java.util.function.Predicate;
@@ -33,7 +33,7 @@ public static void main(String[] args) {
3333
ConfigRegistrySettings.builder()
3434
.addLastSource(
3535
"ConfigDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
36-
.addListener(new Slf4JConfigEventListener())
36+
.addListener(new LoggingConfigEventListener())
3737
.keepRecentConfigEvents(10)
3838
.reloadIntervalSec(3)
3939
.jmxEnabled(true)

‎config-examples/src/main/java/io/scalecube/config/examples/ReloadableLocalResourceConfigExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import io.scalecube.config.ListConfigProperty;
77
import io.scalecube.config.ObjectConfigProperty;
88
import io.scalecube.config.StringConfigProperty;
9-
import io.scalecube.config.audit.Slf4JConfigEventListener;
9+
import io.scalecube.config.audit.LoggingConfigEventListener;
1010
import io.scalecube.config.source.FileDirectoryConfigSource;
1111
import java.io.BufferedWriter;
1212
import java.io.File;
@@ -45,7 +45,7 @@ public static void main(String[] args) throws Exception {
4545
basePath,
4646
Stream.of(reloadablePropsPredicate, propsPredicate)
4747
.collect(Collectors.toList())))
48-
.addListener(new Slf4JConfigEventListener())
48+
.addListener(new LoggingConfigEventListener())
4949
.reloadIntervalSec(1)
5050
.build());
5151

‎config-vault/pom.xml‎

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

57
<parent>
@@ -20,12 +22,6 @@
2022
<groupId>com.bettercloud</groupId>
2123
<artifactId>vault-java-driver</artifactId>
2224
</dependency>
23-
<!-- Tests -->
24-
<dependency>
25-
<groupId>org.testcontainers</groupId>
26-
<artifactId>vault</artifactId>
27-
<scope>test</scope>
28-
</dependency>
2925
</dependencies>
3026

3127
</project>

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

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,19 @@ public class KubernetesVaultTokenSupplier implements VaultTokenSupplier {
1515

1616
private static final EnvironmentLoader ENVIRONMENT_LOADER = new EnvironmentLoader();
1717

18-
private String vaultRole = ENVIRONMENT_LOADER.loadVariable("VAULT_ROLE");
18+
private final String vaultRole;
19+
private final String vaultJwtProvider;
20+
private final String serviceAccountTokenPath;
1921

20-
private String vaultJwtProvider =
21-
Optional.ofNullable(
22-
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("VAULT_JWT_PROVIDER"))
23-
.orElse(ENVIRONMENT_LOADER.loadVariable("VAULT_MOUNT_POINT")))
24-
.orElse("kubernetes");
25-
26-
private String serviceAccountTokenPath =
27-
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("SERVICE_ACCOUNT_TOKEN_PATH"))
28-
.orElse("/var/run/secrets/kubernetes.io/serviceaccount/token");
29-
30-
public KubernetesVaultTokenSupplier vaultRole(String vaultRole) {
31-
this.vaultRole = vaultRole;
32-
return this;
33-
}
34-
35-
public KubernetesVaultTokenSupplier vaultJwtProvider(String vaultJwtProvider) {
36-
this.vaultJwtProvider = vaultJwtProvider;
37-
return this;
38-
}
39-
40-
public KubernetesVaultTokenSupplier serviceAccountTokenPath(String serviceAccountTokenPath) {
41-
this.serviceAccountTokenPath = serviceAccountTokenPath;
42-
return this;
22+
private KubernetesVaultTokenSupplier(Builder builder) {
23+
this.vaultRole = Objects.requireNonNull(builder.vaultRole, "vault role");
24+
this.vaultJwtProvider = Objects.requireNonNull(builder.vaultJwtProvider, "jwt provider");
25+
this.serviceAccountTokenPath =
26+
Objects.requireNonNull(builder.serviceAccountTokenPath, "k8s service account token path");
4327
}
4428

4529
@Override
4630
public String getToken(VaultConfig config) {
47-
Objects.requireNonNull(vaultRole, "vault role");
48-
Objects.requireNonNull(vaultJwtProvider, "jwt provider");
49-
Objects.requireNonNull(serviceAccountTokenPath, "k8s service account token path");
5031
try (Stream<String> stream = Files.lines(Paths.get(serviceAccountTokenPath))) {
5132
String jwt = stream.collect(Collectors.joining());
5233
return Objects.requireNonNull(
@@ -59,4 +40,40 @@ public String getToken(VaultConfig config) {
5940
throw ThrowableUtil.propagate(e);
6041
}
6142
}
43+
44+
public static class Builder {
45+
46+
private String vaultRole = ENVIRONMENT_LOADER.loadVariable("VAULT_ROLE");
47+
48+
private String vaultJwtProvider =
49+
Optional.ofNullable(
50+
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("VAULT_JWT_PROVIDER"))
51+
.orElse(ENVIRONMENT_LOADER.loadVariable("VAULT_MOUNT_POINT")))
52+
.orElse("kubernetes");
53+
54+
private String serviceAccountTokenPath =
55+
Optional.ofNullable(ENVIRONMENT_LOADER.loadVariable("SERVICE_ACCOUNT_TOKEN_PATH"))
56+
.orElse("/var/run/secrets/kubernetes.io/serviceaccount/token");
57+
58+
public Builder() {}
59+
60+
public Builder vaultRole(String vaultRole) {
61+
this.vaultRole = vaultRole;
62+
return this;
63+
}
64+
65+
public Builder vaultJwtProvider(String vaultJwtProvider) {
66+
this.vaultJwtProvider = vaultJwtProvider;
67+
return this;
68+
}
69+
70+
public Builder serviceAccountTokenPath(String serviceAccountTokenPath) {
71+
this.serviceAccountTokenPath = serviceAccountTokenPath;
72+
return this;
73+
}
74+
75+
public KubernetesVaultTokenSupplier build() {
76+
return new KubernetesVaultTokenSupplier(this);
77+
}
78+
}
6279
}

0 commit comments

Comments
 (0)