Merge pull request apache#837 from gnethercutt/master

Support more AWS credentials providers for S3 storage
emaxerrno · Dec 15, 2014 · 7487321 · 7487321
2 parents 31cda0b + 79571f7
commit 7487321
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 13 deletions.
diff --git a/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java b/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
@@ -19,7 +19,13 @@
 
 package io.druid.storage.s3;
 
+import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSCredentialsProviderChain;
+import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
+import com.amazonaws.auth.InstanceProfileCredentialsProvider;
+import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
+import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.fasterxml.jackson.databind.Module;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
@@ -62,14 +68,18 @@ public void configure(Binder binder)
     binder.bind(S3TaskLogs.class).in(LazySingleton.class);
   }
 
-  @Provides
-  @LazySingleton
-  public AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
+  private static class ConfigDrivenAwsCredentialsConfigProvider implements AWSCredentialsProvider 
   {
-    if (!Strings.isNullOrEmpty(config.getAccessKey()) && !Strings.isNullOrEmpty(config.getSecretKey())) {
-      return new AWSCredentialsProvider() {
-        @Override
-        public com.amazonaws.auth.AWSCredentials getCredentials() {
+    private AWSCredentialsConfig config;
+
+    public ConfigDrivenAwsCredentialsConfigProvider(AWSCredentialsConfig config) {
+      this.config = config;
+    }
+
+    @Override
+    public com.amazonaws.auth.AWSCredentials getCredentials() 
+    {
+        if (!Strings.isNullOrEmpty(config.getAccessKey()) && !Strings.isNullOrEmpty(config.getSecretKey())) {
           return new com.amazonaws.auth.AWSCredentials() {
             @Override
             public String getAWSAccessKeyId() {
@@ -82,14 +92,57 @@ public String getAWSSecretKey() {
             }
           };
         }
+        throw new AmazonClientException("Unable to load AWS credentials from druid AWSCredentialsConfig");
+    }
+
+    @Override
+    public void refresh() {}
+  }
+
+  private static class LazyFileSessionCredentialsProvider implements AWSCredentialsProvider 
+  {
+    private AWSCredentialsConfig config;
+    private FileSessionCredentialsProvider provider;
+
+    public LazyFileSessionCredentialsProvider(AWSCredentialsConfig config) {
+      this.config = config;
+    }
+
+    private FileSessionCredentialsProvider getUnderlyingProvider() {
+      if (provider == null) {
+        synchronized (config) {
+          if (provider == null) {
+            provider = new FileSessionCredentialsProvider(config.getFileSessionCredentials());
+          }
+        }
+      }
+      return provider;
+    }
+
+    @Override
+    public com.amazonaws.auth.AWSCredentials getCredentials() 
+    {
+      return getUnderlyingProvider().getCredentials();
+    }
 
-        @Override
-        public void refresh() {}
-      };
-    } else {
-      return new FileSessionCredentialsProvider(config.getFileSessionCredentials());
+    @Override
+    public void refresh() {
+      getUnderlyingProvider().refresh();
     }
   }
+
+  @Provides
+  @LazySingleton
+  public AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
+  {
+    return new AWSCredentialsProviderChain(
+           new ConfigDrivenAwsCredentialsConfigProvider(config),
+           new LazyFileSessionCredentialsProvider(config),
+           new EnvironmentVariableCredentialsProvider(),
+           new SystemPropertiesCredentialsProvider(),
+           new ProfileCredentialsProvider(),
+           new InstanceProfileCredentialsProvider());
+  }
 
   @Provides
   @LazySingleton

diff --git a/pom.xml b/pom.xml
@@ -135,7 +135,7 @@
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk</artifactId>
-                <version>1.6.0.1</version>
+                <version>1.8.11</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>