Skip to content

Commit 78860ac

Browse files
Registering disable user-agent setting with OpenSearch (#16052)
* Registering allowlist setting in user-agent Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Adding unit tests Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> --------- Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
1 parent 0363a64 commit 78860ac

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpModulePluginTests.java

+7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.maxmind.geoip2.model.AbstractResponse;
3636

3737
import org.opensearch.common.network.InetAddresses;
38+
import org.opensearch.common.settings.Setting;
3839
import org.opensearch.common.settings.Settings;
3940
import org.opensearch.env.TestEnvironment;
4041
import org.opensearch.ingest.Processor;
@@ -126,6 +127,12 @@ public void testAllowListNotSpecified() throws IOException {
126127
}
127128
}
128129

130+
public void testSettingsRegistration() {
131+
final IngestGeoIpModulePlugin plugin = new IngestGeoIpModulePlugin();
132+
final List<Setting<?>> settings = plugin.getSettings();
133+
assertTrue(settings.contains(IngestGeoIpModulePlugin.PROCESSORS_ALLOWLIST_SETTING));
134+
}
135+
129136
private void runAllowListTest(List<String> allowList) throws IOException {
130137
Settings.Builder settingsBuilder = Settings.builder();
131138
createDb(settingsBuilder);

modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentModulePlugin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import java.nio.file.Path;
4545
import java.nio.file.PathMatcher;
4646
import java.nio.file.StandardOpenOption;
47+
import java.util.Arrays;
4748
import java.util.Collections;
4849
import java.util.HashMap;
4950
import java.util.List;
@@ -152,6 +153,6 @@ static Map<String, UserAgentParser> createUserAgentParsers(Path userAgentConfigD
152153

153154
@Override
154155
public List<Setting<?>> getSettings() {
155-
return Collections.singletonList(CACHE_SIZE_SETTING);
156+
return Arrays.asList(CACHE_SIZE_SETTING, PROCESSORS_ALLOWLIST_SETTING);
156157
}
157158
}

modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/IngestUserAgentModulePluginTests.java

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.ingest.useragent;
1010

11+
import org.opensearch.common.settings.Setting;
1112
import org.opensearch.common.settings.Settings;
1213
import org.opensearch.env.TestEnvironment;
1314
import org.opensearch.ingest.Processor;
@@ -89,6 +90,12 @@ public void testAllowListNotSpecified() throws IOException {
8990
}
9091
}
9192

93+
public void testSettingsRegistration() {
94+
final IngestUserAgentModulePlugin plugin = new IngestUserAgentModulePlugin();
95+
final List<Setting<?>> settings = plugin.getSettings();
96+
assertTrue(settings.contains(IngestUserAgentModulePlugin.PROCESSORS_ALLOWLIST_SETTING));
97+
}
98+
9299
private void runAllowListTest(List<String> allowList) throws IOException {
93100
final Settings settings = settingsBuilder.putList(IngestUserAgentModulePlugin.PROCESSORS_ALLOWLIST_SETTING.getKey(), allowList)
94101
.build();

0 commit comments

Comments
 (0)