Skip to content
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

Adding in the credentials provider stack #59

Merged
merged 2 commits into from
Mar 22, 2022
Merged

Adding in the credentials provider stack #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6956e8c
Removed length designation from the S3 file upload
millmanw Mar 22, 2022
cbef201
Added the S3 Credentials providers
millmanw Mar 22, 2022
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
20 changes: 15 additions & 5 deletions zulia-server/src/main/java/io/zulia/server/filestorage/S3DocumentStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.bson.Document;
import org.xerial.snappy.SnappyInputStream;
import org.xerial.snappy.SnappyOutputStream;
import software.amazon.awssdk.auth.credentials.*;
import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.regions.Region;
Expand Down Expand Up @@ -68,7 +69,17 @@ public S3DocumentStorage(MongoClient mongoClient, String indexName, String dbNam
this.indexName = indexName;
this.dbName = dbName;
this.sharded = sharded;
this.s3 = S3Client.builder().region(Region.of(this.region)).build();
AwsCredentialsProviderChain credentialsProvider = AwsCredentialsProviderChain.builder()
.credentialsProviders(
InstanceProfileCredentialsProvider.builder().build(),
ContainerCredentialsProvider.builder().build(),
EnvironmentVariableCredentialsProvider.create(),
SystemPropertyCredentialsProvider.create(),
ProfileCredentialsProvider.builder().build()
)
.build();

this.s3 = S3Client.builder().region(Region.of(this.region)).credentialsProvider(credentialsProvider).build();

ForkJoinPool.commonPool().execute(() -> {
MongoDatabase db = client.getDatabase(dbName);
Expand Down Expand Up @@ -107,7 +118,7 @@ public void storeAssociatedDocument(AssociatedDocument doc) throws Exception {

PutObjectRequest req = PutObjectRequest.builder().bucket(bucket).key(key).contentLength((long) bytes.length).build();

ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
SnappyOutputStream os = new SnappyOutputStream(baos);
os.write(bytes);
os.flush();
Expand Down Expand Up @@ -154,8 +165,7 @@ public void getAssociatedDocuments(Writer outputstream, Document filter) throws
for (Document doc : found) {
if (first) {
first = false;
}
else {
} else {
outputstream.write(",\n");
}

Expand Down Expand Up @@ -334,7 +344,7 @@ private AssociatedDocument parseTOC(Document doc) throws IOException {
GetObjectRequest gor = GetObjectRequest.builder()
.bucket(s3Info.getString("bucket"))
.key(s3Info.getString("key"))
.build() ;
.build();
ResponseInputStream<GetObjectResponse> results = s3.getObject(gor);
InputStream compression = new SnappyInputStream(results);
try (compression) {
Expand Down