embulk-input-s3 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f8bc775d296e8ae5cfcaffe8d335f1f09de52cc
-  data.tar.gz: ddfb843558dc281243bc6925f9f5abfefe72f4bc
+  metadata.gz: 581dfa840436ba5dddad8e98bf48a464da5fc408
+  data.tar.gz: 7451197f321556c6da2e2ff7ecd4575add015595
 SHA512:
-  metadata.gz: 757deefb26f6d1ef1ca859d87d0f7aba7b347bfb3a98b845af112e0c786ca4c68775c52fad9dd79d4013e212f1975cbe6f507800dca9bbf04c1a2e02ed87f302
-  data.tar.gz: 435a0194c28b19152c631cc78bf616e3ee1a50aa701b8f913723ac45c5b0517968f516db0cd5f841822215524214bf6916cac36d071be944e01cefb64dcca7a7
+  metadata.gz: ac5f4ce10e60ec00b050351e08ecda5cd5362a8282dc71a81268ee10bb6c93aae05d73b6e8489aab1ef55fdc43a7e763307e39bf0edecf0704753e0eb3124226
+  data.tar.gz: d7b7dc34bb59cb870ec31152db8a9178e44743ad5511ce95dda4cf00e368057d66b9ee3de4dfa2421f19b3431959c79fb2eecad5349288c864b5ac155b4f215d

data/build.gradle

