Add mapping back

Signed-off-by: cliu123 <lc12251109@gmail.com>
opensearch-project · Apr 6, 2022 · 7c88c43 · 7c88c43
1 parent bc3aa89
commit 7c88c43
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/src/test/java/org/opensearch/security/TracingTests.java b/src/test/java/org/opensearch/security/TracingTests.java
@@ -62,10 +62,10 @@ public void testAdvancedMapping() throws Exception {
         setup(Settings.EMPTY, new DynamicSecurityConfig(), Settings.EMPTY, true, ClusterConfiguration.DEFAULT);
 
         try (Client tc = getClient()) {
-            tc.admin().indices().create(new CreateIndexRequest("myindex1")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex2")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex3")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex4")).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex1").mapping(FileHelper.loadFile("mapping1.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex2").mapping(FileHelper.loadFile("mapping2.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex3").mapping(FileHelper.loadFile("mapping3.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex4").mapping(FileHelper.loadFile("mapping4.json"), XContentType.JSON)).actionGet();
         }
 
         RestHelper rh = nonSslRestHelper();

diff --git a/src/test/java/org/opensearch/security/auditlog/impl/TracingTests.java b/src/test/java/org/opensearch/security/auditlog/impl/TracingTests.java
@@ -338,10 +338,10 @@ public void testAdvancedMapping() throws Exception {
         rh.executePutRequest("_opendistro/_security/api/audit/config", AuditTestUtils.createAuditPayload(settings), encodeBasicHeader("admin", "admin"));
 
         try (Client tc = getClient()) {
-            tc.admin().indices().create(new CreateIndexRequest("myindex1")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex2")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex3")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex4")).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex1").mapping(FileHelper.loadFile("mapping1.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex2").mapping(FileHelper.loadFile("mapping2.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex3").mapping(FileHelper.loadFile("mapping3.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex4").mapping(FileHelper.loadFile("mapping4.json"), XContentType.JSON)).actionGet();
         }
 
         System.out.println("############ write into mapping 1");
@@ -387,8 +387,8 @@ public void testImmutableIndex() throws Exception {
         rh.executePutRequest("_opendistro/_security/api/audit/config", AuditTestUtils.createAuditPayload(Settings.EMPTY), encodeBasicHeader("admin", "admin"));
 
         try (Client tc = getClient()) {
-            tc.admin().indices().create(new CreateIndexRequest("myindex1")).actionGet();
-            tc.admin().indices().create(new CreateIndexRequest("myindex2")).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex1").mapping(FileHelper.loadFile("mapping1.json"), XContentType.JSON)).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("myindex2").mapping(FileHelper.loadFile("mapping2.json"), XContentType.JSON)).actionGet();
         }
 
         System.out.println("############ immutable 1");

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/CustomFieldMaskedComplexMappingTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/CustomFieldMaskedComplexMappingTest.java
@@ -36,7 +36,7 @@ public class CustomFieldMaskedComplexMappingTest extends AbstractDlsFlsTest{
     protected void populateData(Client tc) {
 
         try {
-            tc.admin().indices().create(new CreateIndexRequest("logs")).actionGet();
+            tc.admin().indices().create(new CreateIndexRequest("logs").mapping(FileHelper.loadFile("dlsfls/masked_field_mapping.json"), XContentType.JSON)).actionGet();
 
 
             byte[] data = FileHelper.loadFile("dlsfls/logs_bulk_data.json").getBytes(StandardCharsets.UTF_8);

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/DlsNestedTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/DlsNestedTest.java
@@ -43,7 +43,10 @@ protected void populateData(Client tc) {
                 "    }" +
                 "";
 
-        tc.admin().indices().create(new CreateIndexRequest("deals").simpleMapping("amount", "type=integer").simpleMapping("owner", "type=text").simpleMapping("my_nested_object", "type=nested").settings(Settings.builder().put("number_of_shards", 1).put("number_of_replicas", 0).build())).actionGet();
+        tc.admin().indices().create(new CreateIndexRequest("deals")
+                .simpleMapping("amount", "type=integer", "owner", "type=text", "my_nested_object", "type=nested")
+                .settings(Settings.builder().put("number_of_shards", 1).put("number_of_replicas", 0).build()))
+                .actionGet();
 
         //tc.index(new IndexRequest("deals").id("3").setRefreshPolicy(RefreshPolicy.IMMEDIATE)
         //        .source("{\"amount\": 7,\"owner\": \"a\", \"my_nested_object\" : {\"name\": \"spock\"}}", XContentType.JSON)).actionGet();

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/FlsExistsFieldsTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/FlsExistsFieldsTest.java
@@ -30,7 +30,8 @@ public class FlsExistsFieldsTest extends AbstractDlsFlsTest {
 
     protected void populateData(Client tc) {
 
-        tc.admin().indices().create(new CreateIndexRequest("data"))
+        tc.admin().indices().create(new CreateIndexRequest("data")
+                .simpleMapping("@timestamp", "type=date", "host", "type=text,norms=false", "response", "type=text,norms=false", "non-existing", "type=text,norms=false"))
                 .actionGet();
 
         for (int i = 0; i < 1; i++) {

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/FlsFieldsTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/FlsFieldsTest.java
@@ -34,7 +34,7 @@ public class FlsFieldsTest extends AbstractDlsFlsTest{
 
     protected void populateData(Client tc) {
 
-        tc.admin().indices().create(new CreateIndexRequest("deals")).actionGet();
+        tc.admin().indices().create(new CreateIndexRequest("deals").simpleMapping("timestamp", "type=date", "@timestamp", "type=date")).actionGet();
 
         try {
             String doc = FileHelper.loadFile("dlsfls/doc1.json");

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/FlsFieldsWcTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/FlsFieldsWcTest.java
@@ -34,7 +34,7 @@ public class FlsFieldsWcTest extends AbstractDlsFlsTest{
 
     protected void populateData(Client tc) {
 
-        tc.admin().indices().create(new CreateIndexRequest("deals")).actionGet();
+        tc.admin().indices().create(new CreateIndexRequest("deals").simpleMapping("timestamp", "type=date", "@timestamp", "type=date")).actionGet();
 
         try {
             String doc = FileHelper.loadFile("dlsfls/doc1.json");