Skip to content
This repository has been archived by the owner on Mar 4, 2019. It is now read-only.

Commit

Permalink
using ES 1.3.0, made integration test compatible
Browse files Browse the repository at this point in the history
- updated pom to 1.3.0
- Explicit adding the plugin class name in the integration test is required
  • Loading branch information
Ernesto committed Oct 7, 2014
1 parent c2286d2 commit 79df080
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

<groupId>com.asquera.elasticsearch</groupId>
<artifactId>elasticsearch-http-basic</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<packaging>jar</packaging>

<name>Basic Authentication Plugin</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<elasticsearch.version>1.2.0</elasticsearch.version>
<lucene.version>4.8.1</lucene.version>
<elasticsearch.version>1.3.0</elasticsearch.version>
<lucene.version>4.9.0</lucene.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.elasticsearch.test.rest.client.http.HttpResponse;
import org.junit.Test;

import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;

import static org.hamcrest.Matchers.equalTo;

/**
Expand All @@ -41,6 +43,7 @@ public class DefaultConfigurationIntegrationTest extends ElasticsearchIntegratio
@Override
protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.settingsBuilder()
.put("plugin.types", HttpBasicServerPlugin.class.getName())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.elasticsearch.test.rest.client.http.HttpResponse;
import org.junit.Test;

import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;

import java.net.URI;
import java.net.URISyntaxException;

Expand All @@ -48,7 +50,8 @@ public class EmptyWhitelistIntegrationTest extends ElasticsearchIntegrationTest
@Override
protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.settingsBuilder().putArray("http.basic.ipwhitelist", "unkown")
.build();
.put("plugin.types", HttpBasicServerPlugin.class.getName())
.build();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import org.elasticsearch.test.rest.client.http.HttpResponse;
import org.junit.Test;

import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;

import java.net.URI;
import java.net.URISyntaxException;

Expand All @@ -57,6 +59,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
.putArray("http.basic.ipwhitelist", whitelistedIp)
.putArray("http.basic.trusted_proxy_chains", trustedIp + "," + localhost)
.put("http.basic.xforward", "X-Forwarded-For")
.put("plugin.types", HttpBasicServerPlugin.class.getName())
.build();
}

Expand Down

0 comments on commit 79df080

Please sign in to comment.