HSEARCH-2772 Move AWS Elasticsearch request signing to a dedicated mo…

…dule
hibernate · Jul 4, 2017 · 06119e8 · 06119e8
1 parent 81e4108
commit 06119e8
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 10 deletions.
diff --git a/elasticsearch-aws/pom.xml b/elasticsearch-aws/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Hibernate Search, full-text search for your domain model
+ ~
+ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>hibernate-search-parent</artifactId>
+        <groupId>org.hibernate</groupId>
+        <version>5.8.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>hibernate-search-elasticsearch-aws</artifactId>
+
+    <name>Hibernate Search Elasticsearch AWS integration</name>
+    <description>Configurer for the Hibernate Search Elasticsearch backend enabling connection to an AWS-hosted Elasticsearch cluster</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-search-elasticsearch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.co.lucasweb</groupId>
+            <artifactId>aws-v4-signer-java</artifactId>
+            <version>${elasticsearchAWSV4SignerVersion}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <!-- Elasticsearch integration currently not supported in OSGi;
+                 This section commented out to not make it appear it might work.
+                 If you need this to work in OSGi, please see and vote for: https://hibernate.atlassian.net/browse/HSEARCH-2524
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            TODO
+                        </Import-Package>
+                        <Export-Package>
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin-->
+        </plugins>
+    </build>
+</project>
diff --git a/...AWSElasticsearchHttpClientConfigurer.java → ...AWSElasticsearchHttpClientConfigurer.java b/...AWSElasticsearchHttpClientConfigurer.java → ...AWSElasticsearchHttpClientConfigurer.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.elasticsearch.testutil.aws;
+package org.hibernate.search.elasticsearch.aws.impl;
 
 import java.util.Properties;
 

diff --git a/...til/aws/AWSSigningRequestInterceptor.java → ...ws/impl/AWSSigningRequestInterceptor.java b/...til/aws/AWSSigningRequestInterceptor.java → ...ws/impl/AWSSigningRequestInterceptor.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.elasticsearch.testutil.aws;
+package org.hibernate.search.elasticsearch.aws.impl;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/.../services/org.hibernate.search.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer b/.../services/org.hibernate.search.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer
@@ -0,0 +1 @@
+org.hibernate.search.elasticsearch.aws.impl.AWSElasticsearchHttpClientConfigurer
diff --git a/integrationtest/elasticsearch/pom.xml b/integrationtest/elasticsearch/pom.xml
@@ -150,13 +150,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>uk.co.lucasweb</groupId>
-            <artifactId>aws-v4-signer-java</artifactId>
-            <version>1.2</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Enable extracting shared test build resources -->
         <!-- See how maven-dependency-plugin is configured in the parent pom -->
         <dependency>
@@ -414,6 +407,13 @@
                     org.hibernate.search.elasticsearch.testutil.junit.SkipOnAWS
                 </test.elasticsearch.failsafe.excludedGroups.aws>
             </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-search-elasticsearch-aws</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
 </project>
diff --git a/.../services/org.hibernate.search.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer b/.../services/org.hibernate.search.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,7 @@
         <module>backends/jgroups</module>
         <module>backends/jms</module>
         <module>elasticsearch</module>
+        <module>elasticsearch-aws</module>
         <module>orm</module>
         <module>testing</module>
         <module>infinispan</module>
@@ -215,6 +216,7 @@
         <elasticsearchClientVersion>5.4.2</elasticsearchClientVersion>
         <elasticsearchSnifferVersion>5.4.2</elasticsearchSnifferVersion>
         <elasticsearchGsonVersion>2.8.0</elasticsearchGsonVersion>
+        <elasticsearchAWSV4SignerVersion>1.2</elasticsearchAWSV4SignerVersion>
 
         <!-- Tests -->
         <!-- Fixes dependency convergence within Wiremock, see below -->
@@ -562,6 +564,11 @@
                 <artifactId>hibernate-search-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-search-elasticsearch-aws</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>