Remove HOST_DENY_LIST usage as Notification plugin will own it (opens…

…earch-project#471) (opensearch-project#488) (opensearch-project#107) Signed-off-by: Xuesong Luo <lxuesong@amazon.com> Signed-off-by: Xuesong Luo <lxuesong@amazon.com> (cherry picked from commit 39be4e3) Co-authored-by: xluo-aws <109580118+xluo-aws@users.noreply.github.com>
ochprince · Sep 7, 2022 · cba28c1 · cba28c1
1 parent 1be683c
commit cba28c1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt
@@ -47,7 +47,6 @@ import org.opensearch.indexmanagement.indexstatemanagement.model.ErrorNotificati
 import org.opensearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig
 import org.opensearch.indexmanagement.indexstatemanagement.model.Policy
 import org.opensearch.indexmanagement.indexstatemanagement.opensearchapi.getManagedIndexMetadata
-import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
 import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST
 import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST_NONE
 import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.DEFAULT_ISM_ENABLED
@@ -129,7 +128,6 @@ object ManagedIndexRunner :
     private val errorNotificationRetryPolicy = BackoffPolicy.exponentialBackoff(TimeValue.timeValueMillis(250), 3)
     private var jobInterval: Int = DEFAULT_JOB_INTERVAL
     private var allowList: List<String> = ALLOW_LIST_NONE
-    private var hostDenyList: List<String> = emptyList()
 
     fun registerClusterService(clusterService: ClusterService): ManagedIndexRunner {
         this.clusterService = clusterService
@@ -173,7 +171,6 @@ object ManagedIndexRunner :
             allowList = it
         }
 
-        hostDenyList = settings.getAsList(ManagedIndexSettings.HOST_DENY_LIST)
         return this
     }
 

diff --git a/...rch/indexmanagement/indexstatemanagement/settings/LegacyOpenDistroManagedIndexSettings.kt b/...rch/indexmanagement/indexstatemanagement/settings/LegacyOpenDistroManagedIndexSettings.kt
@@ -21,7 +21,6 @@ class LegacyOpenDistroManagedIndexSettings {
         private val ALLOW_LIST_ALL = ISMActionsParser.instance.parsers.map { it.getActionType() }.toList()
         val ALLOW_LIST_NONE = emptyList<String>()
         val SNAPSHOT_DENY_LIST_NONE = emptyList<String>()
-        const val HOST_DENY_LIST = "opendistro.destination.host.deny_list"
 
         val INDEX_STATE_MANAGEMENT_ENABLED: Setting<Boolean> = Setting.boolSetting(
             "opendistro.index_state_management.enabled",

diff --git a/...tlin/org/opensearch/indexmanagement/indexstatemanagement/settings/ManagedIndexSettings.kt b/...tlin/org/opensearch/indexmanagement/indexstatemanagement/settings/ManagedIndexSettings.kt
@@ -20,7 +20,6 @@ class ManagedIndexSettings {
         const val DEFAULT_RESTRICTED_PATTERN = "\\.opendistro_security|\\.kibana.*|\\$INDEX_MANAGEMENT_INDEX"
         val ALLOW_LIST_NONE = emptyList<String>()
         val SNAPSHOT_DENY_LIST_NONE = emptyList<String>()
-        const val HOST_DENY_LIST = "opendistro.destination.host.deny_list"
 
         val INDEX_STATE_MANAGEMENT_ENABLED: Setting<Boolean> = Setting.boolSetting(
             "plugins.index_state_management.enabled",