@@ -1,3 +1,7 @@
+dependencies {
+    compile project(":embulk-util-aws-credentials")
+}
+
 task gemspec << { file("build/gemspec").write($/
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"

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

@@ -41,6 +41,8 @@ import org.embulk.spi.util.InputStreamFileInput;
 import org.embulk.spi.util.ResumableInputStream;
 import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
+import org.embulk.util.aws.credentials.AwsCredentials;
+import org.embulk.util.aws.credentials.AwsCredentialsTask;
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 
 public abstract class AbstractS3FileInputPlugin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -48,8 +48,6 @@ files:
 - build.gradle
 - lib/embulk/input/s3.rb
 - src/main/java/org/embulk/input/s3/AbstractS3FileInputPlugin.java
-- src/main/java/org/embulk/input/s3/AwsCredentials.java
-- src/main/java/org/embulk/input/s3/AwsCredentialsTask.java
 - src/main/java/org/embulk/input/s3/FileList.java
 - src/main/java/org/embulk/input/s3/S3FileInputPlugin.java
 - src/test/java/org/embulk/input/s3/TestAwsCredentials.java
@@ -61,7 +59,8 @@ files:
 - 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-s3-0.2.8.jar
+- classpath/embulk-input-s3-0.2.9.jar
+- classpath/embulk-util-aws-credentials-0.2.9.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/jcl-over-slf4j-1.7.12.jar

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

@@ -1,179 +0,0 @@
-package org.embulk.input.s3;
-
-import com.google.common.base.Optional;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSSessionCredentials;
-import com.amazonaws.auth.AWSSessionCredentialsProvider;
-import com.amazonaws.auth.AnonymousAWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.BasicSessionCredentials;
-import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
-import com.amazonaws.auth.InstanceProfileCredentialsProvider;
-import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
-import com.amazonaws.auth.profile.ProfileCredentialsProvider;
-import com.amazonaws.auth.profile.ProfilesConfigFile;
-import org.embulk.config.ConfigException;
-import org.embulk.spi.Exec;
-import org.embulk.spi.unit.LocalFile;
-import org.slf4j.Logger;
-
-public abstract class AwsCredentials
-{
-    private AwsCredentials() { }
-
-    public static AWSCredentialsProvider getAWSCredentialsProvider(AwsCredentialsTask task)
-    {
-        switch (task.getAuthMethod()) {
-        case "basic":
-            // for backward compatibility
-            if (!task.getAccessKeyId().isPresent() && !task.getAccessKeyId().isPresent()) {
-                final Logger log = Exec.getLogger(AwsCredentials.class);
-                log.warn("Both access_key_id and secret_access_key are not set. Assuming that 'auth_method: anonymous' option is set.");
-                log.warn("If you intentionally use anonymous authentication, please set 'auth_method: anonymous' option.");
-                log.warn("This behavior will be removed in a futurte release.");
-                reject(task.getSessionToken(), "session_token");
-                reject(task.getProfileFile(), "profile_file");
-                reject(task.getProfileName(), "profile_name");
-                return new AWSCredentialsProvider() {
-                    public AWSCredentials getCredentials()
-                    {
-                        return new AnonymousAWSCredentials();
-                    }
-
-                    public void refresh() { }
-                };
-            }
-            else {
-                String accessKeyId = require(task.getAccessKeyId(), "'access_key_id', 'secret_access_key'");
-                String secretAccessKey = require(task.getSecretAccessKey(), "'secret_access_key'");
-                reject(task.getSessionToken(), "session_token");
-                reject(task.getProfileFile(), "profile_file");
-                reject(task.getProfileName(), "profile_name");
-                final BasicAWSCredentials creds = new BasicAWSCredentials(accessKeyId, secretAccessKey);
-                return new AWSCredentialsProvider() {
-                    public AWSCredentials getCredentials()
-                    {
-                        return creds;
-                    }
-
-                    public void refresh() { }
-                };
-            }
-
-        case "env":
-            reject(task.getAccessKeyId(), "access_key_id");
-            reject(task.getSecretAccessKey(), "secret_access_key");
-            reject(task.getSessionToken(), "session_token");
-            reject(task.getProfileFile(), "profile_file");
-            reject(task.getProfileName(), "profile_name");
-            return overwriteBasicCredentials(task, new EnvironmentVariableCredentialsProvider().getCredentials());
-
-        case "instance":
-            reject(task.getAccessKeyId(), "access_key_id");
-            reject(task.getSecretAccessKey(), "secret_access_key");
-            reject(task.getSessionToken(), "session_token");
-            reject(task.getProfileFile(), "profile_file");
-            reject(task.getProfileName(), "profile_name");
-            return new InstanceProfileCredentialsProvider();
-
-        case "profile":
-            {
-                reject(task.getAccessKeyId(), "access_key_id");
-                reject(task.getSecretAccessKey(), "secret_access_key");
-                reject(task.getSessionToken(), "session_token");
-
-                String profileName = task.getProfileName().or("default");
-                ProfileCredentialsProvider provider;
-                if (task.getProfileFile().isPresent()) {
-                    ProfilesConfigFile file = new ProfilesConfigFile(task.getProfileFile().get().getFile());
-                    provider = new ProfileCredentialsProvider(file, profileName);
-                }
-                else {
-                    provider = new ProfileCredentialsProvider(profileName);
-                }
-                task.setProfileName(Optional.<String>absent());
-                task.setProfileFile(Optional.<LocalFile>absent());
-
-                return overwriteBasicCredentials(task, provider.getCredentials());
-            }
-
-        case "properties":
-            reject(task.getAccessKeyId(), "access_key_id");
-            reject(task.getSecretAccessKey(), "secret_access_key");
-            reject(task.getSessionToken(), "session_token");
-            reject(task.getProfileFile(), "profile_file");
-            reject(task.getProfileName(), "profile_name");
-            return overwriteBasicCredentials(task, new SystemPropertiesCredentialsProvider().getCredentials());
-
-        case "anonymous":
-            reject(task.getAccessKeyId(), "access_key_id");
-            reject(task.getSecretAccessKey(), "secret_access_key");
-            reject(task.getSessionToken(), "session_token");
-            reject(task.getProfileFile(), "profile_file");
-            reject(task.getProfileName(), "profile_name");
-            return new AWSCredentialsProvider() {
-                public AWSCredentials getCredentials()
-                {
-                    return new AnonymousAWSCredentials();
-                }
-
-                public void refresh() { }
-            };
-
-        case "session":
-            {
-                String accessKeyId = require(task.getAccessKeyId(), "'access_key_id', 'secret_access_key', 'session_token'");
-                String secretAccessKey = require(task.getSecretAccessKey(), "'secret_access_key', 'session_token'");
-                String sessionToken = require(task.getSessionToken(), "'session_token'");
-                reject(task.getProfileFile(), "profile_file");
-                reject(task.getProfileName(), "profile_name");
-                final AWSSessionCredentials creds = new BasicSessionCredentials(accessKeyId, secretAccessKey, sessionToken);
-                return new AWSSessionCredentialsProvider() {
-                    public AWSSessionCredentials getCredentials()
-                    {
-                        return creds;
-                    }
-
-                    public void refresh() { }
-                };
-            }
-
-        default:
-            throw new ConfigException(String.format("Unknwon auth_method '%s'. Supported methods are basic, instance, profile, properties, anonymous, and session.",
-                        task.getAuthMethod()));
-        }
-    }
-
-    private static AWSCredentialsProvider overwriteBasicCredentials(AwsCredentialsTask task, final AWSCredentials creds)
-    {
-        task.setAuthMethod("basic");
-        task.setAccessKeyId(Optional.of(creds.getAWSAccessKeyId()));
-        task.setSecretAccessKey(Optional.of(creds.getAWSSecretKey()));
-        return new AWSCredentialsProvider() {
-            public AWSCredentials getCredentials()
-            {
-                return creds;
-            }
-
-            public void refresh() { }
-        };
-    }
-
-    private static <T> T require(Optional<T> value, String message)
-    {
-        if (value.isPresent()) {
-            return value.get();
-        }
-        else {
-            throw new ConfigException("Required option is not set: " + message);
-        }
-    }
-
-    private static <T> void reject(Optional<T> value, String message)
-    {
-        if (value.isPresent()) {
-            throw new ConfigException("Invalid option is set: " + message);
-        }
-    }
-}

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

@@ -1,39 +0,0 @@
-package org.embulk.input.s3;
-
-import com.google.common.base.Optional;
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.spi.unit.LocalFile;
-
-public interface AwsCredentialsTask
-{
-    @Config("auth_method")
-    @ConfigDefault("\"basic\"")
-    String getAuthMethod();
-    void setAuthMethod(String method);
-
-    @Config("access_key_id")
-    @ConfigDefault("null")
-    Optional<String> getAccessKeyId();
-    void setAccessKeyId(Optional<String> value);
-
-    @Config("secret_access_key")
-    @ConfigDefault("null")
-    Optional<String> getSecretAccessKey();
-    void setSecretAccessKey(Optional<String> value);
-
-    @Config("session_token")
-    @ConfigDefault("null")
-    Optional<String> getSessionToken();
-    void setSessionToken(Optional<String> value);
-
-    @Config("profile_file")
-    @ConfigDefault("null")
-    Optional<LocalFile> getProfileFile();
-    void setProfileFile(Optional<LocalFile> value);
-
-    @Config("profile_name")
-    @ConfigDefault("null")
-    Optional<String> getProfileName();
-    void setProfileName(Optional<String> value);
-}