Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Add aws s3:// uri support #565

Closed
wants to merge 16 commits into from
Closed

Add aws s3:// uri support #565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c1027bf
Add aws s3:// uri support
tmnuwan12 Jun 6, 2020
a8e3b45
Add aws s3:// uri support
tmnuwan12 Jun 6, 2020
a066008
Add option to use default AWS region provider chain.
maciejwalkowiak May 31, 2020
4d1e776
Add logging to AWSParameterStorePropertySource.
cschroedl-gov Feb 27, 2020
02eb1b2
Update documentation on how to hide warning message logged by AWS SDK…
maciejwalkowiak May 31, 2020
6d189da
Fix typo in the exception text
tmnuwan12 May 31, 2020
afbb548
Bump AWS Java SDK dependency version to 1.11.792.
maciejwalkowiak May 31, 2020
ba9373d
Update reference documentation on how to upgrade AWS SDK dependency.
maciejwalkowiak May 31, 2020
79d84db
Fix S3 object key encoding in `SimpleStorageResource.getURL`.
Jun 1, 2020
a5b295f
Fix duplicate error logging when processing exception thrown in SQS l…
sayembd Mar 29, 2019
e5c15d6
Allow to specify PropertySource name returned by AwsSecretsManagerPro…
cbm-afoulfoin Jun 25, 2019
5ebbc10
Add a dependency to JUnit 4.
maciejwalkowiak Jun 6, 2020
b035b75
Document default credentials chain for auto-configuration.
maciejwalkowiak Jun 6, 2020
3a0e9ee
Add CloudWatch integration documentation to the reference.
maciejwalkowiak Jun 6, 2020
627a2c2
Add aws s3:// uri support
tmnuwan12 Jun 6, 2020
e8f515f
Add code improvements
tmnuwan12 Jun 7, 2020
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
Next Next commit
Add aws s3:// uri support 
Fixes gh-361
  • Loading branch information
@tmnuwan12
tmnuwan12 committed Jun 6, 2020
commit c1027bfb7940deb898618415d61f23408a17e529
6 changes: 6 additions & 0 deletions ...ws-core/src/main/java/org/springframework/cloud/aws/core/io/s3/SimpleStorageResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Expand Down Expand Up @@ -143,6 +145,10 @@ public URL getURL() throws IOException {
"/" + this.bucketName + "/" + this.objectName);
}

public URI getS3URI() throws URISyntaxException {
tmnuwan12 marked this conversation as resolved.
Show resolved Hide resolved
return new URI("S3", "//" + this.bucketName + "/" + this.objectName, null);
tmnuwan12 marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public File getFile() throws IOException {
throw new UnsupportedOperationException(
Expand Down
20 changes: 18 additions & 2 deletions ...ore/src/test/java/org/springframework/cloud/aws/core/io/s3/SimpleStorageResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.net.URL;
import java.util.Date;

Expand Down Expand Up @@ -219,8 +220,6 @@ public void getUrl_existingObject_returnsUrlWithS3Prefix() throws Exception {

AmazonS3Client amazonS3 = mock(AmazonS3Client.class);

when(amazonS3.getRegion()).thenReturn(Region.EU_Ireland);

// Act
SimpleStorageResource simpleStorageResource = new SimpleStorageResource(amazonS3,
"bucket", "object", new SyncTaskExecutor());
Expand All @@ -231,6 +230,23 @@ public void getUrl_existingObject_returnsUrlWithS3Prefix() throws Exception {

}

@Test
public void getUrl_existingObject_returnsUrlWithS3Scheme() throws Exception {

AmazonS3Client amazonS3 = mock(AmazonS3Client.class);

when(amazonS3.getRegion()).thenReturn(Region.EU_Ireland);

// Act
SimpleStorageResource simpleStorageResource = new SimpleStorageResource(amazonS3,
"bucket", "object", new SyncTaskExecutor());

// Assert
assertThat(simpleStorageResource.getS3URI())
.isEqualTo(new URI("S3://bucket/object"));

}

@Test
public void getFile_existingObject_throwsMeaningFullException() throws Exception {

Expand Down