Merge pull request #1993 from HubSpot/aws_builder_update

Revert AWS builder update for now
HubSpot · Aug 12, 2019 · 0b28e59 · 0b28e59
2 parents f8dd80f + f16a92b
commit 0b28e59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/SingularityS3Base/src/main/java/com/hubspot/singularity/s3/base/S3ArtifactDownloader.java b/SingularityS3Base/src/main/java/com/hubspot/singularity/s3/base/S3ArtifactDownloader.java
@@ -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;
@@ -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());

diff --git a/...ityS3Uploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3Uploader.java b/...ityS3Uploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3Uploader.java
@@ -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;
@@ -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