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

fix(storage): Add support for dualside encryption even if acceleration is off #3220

Merged
merged 4 commits into from
Mar 16, 2023
Merged

fix(storage): Add support for dualside encryption even if acceleration is off #3220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d40eed
Add support for dualside encryption even if acceleration is off
Mar 15, 2023
158d1ca
Merge branch 'main' into leint/storage-ddse-alone
tjleing Mar 15, 2023
ba5acf2
Use correct hostname (include region)
Mar 16, 2023
48decdf
Merge branch 'main' into leint/storage-ddse-alone
gpanshu Mar 16, 2023
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: 6 additions & 0 deletions aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4764,6 +4764,12 @@ protected <X extends AmazonWebServiceRequest> Request<X> createRequest(String bu
clientConfiguration);
}
}
else {
if (clientOptions.isDualstackEnabled()) {
String hostname = String.format(Constants.S3_DUALSTACK_HOSTNAME, getRegionName());
endpoint = RuntimeHttpUtils.toUri(hostname, clientConfiguration);
}
}

request.setHttpMethod(httpMethod);
resolveRequestEndpoint(request, bucketName, key, endpoint);
Expand Down
2 changes: 2 additions & 0 deletions aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/internal/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public class Constants {
public static final String S3_EXTERNAL_1_HOSTNAME = "s3-external-1.amazonaws.com";
/** Service hostname for accessing accelerated S3 buckets */
public static final String S3_ACCELERATE_HOSTNAME = "s3-accelerate.amazonaws.com";
/** Service hostname for accessing dualstack S3 buckets; format argument is the region */
public static final String S3_DUALSTACK_HOSTNAME = "s3.dualstack.%s.amazonaws.com";
/** Service hostname for accessing dualstack accelerated S3 buckets */
public static final String S3_ACCELERATE_DUALSTACK_HOSTNAME = "s3-accelerate.dualstack.amazonaws.com";

Expand Down