Skip to content

Commit 6e81d23

Browse files
authored
Remove deprecated 'reindex.remote.whitelist` setting (#17188)
This has been replaced by `reindex.remote.allowlist`. Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent b9900ee commit 6e81d23

File tree

3 files changed

+1
-96
lines changed

3 files changed

+1
-96
lines changed

modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ public Collection<Object> createComponents(
130130
@Override
131131
public List<Setting<?>> getSettings() {
132132
final List<Setting<?>> settings = new ArrayList<>();
133-
settings.add(TransportReindexAction.REMOTE_CLUSTER_WHITELIST);
134133
settings.add(TransportReindexAction.REMOTE_CLUSTER_ALLOWLIST);
135134
settings.add(TransportReindexAction.REMOTE_REINDEX_RETRY_INITIAL_BACKOFF);
136135
settings.add(TransportReindexAction.REMOTE_REINDEX_RETRY_MAX_COUNT);

modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,9 @@
5757
import static java.util.Collections.emptyList;
5858

5959
public class TransportReindexAction extends HandledTransportAction<ReindexRequest, BulkByScrollResponse> {
60-
static final Setting<List<String>> REMOTE_CLUSTER_WHITELIST = Setting.listSetting(
61-
"reindex.remote.whitelist",
62-
emptyList(),
63-
Function.identity(),
64-
Property.NodeScope,
65-
Property.Deprecated
66-
);
67-
// The setting below is going to replace the above.
68-
// To keep backwards compatibility, the old usage is remained, and it's also used as the fallback for the new usage.
6960
public static final Setting<List<String>> REMOTE_CLUSTER_ALLOWLIST = Setting.listSetting(
7061
"reindex.remote.allowlist",
71-
REMOTE_CLUSTER_WHITELIST,
62+
emptyList(),
7263
Function.identity(),
7364
Property.NodeScope
7465
);

modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRenamedSettingTests.java

-85
This file was deleted.

0 commit comments

Comments
 (0)