Performance improvements (#4850)

aws · Jan 26, 2024 · 5e3e0ce · 5e3e0ce
1 parent ce49ac7
commit 5e3e0ce
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/.changes/next-release/bugfix-AWSSDKforJavav2-8b416ff.json b/.changes/next-release/bugfix-AWSSDKforJavav2-8b416ff.json
@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Fixed bug where the ProfileCredentialsProvider would re-read the credentials file with each request by default."
+}
diff --git a/.changes/next-release/feature-AWSSDKforJavav2-9014236.json b/.changes/next-release/feature-AWSSDKforJavav2-9014236.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Improved performance of chunk-encoded streaming uploads, like S3's PutObject."
+}
diff --git a/...uth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java b/...uth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java
@@ -71,9 +71,9 @@ private ProfileCredentialsProvider(BuilderImpl builder) {
         try {
             selectedProfileName = Optional.ofNullable(builder.profileName)
                                           .orElseGet(ProfileFileSystemSetting.AWS_PROFILE::getStringValueOrThrow);
-
-            selectedProfileSupplier = Optional.ofNullable(builder.profileFile)
-                                              .orElseGet(() -> builder.defaultProfileFileLoader);
+            selectedProfileSupplier =
+                Optional.ofNullable(builder.profileFile)
+                        .orElseGet(() -> ProfileFileSupplier.fixedProfileFile(builder.defaultProfileFileLoader.get()));
 
         } catch (RuntimeException e) {
             // If we couldn't load the credentials provider for some reason, save an exception describing why. This exception

diff --git a/...mazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChunkedEncodedInputStream.java b/...mazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChunkedEncodedInputStream.java
@@ -77,11 +77,20 @@ public static Builder builder() {
 
     @Override
     public int read() throws IOException {
+        return currentChunk().stream().read();
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        return currentChunk().stream().read(b, off, len);
+    }
+
+    private Chunk currentChunk() throws IOException {
         if (currentChunk == null || !currentChunk.hasRemaining() && !isFinished) {
             currentChunk = getChunk(inputStream);
         }
 
-        return currentChunk.stream().read();
+        return currentChunk;
     }
 
     /**