embulk-input-s3 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cd2ac88b83d92846715d194928f38a32693ebe
-  data.tar.gz: 145815003f894fc2a2a224266e00908dae89cf79
+  metadata.gz: 53fcce53ef48e0de5334962d731a1c3ea66dbb37
+  data.tar.gz: 2233d5ce4ab1058212e37992b0a32547482a50cb
 SHA512:
-  metadata.gz: e9d81495964337639a2a6e7de2ce9ca3c3e5b39ca869ff1873e5ed119de95ac8ae778fe3450d85068dcd7b773bbfd8345835b46ab226ad73f1117c2fb614c0bc
-  data.tar.gz: 5f50eb790d085fb427a23e3819bdada69bb0cafba84e6e4175a8a317e7cf7e37e0a675866a87b893600c6ccfeb59654662e452c56d93a556d5559319c2760543
+  metadata.gz: 746680b6afad3a6e302b98ba1e109dc7c2e3899800367a1dd6a08c6372ea79ab31c0ea46be8a5ba7c22421ee9662014c8fd5a8a1f603e83f42dfc69fbba4d623
+  data.tar.gz: f65c944bb757863135e156472b5d14ef29fce1819970e489f6dfed96b1aed291df8f4be56cd537257f5eade64cb4108f45b65cd8a5c91df2a67c5c7989edb8ca

data/src/main/java/org/embulk/input/s3/AbstractS3FileInputPlugin.java

@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.auth.AnonymousAWSCredentials;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
@@ -56,10 +57,12 @@ public abstract class AbstractS3FileInputPlugin
         public Optional<String> getLastPath();
 
         @Config("access_key_id")
-        public String getAccessKeyId();
+        @ConfigDefault("null")
+        public Optional<String> getAccessKeyId();
 
         @Config("secret_access_key")
-        public String getSecretAccessKey();
+        @ConfigDefault("null")
+        public Optional<String> getSecretAccessKey();
 
         // TODO timeout, ssl, etc
 
@@ -131,8 +134,14 @@ public abstract class AbstractS3FileInputPlugin
 
     protected AWSCredentialsProvider getCredentialsProvider(PluginTask task)
     {
-        final AWSCredentials cred = new BasicAWSCredentials(
-                task.getAccessKeyId(), task.getSecretAccessKey());
+        final AWSCredentials cred;
+        if (task.getAccessKeyId().isPresent()) {
+            cred = new BasicAWSCredentials(
+                    task.getAccessKeyId().get(),
+                    task.getSecretAccessKey().get());
+        } else {
+            cred = new AnonymousAWSCredentials();
+        }
         return new AWSCredentialsProvider() {
             public AWSCredentials getCredentials()
             {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,7 @@ files:
 - classpath/aws-java-sdk-s3-1.9.22.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-input-s3-0.2.0.jar
+- classpath/embulk-input-s3-0.2.1.jar
 - classpath/httpclient-4.3.4.jar
 - classpath/httpcore-4.3.2.jar
 - classpath/joda-time-2.8.1.jar