Remove security bootstrap check that uses Version

thecoop · Oct 16, 2024 · c1b7316 · c1b7316
1 parent 58b588c
commit c1b7316
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 152 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java b/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java
@@ -66,7 +66,6 @@ public enum ReferenceDocs {
     BOOTSTRAP_CHECK_ROLE_MAPPINGS,
     BOOTSTRAP_CHECK_TLS,
     BOOTSTRAP_CHECK_TOKEN_SSL,
-    BOOTSTRAP_CHECK_SECURITY_MINIMAL_SETUP,
     CONTACT_SUPPORT,
     UNASSIGNED_SHARDS,
     EXECUTABLE_JNA_TMPDIR,

diff --git a/server/src/main/java/org/elasticsearch/env/BuildVersion.java b/server/src/main/java/org/elasticsearch/env/BuildVersion.java
@@ -11,6 +11,7 @@
 
 import org.elasticsearch.Build;
 import org.elasticsearch.Version;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.internal.BuildExtension;
 import org.elasticsearch.plugins.ExtensionLoader;
 
@@ -58,10 +59,8 @@ public abstract class BuildVersion {
      */
     public abstract boolean isFutureVersion();
 
-    // temporary
-    // TODO[wrb]: remove from PersistedClusterStateService
-    // TODO[wrb]: remove from security bootstrap checks
     @Deprecated
+    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)  // used (indirectly) by NodeMetadata and PersistedClusterStateService
     public Version toVersion() {
         return null;
     }

diff --git a/server/src/main/resources/org/elasticsearch/common/reference-docs-links.txt b/server/src/main/resources/org/elasticsearch/common/reference-docs-links.txt
@@ -28,7 +28,6 @@ BOOTSTRAP_CHECK_PKI_REALM                                       bootstrap-checks
 BOOTSTRAP_CHECK_ROLE_MAPPINGS                                   bootstrap-checks-xpack.html#bootstrap-checks-xpack-role-mappings
 BOOTSTRAP_CHECK_TLS                                             bootstrap-checks-xpack.html#bootstrap-checks-tls
 BOOTSTRAP_CHECK_TOKEN_SSL                                       bootstrap-checks-xpack.html#bootstrap-checks-xpack-token-ssl
-BOOTSTRAP_CHECK_SECURITY_MINIMAL_SETUP                          security-minimal-setup.html
 CONTACT_SUPPORT                                                 troubleshooting.html#troubleshooting-contact-support
 UNASSIGNED_SHARDS                                               red-yellow-cluster-status.html
 EXECUTABLE_JNA_TMPDIR                                           executable-jna-tmpdir.html

diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
@@ -810,13 +810,11 @@ Collection<Object> createComponents(
         // We need to construct the checks here while the secure settings are still available.
         // If we wait until #getBoostrapChecks the secure settings will have been cleared/closed.
         final List<BootstrapCheck> checks = new ArrayList<>();
-        checks.addAll(
-            Arrays.asList(
-                new TokenSSLBootstrapCheck(),
-                new PkiRealmBootstrapCheck(getSslService()),
-                new SecurityImplicitBehaviorBootstrapCheck(nodeMetadata, getLicenseService()),
-                new TransportTLSBootstrapCheck()
-            )
+        Collections.addAll(
+            checks,
+            new TokenSSLBootstrapCheck(),
+            new PkiRealmBootstrapCheck(getSslService()),
+            new TransportTLSBootstrapCheck()
         );
         checks.addAll(InternalRealms.getBootstrapChecks(settings, environment));
         this.bootstrapChecks.set(Collections.unmodifiableList(checks));

diff --git a/...rc/main/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheck.java b/...rc/main/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheck.java
diff --git a/...st/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java b/...st/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java