Skip to content

Commit 752472f

Browse files
artem-vartem-v
authored
Merge pull request #188 from scalecube/update-vault-config-source-behavior
Changed behavior in VaultConfigSource when vault returns 404
2 parents 2721622 + ee41e57 commit 752472f

File tree

6 files changed

+45
-39
lines changed

6 files changed

+45
-39
lines changed

‎config-vault/pom.xml‎

Lines changed: 4 additions & 15 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>
@@ -11,9 +13,8 @@
1113
<artifactId>config-vault</artifactId>
1214

1315
<properties>
14-
<log4j.version>2.13.3</log4j.version>
1516
<vault-java-driver.version>5.1.0</vault-java-driver.version>
16-
<testcontainers.version>1.12.3</testcontainers.version>
17+
<testcontainers.version>1.15.2</testcontainers.version>
1718
</properties>
1819

1920
<dependencies>
@@ -33,17 +34,5 @@
3334
<version>${testcontainers.version}</version>
3435
<scope>test</scope>
3536
</dependency>
36-
<dependency>
37-
<groupId>org.apache.logging.log4j</groupId>
38-
<artifactId>log4j-slf4j-impl</artifactId>
39-
<version>${log4j.version}</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.apache.logging.log4j</groupId>
44-
<artifactId>log4j-core</artifactId>
45-
<version>${log4j.version}</version>
46-
<scope>test</scope>
47-
</dependency>
4837
</dependencies>
4938
</project>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.bettercloud.vault.EnvironmentLoader;
44
import com.bettercloud.vault.VaultConfig;
5+
import com.bettercloud.vault.VaultException;
56
import com.bettercloud.vault.response.LogicalResponse;
67
import io.scalecube.config.ConfigProperty;
78
import io.scalecube.config.ConfigSourceNotAvailableException;
@@ -55,8 +56,14 @@ public Map<String, ConfigProperty> loadConfig() {
5556
.map(LoadedConfigProperty.Builder::build)
5657
.collect(Collectors.toMap(LoadedConfigProperty::name, Function.identity()));
5758
result.putAll(pathProps);
59+
} catch (VaultException ex) {
60+
if (ex.getHttpStatusCode() == 404) {
61+
LOGGER.warn("Unable to load config properties from: {}", path);
62+
} else {
63+
throw new ConfigSourceNotAvailableException(ex);
64+
}
5865
} catch (Exception ex) {
59-
LOGGER.warn("Unable to load config properties from {}", path, ex);
66+
LOGGER.error("Unable to load config properties from: {}, cause:", path, ex);
6067
throw new ConfigSourceNotAvailableException(ex);
6168
}
6269
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,11 @@ void testMissingProperty() {
135135

136136
@Test
137137
void testMissingTenant() {
138-
VaultConfigSource vaultConfigSource =
139-
VaultConfigSource.builder()
140-
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
141-
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
142-
.addSecretsPath("secrets/unknown/path")
143-
.build();
144-
145-
assertThrows(ConfigSourceNotAvailableException.class, vaultConfigSource::loadConfig);
138+
VaultConfigSource.builder()
139+
.config(c -> c.token(vaultContainerExtension.vaultInstance().rootToken()))
140+
.config(c -> c.address(vaultContainerExtension.vaultInstance().address()))
141+
.addSecretsPath("secrets/unknown/path")
142+
.build();
146143
}
147144

148145
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class VaultInstance implements AutoCloseable {
3232

3333
private static final Logger LOGGER = LoggerFactory.getLogger(VaultInstance.class);
3434

35-
private static final String VAULT_IMAGE_NAME = "vault:1.2.3";
35+
private static final String VAULT_IMAGE_NAME = "vault:1.6.1";
3636
private static final int VAULT_PORT = 8200;
3737
private static final AtomicInteger PORT_COUNTER = new AtomicInteger(VAULT_PORT);
3838
private static final String UNSEAL_KEY_LOG = "Unseal Key: ";

‎config/pom.xml‎

Lines changed: 3 additions & 13 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

46
<parent>
57
<groupId>io.scalecube</groupId>
@@ -21,18 +23,6 @@
2123
</dependency>
2224

2325
<!-- Test dependencies -->
24-
<dependency>
25-
<groupId>org.apache.logging.log4j</groupId>
26-
<artifactId>log4j-slf4j-impl</artifactId>
27-
<version>${log4j.version}</version>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.logging.log4j</groupId>
32-
<artifactId>log4j-core</artifactId>
33-
<version>${log4j.version}</version>
34-
<scope>test</scope>
35-
</dependency>
3626
<dependency>
3727
<groupId>com.fasterxml.jackson.datatype</groupId>
3828
<artifactId>jackson-datatype-jdk8</artifactId>

‎pom.xml‎

Lines changed: 24 additions & 1 deletion
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>
@@ -50,9 +52,12 @@
5052
<jersey.version>2.26-b09</jersey.version>
5153
<commons-io.version>2.6</commons-io.version>
5254

55+
<log4j.version>2.13.3</log4j.version>
5356
<mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>
5457
<junit-jupiter.version>5.1.1</junit-jupiter.version>
5558
<hamcrest.version>1.3</hamcrest.version>
59+
<!-- TODO: remove explicit version of `jna` once testcontainers fixes dependencies conflict -->
60+
<jna.version>5.5.0</jna.version>
5661
</properties>
5762

5863
<modules>
@@ -107,6 +112,12 @@
107112
<artifactId>commons-io</artifactId>
108113
<version>${commons-io.version}</version>
109114
</dependency>
115+
<dependency>
116+
<groupId>net.java.dev.jna</groupId>
117+
<artifactId>jna</artifactId>
118+
<version>${jna.version}</version>
119+
<scope>test</scope>
120+
</dependency>
110121
</dependencies>
111122
</dependencyManagement>
112123

@@ -142,6 +153,18 @@
142153
<version>${hamcrest.version}</version>
143154
<scope>test</scope>
144155
</dependency>
156+
<dependency>
157+
<groupId>org.apache.logging.log4j</groupId>
158+
<artifactId>log4j-slf4j-impl</artifactId>
159+
<version>${log4j.version}</version>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.apache.logging.log4j</groupId>
164+
<artifactId>log4j-core</artifactId>
165+
<version>${log4j.version}</version>
166+
<scope>test</scope>
167+
</dependency>
145168
</dependencies>
146169

147170
<profiles>

0 commit comments

Comments
 (0)