Configure the MaxMind database by default and update it so that uses …

…the correct defaults when loading. Resolves opensearch-project#3942 (opensearch-project#4310) Signed-off-by: David Venable <dlv@amazon.com>
dlvenable · Mar 21, 2024 · 2e06946 · 2e06946
1 parent 039c41d
commit 2e06946
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../src/main/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfig.java b/.../src/main/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfig.java
@@ -6,13 +6,16 @@
 package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import jakarta.validation.Valid;
 
 public class GeoIpServiceConfig {
     private static final MaxMindConfig DEFAULT_MAXMIND_CONFIG = new MaxMindConfig();
 
     @Valid
     @JsonProperty("maxmind")
+    @JsonSetter(nulls = Nulls.SKIP)
     private MaxMindConfig maxMindConfig = DEFAULT_MAXMIND_CONFIG;
 
     /**

diff --git a/examples/config/example-data-prepper-config.yaml b/examples/config/example-data-prepper-config.yaml
@@ -1 +1,5 @@
 ssl: false
+
+extensions:
+  geoip_service:
+    maxmind: