Skip to content

Commit 96e9ee7

Browse files
committed
Tests: Make secure settings available from settings builder for tests (#25037)
This commit exposes the secure settings in Settings.Builder, so that the current secure settings can be retrieved and added to when creating settings for tests. This is necessary since secure settings can only be added once to a builder, so chains of methods using settings builders must reuse the already set mock secure settings.
1 parent 4ed3fd8 commit 96e9ee7

File tree

1 file changed

+5
-0
lines changed
  • core/src/main/java/org/elasticsearch/common/settings

1 file changed

+5
-0
lines changed

core/src/main/java/org/elasticsearch/common/settings/Settings.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,11 @@ public String get(String key) {
697697
return map.get(key);
698698
}
699699

700+
/** Return the current secure settings, or {@code null} if none have been set. */
701+
public SecureSettings getSecureSettings() {
702+
return secureSettings.get();
703+
}
704+
700705
public Builder setSecureSettings(SecureSettings secureSettings) {
701706
if (secureSettings.isLoaded() == false) {
702707
throw new IllegalStateException("Secure settings must already be loaded");

0 commit comments

Comments
 (0)