embulk-output-elasticsearch 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c889d135818d8057d7770bd00363f07e6dc2a8
-  data.tar.gz: c0c110dfcfad6ae0a5d1c65bfd14ab36eb2931c8
+  metadata.gz: 1cd9ea46a0ed3003580d1b7d558d63768fa5d0ed
+  data.tar.gz: 4e3a5bbb02ec2a3e4ea645dd307d488acf33da65
 SHA512:
-  metadata.gz: 43cf761e50854f8322a829c4e646360609e9e15db444bc404ae3137a232ddc4f3dc84704faec733c8edbb9f28826a133e71a11b5450b7e5003aa147d18bf6125
-  data.tar.gz: 464f7ff77c6030ac924fcee2f2856ea0fb3e3c6d842e0706c11a5e912438f10a4eb3aaf6172d9702155d4ca2fdc4cbebf0be4a510eda291d31f70b3b7410c17e
+  metadata.gz: 928b43c13c6a56bddeb247d9caad1fa2906a0fb14d32ad15f5db436f0ca5fcb82df454acfa40550c678d93c85f182697981604ff95aecc7c147423a89831c04a
+  data.tar.gz: e69b113999bf5e8d82c656ec296a04931f1ee4004936b692efed6a0e67e2c515d7b8edb96bc98c3d33549668aa720fc0cbec0ebf86ae16a219799021c359c67f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.7 - 2018-12-14
+* [maintenance] Show warning logs instead of throwing ConfigException for AWS ES [#49](https://github.com/embulk/embulk-output-elasticsearch/pull/49)
+* [maintenance] Updated Embulk version v0.8.36 to v0.9.11 [#55](https://github.com/embulk/embulk-output-elasticsearch/pull/55)
 ## 0.4.6 - 2018-08-01
 * [new feature] Add "connect_timeout_millis" option [#53](https://github.com/embulk/embulk-output-elasticsearch/pull/53)
 * [new feature] Only build with Java8 [#52](https://github.com/embulk/embulk-output-elasticsearch/pull/52)

data/README.md

@@ -1,7 +1,9 @@
 # Elasticsearch output plugin for Embulk
 
-**Notice** This plugin doesn't support [Amazon(AWS) Elasticsearch Service](https://aws.amazon.com/elasticsearch-service/).
-This plugin uses HTTP/REST Client and haven't be implemented AWS authentication.
+**Notice** This plugin doesn't positively support [Amazon(AWS) Elasticsearch Service](https://aws.amazon.com/elasticsearch-service/).
+Actually, AWS Elasticsearch Service supported AWS VPC at Oct 2017 and user is able to access to Es from EC2 instances in VPC subnet without any authentication.
+You can use this plugin for AWS ES at your own risk.
+
 - *[Amazon Elasticsearch Service Limits](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/aes-limits.html)*
 
 ## Overview

data/build.gradle

@@ -20,21 +20,21 @@ configurations {
 }
 
 group = "org.embulk.output.elasticsearch"
-version = "0.4.6"
+version = "0.4.7"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.36"
-    provided  "org.embulk:embulk-core:0.8.36"
+    compile  "org.embulk:embulk-core:0.9.11"
+    provided  "org.embulk:embulk-core:0.9.11"
     compile  "org.embulk.base.restclient:embulk-base-restclient:0.5.5"
     compile  "org.embulk.base.restclient:embulk-util-retryhelper-jetty92:0.5.3"
 
     testCompile "junit:junit:4.+"
-    testCompile "org.embulk:embulk-core:0.8.36:tests"
-    testCompile "org.embulk:embulk-standards:0.8.36"
+    testCompile "org.embulk:embulk-core:0.9.11:tests"
+    testCompile "org.embulk:embulk-standards:0.9.11"
 }
 
 javadoc {

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchHttpClient.java

@@ -70,7 +70,7 @@ public class ElasticsearchHttpClient
         try {
             String path = String.format("/%s/%s/_bulk", task.getIndex(), task.getType());
             int recordSize = records.size();
-            String idColumn = task.getId().orNull();
+            String idColumn = task.getId().orElse(null);
             if (recordSize > 0) {
                 StringBuilder sb = new StringBuilder();
                 for (JsonNode record : records) {

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchOutputPluginDelegate.java

@@ -2,7 +2,6 @@ package org.embulk.output.elasticsearch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.google.common.base.Optional;
 import org.embulk.base.restclient.RestClientOutputPluginDelegate;
 import org.embulk.base.restclient.RestClientOutputTaskBase;
 import org.embulk.base.restclient.jackson.JacksonServiceRequestMapper;
@@ -24,6 +23,7 @@ import org.slf4j.Logger;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 public class ElasticsearchOutputPluginDelegate
         implements RestClientOutputPluginDelegate<ElasticsearchOutputPluginDelegate.PluginTask>
@@ -197,7 +197,7 @@ public class ElasticsearchOutputPluginDelegate
         if (task.getNodes().size() > 0) {
             for (NodeAddressTask node : task.getNodes()) {
                 if (node.getHost().endsWith("es.amazonaws.com")) {
-                    throw new ConfigException("This plugin does't support AWS Elasticsearch Service.");
+                    log.warn("This plugin does't support AWS Elasticsearch Service. See README https://github.com/embulk/embulk-output-elasticsearch/blob/master/README.md");
                 }
                 if (node.getPort() == 9300) {
                     log.warn("Port:9300 is usually used by TransportClient. HTTP/Rest Client uses 9200.");
@@ -213,8 +213,8 @@ public class ElasticsearchOutputPluginDelegate
         if (task.getMode().equals(Mode.REPLACE)) {
             task.setAlias(Optional.of(task.getIndex()));
             task.setIndex(client.generateNewIndexName(task.getIndex()));
-            if (client.isIndexExisting(task.getAlias().orNull(), task) && !client.isAliasExisting(task.getAlias().orNull(), task)) {
-                throw new ConfigException(String.format("Invalid alias name [%s], an index exists with the same name as the alias", task.getAlias().orNull()));
+            if (client.isIndexExisting(task.getAlias().orElse(null), task) && !client.isAliasExisting(task.getAlias().orElse(null), task)) {
+                throw new ConfigException(String.format("Invalid alias name [%s], an index exists with the same name as the alias", task.getAlias().orElse(null)));
             }
         }
         log.info(String.format("Inserting data into index[%s]", task.getIndex()));
@@ -237,9 +237,10 @@ public class ElasticsearchOutputPluginDelegate
         final ConfigSource configSource = Exec.newConfigSource();
         configSource.set("format", "%Y-%m-%dT%H:%M:%S.%3N%z");
         configSource.set("timezone", DateTimeZone.forID(task.getTimeZone()));
-        TimestampFormatter formatter = new TimestampFormatter(
+        TimestampFormatter formatter = TimestampFormatter.of(
             Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
-            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
+            com.google.common.base.Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class))
+        );
 
         return JacksonServiceRequestMapper.builder()
                 .add(new JacksonAllInObjectScope(formatter, task.getFillNullForEmptyColumn()), new JacksonTopLevelValueLocator("record"))
@@ -268,7 +269,7 @@ public class ElasticsearchOutputPluginDelegate
         log.info("Insert completed. {} records", totalInserted);
         // Re assign alias only when repale mode
         if (task.getMode().equals(Mode.REPLACE)) {
-            client.reassignAlias(task.getAlias().orNull(), task.getIndex(), task);
+            client.reassignAlias(task.getAlias().orElse(null), task.getIndex(), task);
         }
 
         return Exec.newConfigDiff();

data/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java

@@ -98,7 +98,7 @@ public class TestElasticsearchOutputPlugin
         }
         catch (Throwable t) {
             if (t instanceof RuntimeException) {
-                assertTrue(t.getCause().getCause() instanceof ConfigException);
+                assertTrue(t instanceof ConfigException);
             }
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -89,8 +89,8 @@ files:
 - classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/embulk-base-restclient-0.5.5.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
+- classpath/embulk-output-elasticsearch-0.4.7.jar
 - classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
-- classpath/embulk-output-elasticsearch-0.4.6.jar
 homepage: https://github.com/embulk/embulk-output-elasticsearch
 licenses:
 - Apache 2.0