Remove delay initialization setting used for integ test on main

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Mar 12, 2024 · daf4459 · daf4459
1 parent bcee3e3
commit daf4459
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -1029,7 +1029,6 @@ public List<Setting<?>> getSettings() {
             //compat
             settings.add(Setting.boolSetting(ConfigConstants.SECURITY_UNSUPPORTED_DISABLE_INTERTRANSPORT_AUTH_INITIALLY, false, Property.NodeScope, Property.Filtered));
             settings.add(Setting.boolSetting(ConfigConstants.SECURITY_UNSUPPORTED_DISABLE_REST_AUTH_INITIALLY, false, Property.NodeScope, Property.Filtered));
-            settings.add(Setting.intSetting(ConfigConstants.SECURITY_UNSUPPORTED_DELAY_INITIALIZATION_SECONDS, 0, Property.NodeScope, Property.Filtered));
 
             // system integration
             settings.add(Setting.boolSetting(ConfigConstants.SECURITY_UNSUPPORTED_RESTORE_SECURITYINDEX_ENABLED, false, Property.NodeScope, Property.Filtered));

diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java
@@ -138,15 +138,6 @@ private void initalizeClusterConfiguration(final boolean installDefaultConfig) {
                             createSecurityIndexIfAbsent();
                             waitForSecurityIndexToBeAtLeastYellow();
 
-                            final int initializationDelaySeconds = settings.getAsInt(
-                                ConfigConstants.SECURITY_UNSUPPORTED_DELAY_INITIALIZATION_SECONDS,
-                                0
-                            );
-                            if (initializationDelaySeconds > 0) {
-                                LOGGER.error("Test setting loaded to delay initialization for {} seconds", initializationDelaySeconds);
-                                TimeUnit.SECONDS.sleep(initializationDelaySeconds);
-                            }
-
                             ConfigHelper.uploadFile(client, cd + "config.yml", securityIndex, CType.CONFIG, DEFAULT_CONFIG_VERSION);
                             ConfigHelper.uploadFile(client, cd + "roles.yml", securityIndex, CType.ROLES, DEFAULT_CONFIG_VERSION);
                             ConfigHelper.uploadFile(

diff --git a/src/main/java/org/opensearch/security/support/ConfigConstants.java b/src/main/java/org/opensearch/security/support/ConfigConstants.java
@@ -245,7 +245,6 @@ public enum RolesMappingResolution {
 
     // Illegal Opcodes from here on
     public static final String SECURITY_UNSUPPORTED_DISABLE_REST_AUTH_INITIALLY = "plugins.security.unsupported.disable_rest_auth_initially";
-    public static final String SECURITY_UNSUPPORTED_DELAY_INITIALIZATION_SECONDS = "plugins.security.unsupported.delay_initialization_seconds";
     public static final String SECURITY_UNSUPPORTED_DISABLE_INTERTRANSPORT_AUTH_INITIALLY = "plugins.security.unsupported.disable_intertransport_auth_initially";
     public static final String SECURITY_UNSUPPORTED_PASSIVE_INTERTRANSPORT_AUTH_INITIALLY = "plugins.security.unsupported.passive_intertransport_auth_initially";
     public static final String SECURITY_UNSUPPORTED_RESTORE_SECURITYINDEX_ENABLED = "plugins.security.unsupported.restore.securityindex.enabled";