Support ES 7.6.1

Author: vrozov

build.gradle

@@ -7,7 +7,7 @@ plugins {
 buildDir = 'gradle-build'
 
 ext {
-    opendistroVersion = '1.5.0'
+    opendistroVersion = '1.6.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 
@@ -39,7 +39,7 @@ ospackage {
     fileMode 0644
     dirMode 0755
 
-    requires('elasticsearch-oss', "7.5.2", EQUAL)
+    requires('elasticsearch-oss', "7.6.1", EQUAL)
     packager = 'Amazon'
     vendor = 'Amazon'
     os = 'LINUX'

opendistro-elasticsearch-security.release-notes

@@ -1,4 +1,8 @@
-## 2020-03-05 Version 1.5.0.1 (Current)
+## 2020-03-12 Version 1.6.0.0 (Current)
+
+- Support for Elasticsearch 7.6.1
+
+## 2020-03-05 Version 1.5.0.1
 
 - Adding capability to hot reload ssl certificates
 - Added changes for SuperAdmin to update/add/delete reserved configs

plugin-descriptor.properties

@@ -3,7 +3,7 @@
 description=Provide access control related features for Elasticsearch 7
 #
 # 'version': plugin's version
-version=1.5.0.1
+version=1.6.0.0
 #
 # 'name': the plugin name
 name=opendistro_security
@@ -22,4 +22,4 @@ java.version=1.8
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=7.5.2
+elasticsearch.version=7.6.1

pom.xml

@@ -34,7 +34,7 @@
     <groupId>com.amazon.opendistroforelasticsearch</groupId>
     <artifactId>opendistro_security</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.0.1</version>
+    <version>1.6.0.0</version>
     <name>Open Distro Security for Elasticsearch</name>
     <description>Open Distro For Elasticsearch Security</description>
     <url>https://github.com/opendistro-for-elasticsearch/security</url>
@@ -68,7 +68,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.release>8</maven.compiler.release>
 
-        <elasticsearch.version>7.5.2</elasticsearch.version>
+        <elasticsearch.version>7.6.1</elasticsearch.version>
 
         <!-- deps -->
         <netty-native.version>2.0.25.Final</netty-native.version>
@@ -98,7 +98,7 @@
         <url>https://github.com/opendistro-for-elasticsearch/security</url>
         <connection>scm:git:[email protected]:opendistro-for-elasticsearch/security.git</connection>
         <developerConnection>scm:git:[email protected]:opendistro-for-elasticsearch/security.git</developerConnection>
-        <tag>1.5.0.1</tag>
+        <tag>1.6.0.0</tag>
     </scm>
 
     <issueManagement>

src/main/java/com/amazon/opendistroforelasticsearch/security/support/SnapshotRestoreHelper.java

@@ -39,6 +39,7 @@
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.SpecialPermission;
 import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
+import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.repositories.Repository;
 import org.elasticsearch.snapshots.SnapshotId;
@@ -72,8 +73,8 @@ public static SnapshotInfo getSnapshotInfo(RestoreSnapshotRequest restoreRequest
         SnapshotInfo snapshotInfo = null;
 
         try {
-            setCurrentThreadName(ThreadPool.Names.GENERIC);            
-            for (final SnapshotId snapshotId : repository.getRepositoryData().getSnapshotIds()) {
+            setCurrentThreadName(ThreadPool.Names.GENERIC);
+            for (SnapshotId snapshotId : PlainActionFuture.get(repository::getRepositoryData).getSnapshotIds()) {
                 if (snapshotId.getName().equals(restoreRequest.snapshot())) {
 
                     if(log.isDebugEnabled()) {

src/test/java/com/amazon/opendistroforelasticsearch/security/http/proxy/HTTPExtendedProxyAuthenticatorTest.java

@@ -197,7 +197,16 @@ public HttpResponse createResponse(RestStatus status, BytesReference content) {
             // TODO Auto-generated method stub
             return null;
         }
-        
+
+        @Override
+        public void release() {
+
+        }
+
+        @Override
+        public HttpRequest releaseAndCopy() {
+            return null;
+        }
     }
 
     static class HttpChannelImpl implements HttpChannel {