Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.smallrye.config:smallrye-config from 3.4.1 to 3.4.3 #2373

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Bump io.smallrye.config:smallrye-config from 3.4.1 to 3.4.3
Bumps [io.smallrye.config:smallrye-config](https://github.com/smallrye/smallrye-config) from 3.4.1 to 3.4.3.
- [Release notes](https://github.com/smallrye/smallrye-config/releases)
- [Commits](smallrye/smallrye-config@3.4.1...3.4.3)

---
updated-dependencies:
- dependency-name: io.smallrye.config:smallrye-config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and radcortez committed Nov 10, 2023
commit d9b074330e7266d5ea7a84da86869ff5e9752fdc
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@
<microprofile-metrics-api.version>4.0.1</microprofile-metrics-api.version>
<microprofile-health-api.version>4.0</microprofile-health-api.version>

<smallrye-config.version>3.4.1</smallrye-config.version>
<smallrye-config.version>3.4.3</smallrye-config.version>
<smallrye-metrics.version>4.0.0</smallrye-metrics.version>
<smallrye-common.version>2.2.0</smallrye-common.version>
<smallrye-health.version>4.0.4</smallrye-health.version>
Original file line number Diff line number Diff line change
@@ -182,20 +182,20 @@ public Iterable<String> getPropertyNames() {
}
} else if (name.startsWith(connectorPrefixAlphaUpper)) {
String computed = name.substring(connectorPrefixAlphaUpper.length());
if (nameExists(connectorPrefix + computed)) {
if (nameExists(connectorPrefixAlphaUpper + computed)) {
names.add(computed);
}
} else if (name.startsWith(prefix)) {
String computed = name.substring(prefix.length());
names.add(computed);
} else if (name.startsWith(prefixAlpha)) {
String computed = name.substring(prefixAlpha.length());
if (nameExists(prefix + computed)) {
if (nameExists(prefixAlpha + computed)) {
names.add(computed);
}
} else if (name.startsWith(prefixAlphaUpper)) {
String computed = name.substring(prefixAlphaUpper.length());
if (nameExists(prefix + computed)) {
if (nameExists(prefixAlphaUpper + computed)) {
names.add(computed);
}
}
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import org.junit.jupiter.api.condition.JRE;
import org.junitpioneer.jupiter.SetEnvironmentVariable;

import io.smallrye.config.EnvConfigSource;
import io.smallrye.config.SmallRyeConfig;
import io.smallrye.config.SmallRyeConfigBuilder;

@@ -100,33 +101,43 @@ public void testPropertyNames() {
assertThat(names)
.containsExactlyInAnyOrder("connector", "ATTR1", "attr1", "attr2", "attr.2", "ATTR", "attr", "AT_TR",
"at-tr", "key",
"SOME_KEY", "some-key", "SOME_OTHER_KEY", "ATTR3", "attr4", "channel-name");
"SOME_KEY", "some-key", "SOME_OTHER_KEY", "ATTR3", "attr4", "channel-name", "CAPSKEY");

assertThat(config.getOptionalValue("connector", String.class)).hasValue("some-connector");
assertThat(config.getOptionalValue("attr1", String.class)).hasValue("value");
assertThat(config.getOptionalValue("attr2", Integer.class)).hasValue(23);
assertThat(config.getOptionalValue("attr.2", String.class)).hasValue("test");
assertThat(config.getOptionalValue("at-tr", String.class)).hasValue("another-value");
assertThat(config.getOptionalValue("AT_TR", String.class)).hasValue("another-value");
assertThat(config.getConfigValue("at-tr")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
assertThat(config.getOptionalValue("some-key", String.class)).hasValue("another-value-from-connector");
assertThat(config.getOptionalValue("SOME_KEY", String.class)).hasValue("another-value-from-connector");
assertThat(config.getConfigValue("some-key")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
assertThat(config.getOptionalValue("key", String.class)).hasValue("value");
assertThat(config.getOptionalValue("attr3", String.class)).hasValue("used");
assertThat(config.getOptionalValue("ATTR3", String.class)).hasValue("used");
assertThat(config.getConfigValue("attr3")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
assertThat(config.getOptionalValue("attr4", String.class)).hasValue("used");
}

@Test
@SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR3", value = "used")
@SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", value = "used-2")
public void testGetFromEnv() {
// All uppercase value in env
assertThat(config.getOptionalValue("ATTR3", String.class)).hasValue("used");
// All lowercase value in env
assertThat(config.getOptionalValue("ATTR4", String.class)).hasValue("used-2");
// Mixed case value in env should not be found as it does not match the key we're looking for
// either in its original casing, or after conversion to uppercase.
// mp_messaging_connector_some_connector_attr4 is selected because is closer to mp.messaging.connector.some-connector.attr4
assertThat(new EnvConfigSource(Map.of("mp_messaging_connector_some_connector_attr4", "used",
"MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", "used-2"), 100).getValue(
"mp.messaging.connector.some-connector.attr4"))
.isEqualTo("used");
// when there are no competing properties select the one that exists
assertThat(new EnvConfigSource(Map.of("MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", "used-2"), 100).getValue(
"mp.messaging.connector.some-connector.attr4")).isEqualTo("used-2");

assertThat(config.getOptionalValue("attr3", String.class)).hasValue("used");
assertThat(config.getConfigValue("attr3")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
// both mp_messaging_connector_some_connector_attr4 and MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4 are set in Env
// lookup is done to mp.messaging.connector.some-connector.attr4, selects mp_messaging_connector_some_connector_attr4
assertThat(config.getOptionalValue("attr4", String.class)).hasValue("used");
assertThat(config.getConfigValue("attr4")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
assertThat(config.getOptionalValue("mixedcase", String.class)).hasValue("used");
assertThat(config.getConfigValue("mixedcase")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource");
}

@Test