Switch from RC1 to the GA of OpenSearch 2.0 (#1826)

Signed-off-by: Peter Nied <[email protected]>
opensearch-project · May 12, 2022 · 87a093f · 87a093f
1 parent ea90f30
commit 87a093f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,9 +57,8 @@ repositories {
 
 ext {
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    opensearch_version = System.getProperty("opensearch.version", "2.0.0-rc1-SNAPSHOT")
-    buildVersionQualifier = System.getProperty("build.version_qualifier", "rc1")
-    // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
+    opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
+    buildVersionQualifier = System.getProperty("build.version_qualifier", "")
     version_tokens = opensearch_version.tokenize('-')
     opensearch_build = version_tokens[0] + '.0'
     if (buildVersionQualifier) {

diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle
@@ -47,7 +47,7 @@ ext {
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.0-rc1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
         opensearch_group = "org.opensearch"
     }
     repositories {
@@ -76,13 +76,13 @@ dependencies {
 String bwcVersion = "1.3.0.0";
 String baseName = "securityBwcCluster"
 String bwcFilePath = "src/test/resources/"
-String projectVersion = "2.0.0.0-rc1"
+String projectVersion = "2.0.0.0"
 
 2.times {i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-        versions = ["1.3.0","2.0.0-rc1"]
+        versions = ["1.3.0","2.0.0"]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>() {
                 @Override

diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsFilterLeafReader.java b/src/main/java/org/opensearch/security/configuration/DlsFlsFilterLeafReader.java
@@ -515,12 +515,6 @@ public int hashCode() {
             return delegate.hashCode();
         }
 
-        @Override
-        public void stringField(final FieldInfo fieldInfo, final String value) throws IOException {
-            fieldReadCallback.stringFieldRead(fieldInfo, value);
-            delegate.stringField(fieldInfo, value);
-        }
-
         @Override
         public void intField(final FieldInfo fieldInfo, final int value) throws IOException {
             fieldReadCallback.numericFieldRead(fieldInfo, value);
@@ -604,11 +598,6 @@ public int hashCode() {
             return delegate.hashCode();
         }
 
-        @Override
-        public void stringField(final FieldInfo fieldInfo, final String value) throws IOException {
-            delegate.stringField(fieldInfo, value);
-        }
-
         @Override
         public void intField(final FieldInfo fieldInfo, final int value) throws IOException {
             delegate.intField(fieldInfo, value);
@@ -675,17 +664,6 @@ public int hashCode() {
             return delegate.hashCode();
         }
 
-        @Override
-        public void stringField(final FieldInfo fieldInfo, final String value) throws IOException {
-            final Optional<MaskedField> mf = maskedFieldsMap.getMaskedField(fieldInfo.name);
-
-            if(mf.isPresent()) {
-                delegate.stringField(fieldInfo, mf.get().mask(value));
-            } else {
-                delegate.stringField(fieldInfo, value);
-            }
-        }
-
         @Override
         public void intField(final FieldInfo fieldInfo, final int value) throws IOException {
             delegate.intField(fieldInfo, value);

diff --git a/src/test/java/org/opensearch/security/ccstest/RemoteReindexTests.java b/src/test/java/org/opensearch/security/ccstest/RemoteReindexTests.java
@@ -103,19 +103,14 @@ public void testNonSSLReindex() throws Exception {
         String reindex = "{"+
             "\"source\": {"+
                 "\"remote\": {"+
-                "\"host\": \"http://"+cl2Info.httpHost+":"+cl2Info.httpPort+"\","+
-                "\"username\": \"nagilum\","+
-                "\"password\": \"nagilum\""+
-                  "},"+
-                    "\"index\": \"twitter\","+
-                    "\"size\": 10,"+
-                    "\"query\": {"+
-                    "\"match\": {"+
-                    "\"_type\": \"_doc\""+
-                    "}"+
-                  "}"+
+                    "\"host\": \"http://"+cl2Info.httpHost+":"+cl2Info.httpPort+"\","+
+                    "\"username\": \"nagilum\","+
+                    "\"password\": \"nagilum\""+
+                "},"+
+                "\"index\": \"twitter\","+
+                "\"size\": 10"+
             "},"+
-                "\"dest\": {"+
+            "\"dest\": {"+
                 "\"index\": \"twutter\""+
             "}"+
         "}";