From e6a56ec05d6d7758dca28483959b8b20f8004a45 Mon Sep 17 00:00:00 2001 From: shikharj05 <8859327+shikharj05@users.noreply.github.com> Date: Fri, 7 Mar 2025 08:07:24 +0530 Subject: [PATCH] Update AuditConfig.DEPRECATED_KEYS deprecation message to match 4.0 Signed-off-by: shikharj05 <8859327+shikharj05@users.noreply.github.com> --- .../org/opensearch/security/auditlog/config/AuditConfig.java | 1 + .../security/configuration/ConfigurationRepository.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opensearch/security/auditlog/config/AuditConfig.java b/src/main/java/org/opensearch/security/auditlog/config/AuditConfig.java index 4a54d2ea59..3beb956209 100644 --- a/src/main/java/org/opensearch/security/auditlog/config/AuditConfig.java +++ b/src/main/java/org/opensearch/security/auditlog/config/AuditConfig.java @@ -542,6 +542,7 @@ public String toString() { /** * List of keys that are deprecated */ + @Deprecated public static final List DEPRECATED_KEYS = ImmutableList.of( ConfigConstants.OPENDISTRO_SECURITY_AUDIT_ENABLE_REST, ConfigConstants.OPENDISTRO_SECURITY_AUDIT_CONFIG_DISABLED_REST_CATEGORIES, diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java index d81ac17768..1c3c5562b4 100644 --- a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java +++ b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java @@ -307,7 +307,7 @@ private void setupAuditConfigurationIfAny(final boolean auditConfigDocPresent) { final Set deprecatedAuditKeysInSettings = AuditConfig.getDeprecatedKeys(settings); if (!deprecatedAuditKeysInSettings.isEmpty()) { LOGGER.warn( - "Following keys {} are deprecated in opensearch settings. They will be removed in plugin v2.0.0.0", + "Following keys {} are deprecated in opensearch settings. They will be removed in plugin v4.0.0.0", deprecatedAuditKeysInSettings ); }