Skip to content

Commit 77865cc

Browse files
tvernumtalevy
andauthored
Deprecation message is different on FIPS JVM (#39025)
Due to certain settings not be allowed on a FIPS JVM, this test generates a slightly different deprecation message when run in FIPS mode. This change makes the message conditional on the JVM mode. Co-authored-by: Tal Levy <[email protected]> Co-authored-by: Tim Vernum <[email protected]>
1 parent 47806ec commit 77865cc

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

x-pack/plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@ public void testFiltering() throws Exception {
146146
if (useLegacyLdapBindPassword) {
147147
deprecatedSettings.add(PoolingSessionFactorySettings.LEGACY_BIND_PASSWORD);
148148
}
149+
150+
String fallbackProperties = inFipsJvm() ? "supported protocols" : "key configuration, trust configuration, supported protocols";
149151
assertSettingDeprecationsAndWarnings(deprecatedSettings.toArray(new Setting<?>[0]), "SSL configuration [xpack.http.ssl] relies " +
150-
"upon fallback to another configuration for [key configuration, trust configuration, supported protocols], " +
151-
"which is deprecated.");
152+
"upon fallback to another configuration for [" + fallbackProperties + "], which is deprecated.");
152153
}
153154

154155
private void configureUnfilteredSetting(String settingName, String value) {

0 commit comments

Comments
 (0)