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

Revert AWS builder update for now #1993

Merged
merged 1 commit into from
Aug 12, 2019
Merged

Revert AWS builder update for now #1993

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
6 changes: 1 addition & 5 deletions SingularityS3Base/src/main/java/com/hubspot/singularity/s3/base/S3ArtifactDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.slf4j.Logger;

import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
Expand Down Expand Up @@ -75,10 +74,7 @@ private void downloadThrows(final S3Artifact s3Artifact, final Path downloadTo)
clientConfiguration.setSignerOverride("S3SignerType");
}

final AmazonS3 s3Client = AmazonS3Client.builder()
.withCredentials(new AWSStaticCredentialsProvider(getCredentialsForBucket(s3Artifact.getS3Bucket())))
.withClientConfiguration(clientConfiguration)
.build();
final AmazonS3 s3Client = new AmazonS3Client(getCredentialsForBucket(s3Artifact.getS3Bucket()), clientConfiguration);

if (configuration.getS3Endpoint().isPresent()) {
s3Client.setEndpoint(configuration.getS3Endpoint().get());
Expand Down
5 changes: 1 addition & 4 deletions ...ityS3Uploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;

import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
Expand Down Expand Up @@ -50,9 +49,7 @@ public class SingularityS3Uploader extends SingularityUploader {
credentials = new BasicAWSCredentials(uploadMetadata.getS3AccessKey().get(), uploadMetadata.getS3SecretKey().get());
}

this.s3Client = AmazonS3Client.builder()
.withCredentials(new AWSStaticCredentialsProvider(credentials))
.build();
this.s3Client = new AmazonS3Client(credentials);
}

@Override
Expand Down