embulk-input-riak_cs 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db981b3d8a71870b25ae8a150f37ccf61858bc9a
-  data.tar.gz: 7d23f83cb25fd478c7a3dcc4b89b26a152f26e7c
+  metadata.gz: 1cf479c44f7b7dac211e41b1514713217ff8c71c
+  data.tar.gz: b2946ad26dacd01fbb61e379b4b2d062f8e0b0e1
 SHA512:
-  metadata.gz: e46f663b2753a76efa2ff467945c8c40d2506baa18f60c712875270004c149a3fd8b56c32ee9b8b400ea6e3f2701031ab567dd37623a8f4c3eda93bc1ba90cab
-  data.tar.gz: cbd846efaa92f7757fd1477d4522709c62abe9e3dd08e0544240cc12acb2e8c961551b4c08c580c5a675b202c0223fa9d80043b6fe26b0720736895022c276b3
+  metadata.gz: 51dd4fa486a9c4f60789496fe92b46ef734ed715d6e59de2a7fc14d927e7d78d18c7a9e337c955483d2aeee29554be81c4f8096e07fdec8b5601025033d6c422
+  data.tar.gz: f02f3d7a186a5554009dbab8319c6bc4eed8b63d0c0d6543d500594ff2cbb0c644d1169cbea398dd2d41ee3ca4ef5b4f0ad94c9c5b09fb66e6fbfcf9ca6cf6da

data/src/main/java/org/embulk/input/riak_cs/RiakCsFileInputPlugin.java

@@ -1,11 +1,15 @@
 package org.embulk.input.riak_cs;
 
 import com.amazonaws.ClientConfiguration;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3;
 import org.embulk.config.Config;
-import org.embulk.config.ConfigInject;
 import org.embulk.input.s3.AbstractS3FileInputPlugin;
 
+import static com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import static com.amazonaws.services.s3.AmazonS3Client.S3_SERVICE_NAME;
+import static com.amazonaws.util.AwsHostNameUtils.parseRegion;
+import static com.amazonaws.util.RuntimeHttpUtils.toUri;
+
 public class RiakCsFileInputPlugin
         extends AbstractS3FileInputPlugin
 {
@@ -23,15 +27,21 @@ public class RiakCsFileInputPlugin
     }
 
     @Override
-    protected AmazonS3Client newS3Client(PluginTask task)
+    protected AmazonS3 newS3Client(PluginTask task)
     {
         RiakCsPluginTask t = (RiakCsPluginTask) task;
 
-        AmazonS3Client client = super.newS3Client(t);
-
-        client.setEndpoint(t.getEndpoint());
-
-        return client;
+        return super
+                .defaultS3ClientBuilder(task)
+                .withEndpointConfiguration(new EndpointConfiguration(
+                        t.getEndpoint(),
+                        // Although client will treat endpoint's region as the signer region
+                        // if we left this as null, but such that behaviour is undocumented,
+                        // so it is explicitly calculated here for future-proofing.
+                        parseRegion(
+                                toUri(t.getEndpoint(), getClientConfiguration(task)).getHost(),
+                                S3_SERVICE_NAME)))
+                .build();
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-riak_cs
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,16 +49,22 @@ files:
 - lib/embulk/input/riak_cs.rb
 - src/main/java/org/embulk/input/riak_cs/RiakCsFileInputPlugin.java
 - src/test/java/org/embulk/input/riak_cs/TestRiakCsFileInputPlugin.java
-- classpath/aws-java-sdk-core-1.10.33.jar
-- classpath/aws-java-sdk-kms-1.10.33.jar
-- classpath/aws-java-sdk-s3-1.10.33.jar
-- classpath/commons-codec-1.6.jar
-- classpath/embulk-input-riak_cs-0.2.11.jar
-- classpath/embulk-input-s3-0.2.11.jar
-- classpath/embulk-util-aws-credentials-0.2.11.jar
-- classpath/httpclient-4.3.6.jar
-- classpath/httpcore-4.3.3.jar
+- classpath/aws-java-sdk-core-1.11.253.jar
+- classpath/aws-java-sdk-kms-1.11.253.jar
+- classpath/aws-java-sdk-s3-1.11.253.jar
+- classpath/commons-codec-1.9.jar
+- classpath/embulk-input-riak_cs-0.2.12.jar
+- classpath/embulk-input-s3-0.2.12.jar
+- classpath/embulk-util-aws-credentials-0.2.12.jar
+- classpath/httpclient-4.5.2.jar
+- classpath/httpcore-4.4.4.jar
+- classpath/ion-java-1.0.2.jar
+- classpath/jackson-annotations-2.6.0.jar
+- classpath/jackson-core-2.6.7.jar
+- classpath/jackson-databind-2.6.7.1.jar
+- classpath/jackson-dataformat-cbor-2.6.7.jar
 - classpath/jcl-over-slf4j-1.7.12.jar
+- classpath/jmespath-java-1.11.253.jar
 homepage: https://github.com/embulk/embulk-input-s3
 licenses:
 - Apache 2.0