Skip to content

Commit cc6e741

Browse files
authored
Remove security bootstrap check that uses Version (#114923)
1 parent a281d62 commit cc6e741

File tree

7 files changed

+5
-161
lines changed

7 files changed

+5
-161
lines changed

server/src/main/java/org/elasticsearch/common/ReferenceDocs.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public enum ReferenceDocs {
6666
BOOTSTRAP_CHECK_ROLE_MAPPINGS,
6767
BOOTSTRAP_CHECK_TLS,
6868
BOOTSTRAP_CHECK_TOKEN_SSL,
69-
BOOTSTRAP_CHECK_SECURITY_MINIMAL_SETUP,
7069
CONTACT_SUPPORT,
7170
UNASSIGNED_SHARDS,
7271
EXECUTABLE_JNA_TMPDIR,

server/src/main/java/org/elasticsearch/env/BuildVersion.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ public abstract class BuildVersion {
5858
*/
5959
public abstract boolean isFutureVersion();
6060

61-
// temporary
62-
// TODO[wrb]: remove from security bootstrap checks
63-
@Deprecated
64-
public Version toVersion() {
65-
return null;
66-
}
67-
6861
/**
6962
* Create a {@link BuildVersion} from a version ID number.
7063
*

server/src/main/java/org/elasticsearch/env/DefaultBuildVersion.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ public int id() {
5252
return versionId;
5353
}
5454

55-
@Override
56-
public Version toVersion() {
57-
return version;
58-
}
59-
6055
@Override
6156
public boolean equals(Object o) {
6257
if (this == o) return true;

server/src/main/resources/org/elasticsearch/common/reference-docs-links.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ BOOTSTRAP_CHECK_PKI_REALM bootstrap-checks
2828
BOOTSTRAP_CHECK_ROLE_MAPPINGS bootstrap-checks-xpack.html#bootstrap-checks-xpack-role-mappings
2929
BOOTSTRAP_CHECK_TLS bootstrap-checks-xpack.html#bootstrap-checks-tls
3030
BOOTSTRAP_CHECK_TOKEN_SSL bootstrap-checks-xpack.html#bootstrap-checks-xpack-token-ssl
31-
BOOTSTRAP_CHECK_SECURITY_MINIMAL_SETUP security-minimal-setup.html
3231
CONTACT_SUPPORT troubleshooting.html#troubleshooting-contact-support
3332
UNASSIGNED_SHARDS red-yellow-cluster-status.html
3433
EXECUTABLE_JNA_TMPDIR executable-jna-tmpdir.html

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -810,13 +810,11 @@ Collection<Object> createComponents(
810810
// We need to construct the checks here while the secure settings are still available.
811811
// If we wait until #getBoostrapChecks the secure settings will have been cleared/closed.
812812
final List<BootstrapCheck> checks = new ArrayList<>();
813-
checks.addAll(
814-
Arrays.asList(
815-
new TokenSSLBootstrapCheck(),
816-
new PkiRealmBootstrapCheck(getSslService()),
817-
new SecurityImplicitBehaviorBootstrapCheck(nodeMetadata, getLicenseService()),
818-
new TransportTLSBootstrapCheck()
819-
)
813+
Collections.addAll(
814+
checks,
815+
new TokenSSLBootstrapCheck(),
816+
new PkiRealmBootstrapCheck(getSslService()),
817+
new TransportTLSBootstrapCheck()
820818
);
821819
checks.addAll(InternalRealms.getBootstrapChecks(settings, environment));
822820
this.bootstrapChecks.set(Collections.unmodifiableList(checks));

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheck.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

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

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)