Skip to content

Get PrestoS3FileSystem to work with the AWS Default Credentials Provider #13858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arhimondr merged 1 commit into from
Dec 26, 2019
Merged

Get PrestoS3FileSystem to work with the AWS Default Credentials Provider #13858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
import com.amazonaws.metrics.RequestMetricCollector;
import com.amazonaws.regions.Region;
Expand Down Expand Up @@ -151,7 +152,7 @@ private AWSCredentialsProvider getAwsCredentialsProvider(Configuration conf, Hiv
return getCustomAWSCredentialsProvider(conf, providerClass);
}

throw new RuntimeException("S3 credentials not configured");
return DefaultAWSCredentialsProviderChain.getInstance();
}

private static AWSCredentialsProvider getCustomAWSCredentialsProvider(Configuration conf, String providerClass)
Expand Down
3 changes: 2 additions & 1 deletion presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.event.ProgressEvent;
Expand Down Expand Up @@ -754,7 +755,7 @@ private AWSCredentialsProvider createAwsCredentialsProvider(URI uri, Configurati
return getCustomAWSCredentialsProvider(uri, conf, providerClass);
}

throw new RuntimeException("S3 credentials not configured");
return DefaultAWSCredentialsProviderChain.getInstance();
}

private static AWSCredentialsProvider getCustomAWSCredentialsProvider(URI uri, Configuration conf, String providerClass)
Expand Down
6 changes: 4 additions & 2 deletions presto-hive/src/test/java/com/facebook/presto/hive/s3/TestPrestoS3FileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3EncryptionClient;
Expand Down Expand Up @@ -145,15 +146,16 @@ public void testInstanceCredentialsEnabled()
}
}

@Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "S3 credentials not configured")
public void testInstanceCredentialsDisabled()
@Test
public void testDefaultCredentials()
throws Exception
{
Configuration config = new Configuration();
config.setBoolean(S3_USE_INSTANCE_CREDENTIALS, false);

try (PrestoS3FileSystem fs = new PrestoS3FileSystem()) {
fs.initialize(new URI("s3n://test-bucket/"), config);
assertInstanceOf(getAwsCredentialsProvider(fs), DefaultAWSCredentialsProviderChain.class);
Copy link
Copy Markdown
Contributor

@ajaygeorge ajaygeorge Dec 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like you could an
assertEquals(getAwsCredentialsProvider(fs), DefaultAWSCredentialsProviderChain.getInstance())
which is better than assertInstanceOf

Copy link
Copy Markdown
Author

@anoopj anoopj Dec 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend keeping this, since this is more descriptive and the DefaultAWSCredentialsProviderChain class is a stronger contract than the instance.

}
}

Expand Down