Use a common constant to specify the version for log type mappings #708…

… (#734) (#776) * json parser Signed-off-by: Joanne Wang <[email protected]> * update gradle json dependency Signed-off-by: Joanne Wang <[email protected]> * use xcontenthelper to parse json file Signed-off-by: Joanne Wang <[email protected]> --------- Signed-off-by: Joanne Wang <[email protected]> (cherry picked from commit 7066923) Co-authored-by: Joanne Wang <[email protected]>
opensearch-project · Dec 8, 2023 · 9ddea79 · 9ddea79
1 parent b164403
commit 9ddea79
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/securityanalytics/logtype/LogTypeService.java b/src/main/java/org/opensearch/securityanalytics/logtype/LogTypeService.java
@@ -27,6 +27,8 @@
 import org.opensearch.OpenSearchStatusException;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.cluster.routing.Preference;
+import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
@@ -79,8 +81,6 @@ public class LogTypeService {
 
     public static final String LOG_TYPE_MAPPING_VERSION_META_FIELD = "schema_version";
 
-    public static final int LOG_TYPE_MAPPING_VERSION = 1; // must match version in log_type_config_mapping.json
-
     public static final int MAX_LOG_TYPE_COUNT = 100;
 
     private static volatile boolean isConfigIndexInitialized;
@@ -95,6 +95,8 @@ public class LogTypeService {
 
     private String defaultSchemaField;
 
+    public int logTypeMappingVersion;
+
     @Inject
     public LogTypeService(Client client, ClusterService clusterService, NamedXContentRegistry xContentRegistry, BuiltinLogTypeLoader builtinLogTypeLoader) {
         this.client = client;
@@ -107,6 +109,7 @@ public LogTypeService(Client client, ClusterService clusterService, NamedXConten
                 DEFAULT_MAPPING_SCHEMA,
                 newDefaultSchema -> this.defaultSchemaField = newDefaultSchema
         );
+        setLogTypeMappingVersion();
     }
 
     public void getAllLogTypes(ActionListener<List<String>> listener) {
@@ -485,7 +488,7 @@ public void onFailure(Exception e) {
             });
         } else {
             IndexMetadata metadata = state.getMetadata().index(LOG_TYPE_INDEX);
-            if (getConfigIndexMappingVersion(metadata) < LOG_TYPE_MAPPING_VERSION) {
+            if (getConfigIndexMappingVersion(metadata) < logTypeMappingVersion) {
                 // The index already exists but doesn't have our mapping
                 client.admin()
                         .indices()
@@ -780,8 +783,13 @@ public Map<String, String> getRuleFieldMappingsForBuiltinLogType(String builtinL
         }
     }
 
-
     public String getDefaultSchemaField() {
         return defaultSchemaField;
     }
+
+    public void setLogTypeMappingVersion() {
+        Map<String, Object> logTypeConfigAsMap =
+                XContentHelper.convertToMap(JsonXContent.jsonXContent, logTypeIndexMapping(), false);
+        this.logTypeMappingVersion = (int)((Map)logTypeConfigAsMap.get("_meta")).get("schema_version");
+    }
 }
diff --git a/src/test/java/org/opensearch/securityanalytics/LogTypeServiceTests.java b/src/test/java/org/opensearch/securityanalytics/LogTypeServiceTests.java
@@ -107,7 +107,11 @@ public void testIndexMappings() throws ExecutionException, InterruptedException
 
     }
 
-
+    public void testSetLogTypeMappingSchema() {
+        int expectedVersion = 2;
+        int version = logTypeService.logTypeMappingVersion;
+        assertEquals(expectedVersion, version);
+    }
 
     private void indexFieldMappings(List<FieldMappingDoc> fieldMappingDocs) {
         PlainActionFuture<Void> fut = new PlainActionFuture<>();